meta-edc 0.3.7__py3-none-any.whl → 0.3.15__py3-none-any.whl

meta_subject/migrations/0205_historicalsubjectrequisition_crf_status_and_more.py

@@ -0,0 +1,80 @@
+# Generated by Django 4.2.11 on 2024-05-16 20:08
+
+from django.db import migrations, models
+import edc_crf.model_mixins.crf_status_model_mixin
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0204_glucosefbg_repeat_fbg_date_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalsubjectrequisition",
+            name="crf_status",
+            field=models.CharField(
+                choices=[
+                    ("INCOMPLETE", "Incomplete (some data pending)"),
+                    ("COMPLETE", "Complete"),
+                ],
+                default=edc_crf.model_mixins.crf_status_model_mixin.get_crf_status_default,
+                help_text="If some data is still pending, flag this CRF as incomplete",
+                max_length=25,
+                verbose_name="CRF status",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalsubjectrequisition",
+            name="crf_status_comments",
+            field=models.TextField(
+                blank=True,
+                help_text="for example, why some data is still pending",
+                null=True,
+                verbose_name="Any comments related to status of this CRF",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectrequisition",
+            name="crf_status",
+            field=models.CharField(
+                choices=[
+                    ("INCOMPLETE", "Incomplete (some data pending)"),
+                    ("COMPLETE", "Complete"),
+                ],
+                default=edc_crf.model_mixins.crf_status_model_mixin.get_crf_status_default,
+                help_text="If some data is still pending, flag this CRF as incomplete",
+                max_length=25,
+                verbose_name="CRF status",
+            ),
+        ),
+        migrations.AddField(
+            model_name="subjectrequisition",
+            name="crf_status_comments",
+            field=models.TextField(
+                blank=True,
+                help_text="for example, why some data is still pending",
+                null=True,
+                verbose_name="Any comments related to status of this CRF",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="dmdxresult",
+            name="utestid",
+            field=models.CharField(
+                choices=[("fbg", "FBG mmol/L"), ("ogtt", "OGTT mmol/L"), ("hba1c", "HbA1c %")],
+                max_length=15,
+                verbose_name="Test",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicaldmdxresult",
+            name="utestid",
+            field=models.CharField(
+                choices=[("fbg", "FBG mmol/L"), ("ogtt", "OGTT mmol/L"), ("hba1c", "HbA1c %")],
+                max_length=15,
+                verbose_name="Test",
+            ),
+        ),
+    ]

meta_subject/migrations/0206_bloodresultsfbc_crf_status_and_more.py

@@ -0,0 +1,62 @@
+# Generated by Django 4.2.11 on 2024-05-17 14:31
+
+from django.db import migrations, models
+import edc_crf.model_mixins.crf_status_model_mixin
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0205_historicalsubjectrequisition_crf_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="bloodresultsfbc",
+            name="crf_status",
+            field=models.CharField(
+                choices=[
+                    ("INCOMPLETE", "Incomplete (some data pending)"),
+                    ("COMPLETE", "Complete"),
+                ],
+                default=edc_crf.model_mixins.crf_status_model_mixin.get_crf_status_default,
+                help_text="If some data is still pending, flag this CRF as incomplete",
+                max_length=25,
+                verbose_name="CRF status",
+            ),
+        ),
+        migrations.AddField(
+            model_name="bloodresultsfbc",
+            name="crf_status_comments",
+            field=models.TextField(
+                blank=True,
+                help_text="for example, why some data is still pending",
+                null=True,
+                verbose_name="Any comments related to status of this CRF",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalbloodresultsfbc",
+            name="crf_status",
+            field=models.CharField(
+                choices=[
+                    ("INCOMPLETE", "Incomplete (some data pending)"),
+                    ("COMPLETE", "Complete"),
+                ],
+                default=edc_crf.model_mixins.crf_status_model_mixin.get_crf_status_default,
+                help_text="If some data is still pending, flag this CRF as incomplete",
+                max_length=25,
+                verbose_name="CRF status",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalbloodresultsfbc",
+            name="crf_status_comments",
+            field=models.TextField(
+                blank=True,
+                help_text="for example, why some data is still pending",
+                null=True,
+                verbose_name="Any comments related to status of this CRF",
+            ),
+        ),
+    ]

meta_subject/models/__init__.py

@@ -11,8 +11,8 @@ from .complications import Complications
 from .complications_glycemia import ComplicationsGlycemia
 from .concomitant_medication import ConcomitantMedication
 from .delivery import Delivery
+from .diabetes import DmDiagnosis, DmDxResult, DmFollowup
 from .diet_and_lifestyle import DietAndLifestyle
-from .dm_referral_followup import DmReferralFollowup
 from .egfr_drop_notification import EgfrDropNotification
 from .eq5d3l import Eq5d3l
 from .followup_examination import FollowupExamination

meta_subject/models/blood_results/blood_results_fbc.py

@@ -1,5 +1,5 @@
 from django.db import models
-from edc_crf.model_mixins import CrfWithActionModelMixin
+from edc_crf.model_mixins import CrfStatusModelMixin, CrfWithActionModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import fbc_panel
 from edc_lab_results import BLOOD_RESULTS_FBC_ACTION
@@ -29,6 +29,7 @@ class BloodResultsFbc(
     MchcModelMixin,
     McvModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_FBC_ACTION
@@ -40,6 +41,6 @@ class BloodResultsFbc(
         limit_choices_to={"panel__name": fbc_panel.name}, **requisition_fk_options
     )
 
-    class Meta(CrfWithActionModelMixin.Meta, BaseUuidModel.Meta):
+    class Meta(CrfWithActionModelMixin.Meta, CrfStatusModelMixin.Meta, BaseUuidModel.Meta):
         verbose_name = "Blood Result: FBC"
         verbose_name_plural = "Blood Results: FBC"

meta_subject/models/blood_results/blood_results_hba1c.py

@@ -1,4 +1,5 @@
 from django.db import models
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import hba1c_panel
 from edc_lab_results import BLOOD_RESULTS_HBA1C_ACTION
@@ -13,6 +14,7 @@ class BloodResultsHba1c(
     Hba1cModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_HBA1C_ACTION

meta_subject/models/blood_results/blood_results_ins.py

@@ -1,4 +1,5 @@
 from django.db import models
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import insulin_panel
 from edc_lab_results import BLOOD_RESULTS_INSULIN_ACTION
@@ -13,6 +14,7 @@ class BloodResultsIns(
     InsulinModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_INSULIN_ACTION

meta_subject/models/blood_results/blood_results_lft.py

@@ -1,4 +1,5 @@
 from django.db import models
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import lft_panel
 from edc_lab_results import BLOOD_RESULTS_LFT_ACTION
@@ -26,6 +27,7 @@ class BloodResultsLft(
     GgtModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_LFT_ACTION

meta_subject/models/blood_results/blood_results_lipid.py

@@ -1,4 +1,5 @@
 from django.db import models
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import lipids_panel
 from edc_lab_results import BLOOD_RESULTS_LIPID_ACTION
@@ -22,6 +23,7 @@ class BloodResultsLipid(
     CholModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_LIPID_ACTION

meta_subject/models/blood_results/blood_results_rft.py

@@ -1,4 +1,5 @@
 from django.db import models
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_egfr.model_mixins import EgfrModelMixin
 from edc_lab.model_mixins import CrfWithRequisitionModelMixin, requisition_fk_options
 from edc_lab_panel.panels import rft_panel
@@ -22,6 +23,7 @@ class BloodResultsRft(
     UricAcidModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
     action_name = BLOOD_RESULTS_RFT_ACTION

meta_subject/models/diabetes/__init__.py

@@ -0,0 +1,3 @@
+from .dm_diagnosis import DmDiagnosis
+from .dm_dx_result import DmDxResult
+from .dm_followup import DmFollowup

meta_subject/models/diabetes/dm_diagnosis.py

@@ -0,0 +1,50 @@
+from django.db import models
+from edc_constants.choices import YES_NO
+from edc_constants.constants import OTHER
+from edc_model.models import BaseUuidModel
+from edc_model_fields.fields import OtherCharField
+
+from ...model_mixins import CrfModelMixin
+
+DM_DX_CHOICES = (
+    ("fbg_confirmed", "Any FBG >= 7.0 mmol/L (confirmed by OGTT)"),
+    ("fbg_unconfirmed", "Any FBG >= 7.0 mmol/L (NOT confirmed by OGTT)"),
+    ("ogtt_annaul", "Annual OGTT >= 11.1 mmol/L"),
+    ("ogtt_unscheduled", "Any OGTT >= 11.1 mmol/L (excluding annual or used in confirmation)"),
+    (OTHER, "Other"),
+)
+
+
+class DmDiagnosis(CrfModelMixin, BaseUuidModel):
+
+    dx_date = models.DateField(verbose_name="Date of diagnosis")
+
+    dx_initiated_by = models.CharField(
+        verbose_name="What initiated the diagnosis",
+        max_length=25,
+        choices=DM_DX_CHOICES,
+    )
+
+    dx_initiated_by_other = OtherCharField()
+
+    dx_tmg = models.CharField(
+        verbose_name="Was this case discussed with the TMG?",
+        max_length=15,
+        choices=YES_NO,
+    )
+
+    dx_tmg_date = models.DateField(
+        verbose_name="If YES, provide the date of the TMG discussion", null=True, blank=True
+    )
+
+    dx_no_tmg_reason = models.TextField(
+        verbose_name="If NO, please explain why this case was not discussed with the TMG",
+        null=True,
+        blank=True,
+    )
+
+    comments = models.TextField(verbose_name="Any other comments", null=True, blank=True)
+
+    class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):
+        verbose_name = "Diabetes diagnosis"
+        verbose_name_plural = "Diabetes diagnosis"

meta_subject/models/diabetes/dm_dx_result.py

@@ -0,0 +1,70 @@
+from django.contrib.sites.managers import CurrentSiteManager as DjangoCurrentSiteManager
+from django.db import models
+from django.db.models import Manager
+from edc_constants.constants import EQ
+from edc_lab.choices import RESULT_QUANTIFIER
+from edc_model.models import BaseUuidModel, HistoricalRecords
+from edc_reportable import (
+    MILLIGRAMS_PER_DECILITER,
+    MILLIMOLES_PER_LITER,
+    MILLIMOLES_PER_LITER_DISPLAY,
+    PERCENT,
+)
+from edc_sites.model_mixins import SiteModelMixin
+
+from .dm_diagnosis import DmDiagnosis
+
+UTESTIDS = (("fbg", "FBG mmol/L"), ("ogtt", "OGTT mmol/L"), ("hba1c", "HbA1c %"))
+UNITS = (
+    (MILLIGRAMS_PER_DECILITER, MILLIGRAMS_PER_DECILITER),
+    (MILLIMOLES_PER_LITER, MILLIMOLES_PER_LITER_DISPLAY),
+    (PERCENT, "%"),
+)
+
+
+class DmDxResult(SiteModelMixin, BaseUuidModel):
+    """A user inline model to capture results used in determining a diagnosis
+    of diabetes (in the context of this study).
+
+    Glucose values (FBG/OGTT) are in mmol/L.
+    """
+
+    dm_diagnosis = models.ForeignKey(DmDiagnosis, on_delete=models.PROTECT)
+
+    report_date = models.DateField(verbose_name="Date")
+
+    utestid = models.CharField(
+        verbose_name="Test",
+        max_length=15,
+        choices=UTESTIDS,
+    )
+
+    quantifier = models.CharField(
+        max_length=10,
+        choices=RESULT_QUANTIFIER,
+        default=EQ,
+    )
+
+    value = models.DecimalField(max_digits=8, decimal_places=2)
+
+    units = models.CharField(
+        verbose_name="Units",
+        max_length=15,
+        choices=UNITS,
+    )
+
+    fasted = models.BooleanField(
+        verbose_name="Fasted?",
+        max_length=15,
+        default=False,
+    )
+
+    comment = models.CharField(max_length=35, null=True, blank=True)
+
+    objects = Manager()
+    on_site = DjangoCurrentSiteManager()
+    history = HistoricalRecords()
+
+    class Meta(BaseUuidModel.Meta):
+        verbose_name = "Diabetes diagnosis: Result"
+        verbose_name_plural = "Diabetes diagnosis: Results"

meta_subject/models/{dm_referral_followup.py → diabetes/dm_followup.py}

@@ -1,6 +1,7 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.html import format_html
+from edc_action_item.models import ActionItem
 from edc_adherence.choices import MISSED_PILLS
 from edc_constants.choices import YES_NO, YES_NO_NA
 from edc_constants.constants import NOT_APPLICABLE, QUESTION_RETIRED
@@ -16,10 +17,14 @@ from meta_lists.models import (
     MissedReferralReasons,
 )
 
-from ..model_mixins import CrfModelMixin
+from ...constants import DM_FOLLOWUP_ACTION
+from ...model_mixins import CrfWithActionModelMixin
 
 
-class DmReferralFollowup(CrfModelMixin, BaseUuidModel):
+class DmFollowup(CrfWithActionModelMixin, BaseUuidModel):
+
+    action_name = DM_FOLLOWUP_ACTION
+
     referral_date = models.DateField(
         verbose_name="Date of referral to diabetes clinic",
     )
@@ -138,7 +143,7 @@ class DmReferralFollowup(CrfModelMixin, BaseUuidModel):
 
     on_dm_medications = models.CharField(
         verbose_name="Are you currently taking any drug therapy for diabetes?",
-        choices=YES_NO,
+        choices=YES_NO_NA,
         max_length=25,
     )
 
@@ -199,6 +204,13 @@ class DmReferralFollowup(CrfModelMixin, BaseUuidModel):
         blank=True,
     )
 
-    class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):
-        verbose_name = "Diabetes referral follow-up"
-        verbose_name_plural = "Diabetes referral follow-up"
+    def save(self, *args, **kwargs):
+        self.action_item = ActionItem.objects.get(
+            subject_identifier=self.subject_identifier, action_type__name=self.action_name
+        )
+        self.action_identifier = self.action_item.action_identifier
+        super().save(*args, **kwargs)
+
+    class Meta(CrfWithActionModelMixin.Meta, BaseUuidModel.Meta):
+        verbose_name = "Diabetes follow-up after referral"
+        verbose_name_plural = "Diabetes follow-up after referral"

meta_subject/models/glucose.py

@@ -1,7 +1,6 @@
 from django.db import models
-from django.utils.translation import gettext as _
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO, NOT_APPLICABLE, PENDING, YES
+from edc_constants.constants import NOT_APPLICABLE
 from edc_glucose.model_mixins import (
     fasting_model_mixin_factory,
     fbg_model_mixin_factory,
@@ -10,16 +9,10 @@ from edc_glucose.model_mixins import (
 from edc_model.models import BaseUuidModel
 from edc_utils import formatted_date
 
+from ..choices import ENDPOINT_CHOICES
 from ..constants import AMENDMENT_DATE
 from ..model_mixins import CrfModelMixin
 
-ENDPOINT_CHOICES = (
-    (YES, _(YES)),
-    (PENDING, _("No. A repeat FBG will be scheduled")),
-    (NO, _(NO)),
-    (NOT_APPLICABLE, _("Not applicable")),
-)
-
 
 class Glucose(
     CrfModelMixin,
@@ -38,10 +31,7 @@ class Glucose(
     ogtt_model_mixin_factory("ogtt"),
     BaseUuidModel,
 ):
-    # TODO: diagnosis of diabetes is OGTT 11.1mmol / L ONLY. Triggers EoS form
-    # TODO: move IFG to bloogresultglu. Use this form for OGTT only 27/01/2021
-
-    """A user model to capture IFG and OGTT"""
+    """A user model to capture FBG/RBG and OGTT"""
 
     fbg_performed = models.CharField(
         verbose_name="Was the FBG test performed?",
@@ -81,5 +71,5 @@ class Glucose(
     )
 
     class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):
-        verbose_name = "Glucose (IFG, OGTT)"
-        verbose_name_plural = "Glucose (IFG, OGTT)"
+        verbose_name = "Glucose (FBG/RBG, OGTT)"
+        verbose_name_plural = "Glucose (FBG/RBG, OGTT)"

meta_subject/models/glucose_fbg.py

@@ -1,70 +1,59 @@
-from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from edc_constants.choices import FASTING_CHOICES
-from edc_constants.constants import EQ, FASTING
-from edc_glucose.constants import GLUCOSE_HIGH_READING
-from edc_lab.choices import RESULT_QUANTIFIER
-from edc_lab_panel.model_mixin_factory import reportable_result_model_mixin_factory
-from edc_model.models import BaseUuidModel
-from edc_model.validators import datetime_not_future
-from edc_reportable import (
-    MILLIGRAMS_PER_DECILITER,
-    MILLIMOLES_PER_LITER,
-    MILLIMOLES_PER_LITER_DISPLAY,
+from edc_constants.choices import YES_NO
+from edc_constants.constants import NO
+from edc_glucose.model_mixins import (
+    fasting_model_mixin_factory,
+    fbg_model_mixin_factory,
 )
+from edc_model.models import BaseUuidModel
 
 from ..model_mixins import CrfModelMixin
 
 
-class GlucoseModelMixin(
-    reportable_result_model_mixin_factory(
-        utest_id="glucose",
-        verbose_name="Glucose",
-        units_choices=(
-            (MILLIGRAMS_PER_DECILITER, MILLIGRAMS_PER_DECILITER),
-            (MILLIMOLES_PER_LITER, MILLIMOLES_PER_LITER_DISPLAY),
+class GlucoseFbg(
+    CrfModelMixin,
+    fasting_model_mixin_factory(
+        None,
+        fasting=models.CharField(
+            verbose_name="Has the participant fasted?",
+            max_length=15,
+            choices=YES_NO,
+            null=True,
+            blank=False,
+            help_text="As reported by patient",
         ),
-        decimal_places=2,
-        validators=[MinValueValidator(1.00), MaxValueValidator(GLUCOSE_HIGH_READING)],
-        exclude_attrs_for_reportable=True,
     ),
-    models.Model,
+    fbg_model_mixin_factory("fbg"),
+    BaseUuidModel,
 ):
-    fasting = models.CharField(
-        verbose_name="Was this fasting or non-fasting?",
-        max_length=25,
-        choices=FASTING_CHOICES,
-        null=True,
-        blank=False,
-    )
 
-    glucose_quantifier = models.CharField(
-        max_length=10,
-        choices=RESULT_QUANTIFIER,
-        default=EQ,
+    fbg_performed = models.CharField(
+        verbose_name="Was the FBG test performed?",
+        max_length=15,
+        choices=YES_NO,
     )
 
-    def get_summary_options(self) -> dict:
-        opts = super().get_summary_options()  # noqa
-        fasting = True if self.fasting == FASTING else False
-        opts.update(fasting=fasting)
-        return opts
-
-    class Meta:
-        abstract = True
-
+    fbg_not_performed_reason = models.CharField(
+        verbose_name="If NO, provide reason",
+        max_length=150,
+        null=True,
+        blank=True,
+    )
 
-class GlucoseFbg(
-    CrfModelMixin,
-    GlucoseModelMixin,
-    BaseUuidModel,
-):
+    fasting_duration_estimated = models.CharField(
+        max_length=15,
+        default=NO,
+        editable=False,
+        help_text=(
+            "Set to YES for existing values before duration "
+            "question was added to the form, otherwise NO"
+        ),
+    )
 
-    assay_datetime = models.DateTimeField(
-        verbose_name="Result date and time",
-        validators=[datetime_not_future],
+    repeat_fbg_date = models.DateField(
         null=True,
         blank=True,
+        help_text="Date should be within 1 week of report date",
     )
 
     class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):

meta_subject/models/health_economics/health_economics_update.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.utils.translation import gettext as _
 from edc_constants.choices import YES_NO
 from edc_constants.constants import NOT_APPLICABLE
+from edc_crf.model_mixins import SingletonCrfModelMixin
 from edc_he.choices import RELATIONSHIP_CHOICES, STATUS
 from edc_he.model_mixins import HouseholdModelMixin, income_model_mixin_factory
 from edc_model.models import BaseUuidModel
@@ -21,6 +22,7 @@ class HealthEconomicsUpdate(
             ),
         }
     ),
+    SingletonCrfModelMixin,
     CrfModelMixin,
     BaseUuidModel,
 ):

meta_subject/models/subject_requisition.py

@@ -1,9 +1,8 @@
-# for reference by old migrations
-from edc_lab.managers import RequisitionManager as Manager  # noqa
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_lab.model_mixins import RequisitionModelMixin
 from edc_model.models import BaseUuidModel
 
 
-class SubjectRequisition(RequisitionModelMixin, BaseUuidModel):
-    class Meta(RequisitionModelMixin.Meta, BaseUuidModel.Meta):
+class SubjectRequisition(RequisitionModelMixin, CrfStatusModelMixin, BaseUuidModel):
+    class Meta(RequisitionModelMixin.Meta, CrfStatusModelMixin.Meta, BaseUuidModel.Meta):
         pass

meta_subject/tests/tests/test_egfr.py

@@ -9,7 +9,7 @@ import time_machine
 from django import forms
 from django.conf import settings
 from django.contrib.sites.models import Site
-from django.test import TestCase, tag
+from django.test import TestCase
 from edc_action_item import site_action_items
 from edc_action_item.models import ActionItem
 from edc_constants.constants import BLACK, MALE
@@ -18,7 +18,7 @@ from edc_lab.models import Panel
 from edc_lab_results import BLOOD_RESULTS_EGFR_ACTION, BLOOD_RESULTS_RFT_ACTION
 from edc_registration import get_registered_subject_model_cls
 from edc_reportable import MICROMOLES_PER_LITER, MILLIGRAMS_PER_DECILITER
-from edc_utils import age
+from edc_utils import age, get_utcnow
 from edc_utils.round_up import round_half_away_from_zero
 from edc_visit_schedule.constants import OFFSCHEDULE_ACTION
 
@@ -37,7 +37,7 @@ from meta_subject.models import (
 @time_machine.travel(datetime(2019, 6, 11, 8, 00, tzinfo=ZoneInfo("UTC")))
 class TestEgfr(MetaTestCaseMixin, TestCase):
     def setUp(self):
-        self.subject_visit = self.get_subject_visit()
+        self.subject_visit = self.get_subject_visit(screening_datetime=get_utcnow())
         panel = Panel.objects.get(name="chemistry_rft")
         requisition = SubjectRequisition.objects.create(
             subject_visit=self.subject_visit,
@@ -62,11 +62,12 @@ class TestEgfr(MetaTestCaseMixin, TestCase):
         self.assertIsNotNone(obj.egfr_value)
         self.assertIsNotNone(obj.egfr_units)
 
-    @tag("3")
     def test_ok(self):
+        traveller = time_machine.travel(self.subject_visit.report_datetime)
+        traveller.start()
         data = dict(
             subject_visit=self.subject_visit,
-            report_datetime=self.subject_visit.report_datetime,
+            report_datetime=get_utcnow(),
         )
         form = BloodResultsRftFormValidator(cleaned_data=data, model=BloodResultsRft)
         try: