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

meta_subject/models/birth_outcomes.py

@@ -1,6 +1,7 @@
 from django.db import models
 from django.db.models import PROTECT, Index
 from edc_consent.model_mixins import RequiresConsentFieldsModelMixin
+from edc_crf.model_mixins import CrfStatusModelMixin
 from edc_model.models import BaseUuidModel, HistoricalRecords
 from edc_offstudy.model_mixins import OffstudyCrfModelMixin
 from edc_sites.managers import CurrentSiteManager
@@ -35,7 +36,11 @@ class Manager(models.Manager):
 
 
 class BirthOutcomes(
-    SiteModelMixin, RequiresConsentFieldsModelMixin, OffstudyCrfModelMixin, BaseUuidModel
+    CrfStatusModelMixin,
+    SiteModelMixin,
+    RequiresConsentFieldsModelMixin,
+    OffstudyCrfModelMixin,
+    BaseUuidModel,
 ):
     """A user model to capture birth outcomes.
 

meta_subject/models/blood_results/__init__.py

@@ -2,5 +2,5 @@ from .blood_results_fbc import BloodResultsFbc
 from .blood_results_hba1c import BloodResultsHba1c
 from .blood_results_ins import BloodResultsIns
 from .blood_results_lft import BloodResultsLft
-from .blood_results_lipid import BloodResultsLipid
+from .blood_results_lipids import BloodResultsLipids
 from .blood_results_rft import BloodResultsRft

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 → blood_results_lipids.py}

@@ -1,7 +1,8 @@
 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
+from edc_lab_results import BLOOD_RESULTS_LIPIDS_ACTION
 from edc_lab_results.model_mixins import (
     BloodResultsModelMixin,
     CholModelMixin,
@@ -14,7 +15,7 @@ from edc_model.models import BaseUuidModel
 from ...model_mixins import CrfWithActionModelMixin
 
 
-class BloodResultsLipid(
+class BloodResultsLipids(
     CrfWithActionModelMixin,
     HdlModelMixin,
     LdlModelMixin,
@@ -22,9 +23,10 @@ class BloodResultsLipid(
     CholModelMixin,
     CrfWithRequisitionModelMixin,
     BloodResultsModelMixin,
+    CrfStatusModelMixin,
     BaseUuidModel,
 ):
-    action_name = BLOOD_RESULTS_LIPID_ACTION
+    action_name = BLOOD_RESULTS_LIPIDS_ACTION
     tracking_identifier_prefix = "LP"
     lab_panel = lipids_panel
 

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,2 @@
+from .dm_endpoint import DmEndpoint
+from .dm_followup import DmFollowup

meta_subject/models/diabetes/dm_endpoint.py

@@ -0,0 +1,61 @@
+from django.db import models
+from edc_constants.choices import YES_NO, YES_NO_RETIRED
+from edc_constants.constants import QUESTION_RETIRED
+from edc_model.models import BaseUuidModel
+from edc_model_fields.fields import OtherCharField
+
+from ...model_mixins import CrfModelMixin
+
+
+class DmEndpoint(CrfModelMixin, BaseUuidModel):
+    """A user model to enrolled patient onto the DM Referral
+    Schedule.
+    """
+
+    endpoint_reached = models.CharField(
+        verbose_name="Was the patient referred because the diabetes endpoint was reached?",
+        max_length=15,
+        choices=YES_NO,
+        null=True,
+        blank=False,
+        help_text="If YES, the EDC will check for the patient on the Endpoints report.",
+    )
+
+    # retired
+    dx_date = models.DateField(verbose_name="Date endpoint reached", null=True)
+
+    # retired
+    dx_initiated_by = models.CharField(
+        verbose_name="What initiated the diagnosis",
+        max_length=25,
+        default=QUESTION_RETIRED,
+    )
+
+    # retired
+    dx_initiated_by_other = OtherCharField(null=True, blank=True)
+
+    # retired
+    dx_tmg = models.CharField(
+        verbose_name="Was this case discussed with the TMG?",
+        max_length=25,
+        choices=YES_NO_RETIRED,
+        default=QUESTION_RETIRED,
+    )
+
+    # retired
+    dx_tmg_date = models.DateField(
+        verbose_name="If YES, provide the date of the TMG discussion", null=True, blank=True
+    )
+
+    # retired
+    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 endpoint"
+        verbose_name_plural = "Diabetes endpoint"

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,10 @@ 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 both FBG/RBG and OGTT
 
-    """A user model to capture IFG and OGTT"""
+    See also GlucoseFbg.
+    """
 
     fbg_performed = models.CharField(
         verbose_name="Was the FBG test performed?",
@@ -81,5 +74,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/physical_exam.py

@@ -35,6 +35,7 @@ class PhysicalExam(
         validators=[MinValueValidator(50.0), MaxValueValidator(175.0)],
         help_text="in centimeters",
         null=True,
+        blank=True,
     )
 
     jaundice = models.CharField(verbose_name="Jaundice?", max_length=15, choices=YES_NO)

meta_subject/models/signals.py

@@ -11,6 +11,7 @@ from meta_edc.meta_version import get_meta_version
 from meta_pharmacy.constants import METFORMIN
 from meta_visit_schedule.constants import SCHEDULE_PREGNANCY
 
+from . import Glucose, GlucoseFbg
 from .delivery import Delivery
 from .study_medication import StudyMedication
 from .subject_visit import SubjectVisit
@@ -105,3 +106,21 @@ def update_schedule_on_delivery_post_save(sender, instance, raw, **kwargs):
                 subject_identifier=instance.subject_identifier,
                 offschedule_datetime=offschedule_datetime,
             )
+
+
+@receiver(
+    post_save,
+    weak=False,
+    dispatch_uid="update_glucose_endpoints_for_subject_on_post_save",
+)
+def update_glucose_endpoints_for_subject_on_post_save(
+    sender, instance, raw, update_fields, **kwargs
+):
+    if not raw and not update_fields and sender in [Glucose, GlucoseFbg]:
+        from meta_analytics.dataframes import GlucoseEndpointsByDate
+
+        cls = GlucoseEndpointsByDate(
+            subject_identifiers=[instance.subject_visit.subject_identifier]
+        )
+        cls.run()
+        cls.to_model()

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/models/todo.txt

@@ -5,4 +5,4 @@
 - remove hepatitis
 - remove hba1c venous
 
-- add missing other specify fields on followup examination
+- add missing other specify fields on followup examination

meta_subject/static/meta_subject/slider.css

@@ -43,4 +43,4 @@ https://www.w3schools.com/howto/howto_js_rangeslider.asp
   border-radius: 50%;
   background: #4CAF50; /* Green background */
   cursor: pointer; /* Cursor on hover */
-}
+}

meta_subject/templates/meta_subject/endpoint_review_instructions.html

@@ -3,4 +3,4 @@
 <BR>FBG≥7.0 and OGTT≥11.1: Yes, endpoint reached
 <BR>FBG<7v and OGTT≥11.1: Yes, endpoint reached
 <BR>FBG≥7.0 and OGTT<11.1: Not today, repeat FBG in 1 week<BR>
-</P>
+</P>

meta_subject/templates/meta_subject/widgets/slider.html

@@ -20,4 +20,3 @@ slider.oninput = function() {
   output.innerHTML = this.value;
 }
 </script>
-

meta_subject/tests/holidays.csv

@@ -12,4 +12,4 @@
 2019-12-01,Mawlid Day,tanzania
 2019-12-09,Independence Day,tanzania
 2019-12-25,Christmas Day,tanzania
-2019-12-26,Boxing Day,tanzania
+2019-12-26,Boxing Day,tanzania

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:

meta_subject/tests/tests/test_medication_adherence.py

@@ -37,7 +37,11 @@ class TestMedicationAdherence(MetaTestCaseMixin, TestCase):
 
     def test_ok(self):
         subject_visit = self.get_next_subject_visit(self.subject_visit)
-        obj = make_recipe("meta_subject.medicationadherence", subject_visit=subject_visit)
+        obj = make_recipe(
+            "meta_subject.medicationadherence",
+            subject_visit=subject_visit,
+            report_datetime=subject_visit.report_datetime,
+        )
         form = MedicationAdherenceForm(instance=obj)
         form.is_valid()
         self.assertIsNone(form._errors)

meta_subject/tests/tests/test_metadata_rules.py

@@ -1,5 +1,5 @@
 from dateutil.relativedelta import relativedelta
-from django.test import TestCase
+from django.test import TestCase, tag
 from edc_appointment.models import Appointment
 from edc_constants.constants import FEMALE, MALE, YES
 from edc_utils import get_utcnow
@@ -10,7 +10,7 @@ from meta_consent.models import SubjectConsent
 from meta_screening.models import SubjectScreening
 from meta_screening.tests.meta_test_case_mixin import MetaTestCaseMixin
 from meta_subject.forms import FollowupExaminationForm
-from meta_visit_schedule.constants import DELIVERY, SCHEDULE_PREGNANCY
+from meta_visit_schedule.constants import DELIVERY, MONTH3, SCHEDULE_PREGNANCY
 
 
 class TestMetadataRules(MetaTestCaseMixin, TestCase):
@@ -99,7 +99,37 @@ class TestMetadataRules(MetaTestCaseMixin, TestCase):
             subject_screening=subject_screening,
             subject_consent=subject_consent,
         )
-        self.assertEqual(
-            ["meta_subject.delivery"],
+        self.assertIn(
+            "meta_subject.delivery",
+            [obj.model for obj in self.get_crf_metadata(subject_visit)],
+        )
+
+    @tag("4")
+    def test_health_economics_update_required(self):
+        """Assert healtheconomicsupdate is required starting w/1030"""
+        self.subject_visit = self.get_subject_visit(gender=FEMALE)
+        subject_visit = self.get_next_subject_visit(self.subject_visit)
+        subject_visit = self.get_next_subject_visit(subject_visit)
+        subject_visit = self.get_next_subject_visit(subject_visit)
+        self.assertEqual(subject_visit.visit_code, MONTH3)
+        self.assertIn(
+            "meta_subject.healtheconomicsupdate",
+            [obj.model for obj in self.get_crf_metadata(subject_visit)],
+        )
+
+        subject_visit = self.get_next_subject_visit(subject_visit)
+        self.assertIn(
+            "meta_subject.healtheconomicsupdate",
+            [obj.model for obj in self.get_crf_metadata(subject_visit)],
+        )
+        make_recipe(
+            "meta_subject.healtheconomicsupdate",
+            subject_visit=subject_visit,
+            report_datetime=subject_visit.report_datetime,
+        )
+
+        subject_visit = self.get_next_subject_visit(subject_visit)
+        self.assertNotIn(
+            "meta_subject.healtheconomicsupdate",
             [obj.model for obj in self.get_crf_metadata(subject_visit)],
         )