clinicedc 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

edc_visit_schedule/visit_schedule/visit_schedule.py

@@ -77,8 +77,7 @@ class VisitSchedule:
 
         if not re.match(self.name_regex, name):
             raise VisitScheduleNameError(
-                f"Visit schedule name may only contain {self.name_regex_msg}. "
-                f"Got {name}"
+                f"Visit schedule name may only contain {self.name_regex_msg}. " f"Got {name}"
             )
         self.title = self.verbose_name = verbose_name or " ".join(
             [s.capitalize() for s in name.split("_")]
@@ -131,9 +130,7 @@ class VisitSchedule:
             for schedule in self.schedules.values():
                 for consent_definition in schedule.consent_definitions:
                     models.update({schedule.onschedule_model: consent_definition.model})
-                    models.update(
-                        {schedule.offschedule_model: consent_definition.model}
-                    )
+                    models.update({schedule.offschedule_model: consent_definition.model})
                     for visit in schedule.visits.values():
                         for crf in visit.all_crfs:
                             models.update({crf.model: consent_definition.model})

edc_visit_tracking/crf_date_validator.py

@@ -37,8 +37,7 @@ class CrfDateValidator:
         subject_identifier=None,
     ):
         self.allow_report_datetime_before_visit = (
-            allow_report_datetime_before_visit
-            or self.allow_report_datetime_before_visit
+            allow_report_datetime_before_visit or self.allow_report_datetime_before_visit
         )
         self.report_datetime_allowance = (
             report_datetime_allowance or self.report_datetime_allowance

edc_visit_tracking/form_validators/visit_form_validator.py

@@ -234,11 +234,7 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
                 and EDC_VISIT_TRACKING_ALLOW_MISSED_UNSCHEDULED is False
             ):
                 raise forms.ValidationError(
-                    {
-                        "reason": (
-                            "Invalid. This is an unscheduled visit. See appointment."
-                        )
-                    },
+                    {"reason": ("Invalid. This is an unscheduled visit. See appointment.")},
                     code=INVALID_ERROR,
                 )
             # raise if CRF metadata exist
@@ -263,9 +259,7 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
             )
 
         if self.validate_missed_visit_reason:
-            self.required_if(
-                MISSED_VISIT, field="reason", field_required="reason_missed"
-            )
+            self.required_if(MISSED_VISIT, field="reason", field_required="reason_missed")
 
             self.required_if(
                 OTHER,

edc_visit_tracking/form_validators/visit_missed_form_validator.py

@@ -4,9 +4,7 @@ from edc_form_validators import FormValidator
 
 class VisitMissedFormValidator(FormValidator):
     def clean(self) -> None:
-        self.applicable_if(
-            YES, field="contact_attempted", field_applicable="contact_made"
-        )
+        self.applicable_if(YES, field="contact_attempted", field_applicable="contact_made")
         self.required_if(
             YES,
             field="contact_attempted",
@@ -18,9 +16,7 @@ class VisitMissedFormValidator(FormValidator):
             if self.cleaned_data.get("contact_attempts_count") is None
             else self.cleaned_data.get("contact_attempts_count")
         )
-        cond = (
-            self.cleaned_data.get("contact_made") == NO and contact_attempts_count < 3
-        )
+        cond = self.cleaned_data.get("contact_made") == NO and contact_attempts_count < 3
         self.required_if_true(
             cond,
             field_required="contact_attempts_explained",
@@ -39,6 +35,4 @@ class VisitMissedFormValidator(FormValidator):
             m2m_field="missed_reasons",
             field_other="missed_reasons_other",
         )
-        self.applicable_if(
-            ALIVE, UNKNOWN, field="survival_status", field_applicable="ltfu"
-        )
+        self.applicable_if(ALIVE, UNKNOWN, field="survival_status", field_applicable="ltfu")

edc_visit_tracking/migrations/0003_auto_20220913_2139.py

@@ -12,15 +12,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="subjectvisitmissedreasons",
             name="plural_name",
-            field=models.CharField(
-                max_length=250, null=True, verbose_name="Plural name"
-            ),
+            field=models.CharField(max_length=250, null=True, verbose_name="Plural name"),
         ),
         migrations.AddField(
             model_name="visitreasons",
             name="plural_name",
-            field=models.CharField(
-                max_length=250, null=True, verbose_name="Plural name"
-            ),
+            field=models.CharField(max_length=250, null=True, verbose_name="Plural name"),
         ),
     ]

edc_visit_tracking/migrations/0004_subjectvisit_subjectvisitmissedreasons_extra_value_and_more.py

@@ -10,6 +10,10 @@ import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
 import edc_metadata.metadata_helper.metadata_helper_mixin
 import edc_metadata.model_mixins.creates.creates_metadata_model_mixin
 import edc_model.models.fields.other_charfield
@@ -18,10 +22,6 @@ import edc_model_fields.fields.other_charfield
 import edc_protocol.validators
 import edc_sites.models
 import edc_utils.date
-import simple_history.models
-from django.conf import settings
-from django.db import migrations, models
-
 import edc_visit_tracking.managers
 
 
@@ -101,9 +101,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",
@@ -465,9 +463,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",
@@ -726,9 +722,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",
@@ -1088,9 +1082,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "device_created",
-                    models.CharField(
-                        blank=True, max_length=10, verbose_name="Device created"
-                    ),
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
                 ),
                 (
                     "device_modified",

edc_visit_tracking/model_mixins/base/visit_methods_model_mixin.py

@@ -53,9 +53,7 @@ class VisitMethodsModelMixin(models.Model):
                     related_visit_field_cls = field
                     break
         if not related_visit_field_cls:
-            raise RelatedVisitFieldError(
-                f"Related visit field class not found. See {cls}."
-            )
+            raise RelatedVisitFieldError(f"Related visit field class not found. See {cls}.")
         return related_visit_field_cls
 
     @classmethod
@@ -73,9 +71,7 @@ class VisitMethodsModelMixin(models.Model):
                 if issubclass(related_model, (VisitModelMixin,)):
                     break
         if not related_model:
-            raise RelatedVisitFieldError(
-                f"Related visit field class not found. See {cls}."
-            )
+            raise RelatedVisitFieldError(f"Related visit field class not found. See {cls}.")
         return related_model
 
     @classmethod

edc_visit_tracking/model_mixins/crfs/visit_tracking_crf_model_mixin.py

@@ -12,9 +12,7 @@ from edc_visit_schedule.model_mixins import CrfScheduleModelMixin
 from ..base import VisitMethodsModelMixin
 
 
-class VisitTrackingCrfModelMixin(
-    VisitMethodsModelMixin, CrfScheduleModelMixin, models.Model
-):
+class VisitTrackingCrfModelMixin(VisitMethodsModelMixin, CrfScheduleModelMixin, models.Model):
     """Base mixin for all CRF models (used by edc-crf CrfModelMixin).
 
     CRFs have a OneToOne relation to the related visit model

edc_visit_tracking/model_mixins/requisitions/visit_tracking_requisition_model_mixin.py

@@ -17,9 +17,7 @@ class VisitTrackingRequisitionModelMixin(
 ):
     """Model mixin used by RequisitionModelMixin (edc-lab)"""
 
-    subject_visit = models.ForeignKey(
-        settings.SUBJECT_VISIT_MODEL, on_delete=models.PROTECT
-    )
+    subject_visit = models.ForeignKey(settings.SUBJECT_VISIT_MODEL, on_delete=models.PROTECT)
 
     report_datetime = models.DateTimeField(
         verbose_name=_("Report Date"),

edc_visit_tracking/model_mixins/subject_visit_missed_model_mixin.py

@@ -97,9 +97,7 @@ class SubjectVisitMissedModelMixin(models.Model):
     missed_reasons_other = edc_models.OtherCharField()
 
     ltfu = models.CharField(
-        verbose_name=_(
-            "Has the participant met the protocol criteria for lost to follow up?"
-        ),
+        verbose_name=_("Has the participant met the protocol criteria for lost to follow up?"),
         max_length=15,
         choices=YES_NO_NA,
         default=NO,

edc_visit_tracking/model_mixins/visit_model_mixin/visit_model_fields_mixin.py

@@ -27,8 +27,7 @@ class VisitModelFieldsMixin(models.Model):
     )
 
     reason_unscheduled = models.CharField(
-        verbose_name="If 'unscheduled', provide the reason for "
-        "the unscheduled visit",
+        verbose_name="If 'unscheduled', provide the reason for " "the unscheduled visit",
         max_length=25,
         choices=VISIT_REASON_UNSCHEDULED,
         default=NOT_APPLICABLE,

edc_visit_tracking/modeladmin_mixins/crf_model_admin_mixin.py

@@ -104,15 +104,11 @@ class CrfModelAdminMixin:
         if db_field.name == self.related_visit_model_attr:
             related_visit_id = self.related_visit_id(request)
             if related_visit_id and UUID_PATTERN.match(related_visit_id):
-                kwargs["queryset"] = (
-                    self.related_visit_model_cls._default_manager.using(db).filter(
-                        id__exact=related_visit_id
-                    )
-                )
+                kwargs["queryset"] = self.related_visit_model_cls._default_manager.using(
+                    db
+                ).filter(id__exact=related_visit_id)
             else:
-                kwargs["queryset"] = (
-                    self.related_visit_model_cls._default_manager.none()
-                )
+                kwargs["queryset"] = self.related_visit_model_cls._default_manager.none()
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
     def get_readonly_fields(

edc_visit_tracking/modeladmin_mixins/visit_model_admin_mixin.py

@@ -97,9 +97,9 @@ class VisitModelAdminMixin(DocumentStatusModelAdminMixin):
     def formfield_for_foreignkey(self, db_field, request: WSGIRequest, **kwargs):
         db = kwargs.get("using")
         if db_field.name == "appointment" and request.GET.get("appointment"):
-            kwargs["queryset"] = db_field.related_model._default_manager.using(
-                db
-            ).filter(pk=request.GET.get("appointment"))
+            kwargs["queryset"] = db_field.related_model._default_manager.using(db).filter(
+                pk=request.GET.get("appointment")
+            )
         else:
             kwargs["queryset"] = db_field.related_model._default_manager.none()
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
@@ -151,8 +151,6 @@ class VisitModelAdminMixin(DocumentStatusModelAdminMixin):
         else:
             initial_data.update(
                 report_datetime=appointment.appt_datetime,
-                reason=(
-                    SCHEDULED if appointment.visit_code_sequence == 0 else UNSCHEDULED
-                ),
+                reason=(SCHEDULED if appointment.visit_code_sequence == 0 else UNSCHEDULED),
             )
         return initial_data

edc_visit_tracking/modelform_mixins/crf/visit_tracking_crf_modelform_mixin.py

@@ -32,9 +32,7 @@ class VisitTrackingCrfModelFormMixin:
     """
 
     crf_date_validator_cls = CrfDateValidator
-    report_datetime_allowance = getattr(
-        settings, "DEFAULT_REPORT_DATETIME_ALLOWANCE", 0
-    )
+    report_datetime_allowance = getattr(settings, "DEFAULT_REPORT_DATETIME_ALLOWANCE", 0)
     visit_sequence_cls = VisitSequence
 
     def clean(self: Any) -> dict:
@@ -99,9 +97,7 @@ class VisitTrackingCrfModelFormMixin:
             try:
                 self.crf_date_validator_cls(
                     report_datetime_allowance=self.report_datetime_allowance,
-                    report_datetime=self.cleaned_data.get(
-                        self.report_datetime_field_attr
-                    ),
+                    report_datetime=self.cleaned_data.get(self.report_datetime_field_attr),
                     visit_report_datetime=self.related_visit.report_datetime,
                 )
             except (

edc_visit_tracking/modelform_mixins/utils.py

@@ -17,9 +17,7 @@ if TYPE_CHECKING:
 
     from ..modelform_mixins import VisitTrackingCrfModelFormMixin
 
-    class RelatedVisitModel(
-        SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel
-    ):
+    class RelatedVisitModel(SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel):
         pass
 
 

edc_visit_tracking/modelform_mixins/visit_tracking_modelform_mixin.py

@@ -31,8 +31,7 @@ class VisitTrackingModelFormMixin(SiteModelFormMixin):
             raise forms.ValidationError(
                 {
                     "reason": (
-                        "Invalid. Appointment is missed. "
-                        "Expected visit to be missed also."
+                        "Invalid. Appointment is missed. " "Expected visit to be missed also."
                     )
                 }
             )

edc_visit_tracking/models/signals.py

@@ -11,9 +11,7 @@ from ..constants import SCHEDULED
 from ..model_mixins import SubjectVisitMissedModelMixin
 
 
-@receiver(
-    post_save, weak=False, dispatch_uid="visit_tracking_check_in_progress_on_post_save"
-)
+@receiver(post_save, weak=False, dispatch_uid="visit_tracking_check_in_progress_on_post_save")
 def visit_tracking_check_in_progress_on_post_save(
     sender, instance, raw, created, using, update_fields, **kwargs  # noqa
 ):

edc_visit_tracking/stubs.py

@@ -39,6 +39,4 @@ class RelatedVisitModelStub(Protocol):
     def update_document_status_on_save(self, update_fields=None) -> None: ...
 
 
-TRelatedVisitModelStub = TypeVar(
-    "TRelatedVisitModelStub", bound="RelatedVisitModelStub"
-)
+TRelatedVisitModelStub = TypeVar("TRelatedVisitModelStub", bound="RelatedVisitModelStub")

edc_visit_tracking/utils.py

@@ -31,8 +31,7 @@ def get_related_visit_model_cls() -> Type[SubjectVisit]:
     if model_cls._meta.proxy:
         # raise for now until we have a solution
         raise RelatedVisitModelError(
-            "Not allowed. Related visit model may not be a "
-            f"proxy model. Got {model_cls}. "
+            "Not allowed. Related visit model may not be a " f"proxy model. Got {model_cls}. "
         )
     return model_cls
 

edc_visit_tracking/view_utils/related_visit_button.py

@@ -30,9 +30,7 @@ __all__ = ["RelatedVisitButton"]
 class RelatedVisitButton(DashboardModelButton):
     appointment: Appointment = None
     model_obj: RelatedVisitModel = None
-    labels: tuple[str, str, str] = field(
-        default=("Start", "Visit Report", "Visit Report")
-    )
+    labels: tuple[str, str, str] = field(default=("Start", "Visit Report", "Visit Report"))
     model_cls: Type[RelatedVisitModel] = field(default=None)
 
     def __post_init__(self):

edc_visit_tracking/visit_sequence.py

@@ -21,9 +21,7 @@ class VisitSequence:
     that visits are filled in sequence.
     """
 
-    def __init__(
-        self, appointment: Appointment, skip_enforce: bool | None = None
-    ) -> None:
+    def __init__(self, appointment: Appointment, skip_enforce: bool | None = None) -> None:
         self._previous_appointment = None
         self.appointment = appointment
         self.skip_enforce = skip_enforce  # for tests

edc_vitals/__init__.py

@@ -0,0 +1,2 @@
+from .utils import calculate_avg_bp, has_g3_fever, has_g4_fever, has_severe_htn
+from .validators import bp_validator

edc_vitals/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig as DjangoAppConfig
+
+
+class AppConfig(DjangoAppConfig):
+    name = "edc_vitals"
+    verbose_name = "Edc Vitals"

edc_vitals/calculators/__init__.py

@@ -0,0 +1 @@
+from .bmi import BMI, CalculatorError, calculate_bmi

edc_vitals/calculators/bmi.py

@@ -0,0 +1,70 @@
+from dateutil.relativedelta import relativedelta
+
+from edc_utils import age, get_utcnow
+from edc_utils.round_up import round_half_away_from_zero
+
+__all__ = ["calculate_bmi", "BMI", "CalculatorError"]
+
+
+class CalculatorError(Exception):
+    pass
+
+
+class BMI:
+    """Calculate BMI, raise if not adult."""
+
+    def __init__(
+        self,
+        weight_kg=None,
+        height_cm=None,
+        lower_bmi_value=None,
+        upper_bmi_value=None,
+        dob=None,
+        report_datetime=None,
+        **kwargs,
+    ):
+        if not weight_kg or not height_cm:
+            raise CalculatorError(f"Unable to calculate BMI. Got {weight_kg}kg, {height_cm}cm")
+        if age(dob, report_datetime).years < 18:
+            raise CalculatorError("Unable to calculate BMI. Got age<18")
+        self.lower = float(lower_bmi_value or 5.0)
+        self.upper = float(upper_bmi_value or 75.0)
+        self.weight = float(weight_kg)
+        self.height = float(height_cm) / 100.0
+        self.raw_bmi_value = self.weight / (self.height**2)
+        if not (self.lower <= self.raw_bmi_value <= self.upper):
+            raise CalculatorError(
+                "BMI value is absurd. "
+                f"Using {self.weight}kg, {self.height}m. Got {self.value}."
+            )
+
+    @property
+    def value(self):
+        return round_half_away_from_zero(self.raw_bmi_value, 4)
+
+
+def calculate_bmi(
+    weight_kg=None,
+    height_cm=None,
+    lower_bmi_value=None,
+    upper_bmi_value=None,
+    dob=None,
+    report_datetime=None,
+    **kwargs,
+):
+    """Returns a BMI instance or None.
+
+    Assumes adult dob (18) if dob not provided."""
+    bmi = None
+    if height_cm and weight_kg:
+        report_datetime = report_datetime or get_utcnow()
+        bmi = BMI(
+            weight_kg=weight_kg,
+            height_cm=height_cm,
+            lower_bmi_value=lower_bmi_value,
+            upper_bmi_value=upper_bmi_value,
+            dob=dob or report_datetime - relativedelta(years=18),
+            report_datetime=report_datetime,
+            **kwargs,
+        )
+    return bmi

edc_vitals/form_validators/__init__.py

@@ -0,0 +1,5 @@
+from .blood_pressure_form_validator_mixin import BloodPressureFormValidatorMixin
+from .bmi_form_validator_mixin import BmiFormValidatorMixin
+from .weight_height_with_bmi_form_validator_mixin import (
+    WeightHeightBmiFormValidatorMixin,
+)

edc_vitals/form_validators/blood_pressure_form_validator_mixin.py

@@ -0,0 +1,40 @@
+from django import forms
+
+from edc_constants.constants import YES
+
+from ..utils import calculate_avg_bp, has_severe_htn
+
+
+class BloodPressureFormValidatorMixin:
+    """Coupled with BloodPressureModelMixin"""
+
+    @staticmethod
+    def raise_on_avg_blood_pressure_suggests_severe_htn(
+        use_avg=None, severe_htn_field_name=None, errmsg=None, **kwargs
+    ):
+        """Raise if BP is >= 180/110, See settings"""
+        severe_htn_field_name = severe_htn_field_name or "severe_htn"
+        severe_htn_response = kwargs.get(severe_htn_field_name)
+        errmsg = {
+            severe_htn_field_name: (errmsg or "Invalid. Patient has severe hypertension")
+        }
+        use_avg = True if use_avg is None else False
+        avg_sys, avg_dia = calculate_avg_bp(use_av=use_avg, **kwargs)
+        if has_severe_htn(sys=avg_sys, dia=avg_dia):
+            if severe_htn_response != YES:
+                raise forms.ValidationError(errmsg)
+
+    @staticmethod
+    def raise_on_systolic_lt_diastolic_bp(
+        sys_field: str = None, dia_field: str = None, **kwargs
+    ) -> None:
+        """Raise if systolic BP is < diastolic BP."""
+        sys_field = sys_field or "sys_blood_pressure"
+        dia_field = dia_field or "dia_blood_pressure"
+        sys_response = kwargs.get(sys_field)
+        dia_response = kwargs.get(dia_field)
+        if sys_response and dia_response:
+            if sys_response < dia_response:
+                raise forms.ValidationError(
+                    {dia_field: "Invalid. Diastolic must be less than systolic."}
+                )

edc_vitals/form_validators/bmi_form_validator_mixin.py

@@ -0,0 +1,19 @@
+from django import forms
+
+from ..calculators import CalculatorError, calculate_bmi
+
+__all__ = ["BmiFormValidatorMixin"]
+
+
+class BmiFormValidatorMixin:
+    def validate_bmi(self, **kwargs):
+        try:
+            bmi = calculate_bmi(
+                height_cm=self.cleaned_data.get("height"),
+                weight_kg=self.cleaned_data.get("weight"),
+                **self.cleaned_data,
+                **kwargs,
+            )
+        except CalculatorError as e:
+            raise forms.ValidationError(e)
+        return bmi

edc_vitals/form_validators/weight_height_with_bmi_form_validator_mixin.py

@@ -0,0 +1,13 @@
+from django import forms
+
+from ..calculators import CalculatorError, calculate_bmi
+
+
+class WeightHeightBmiFormValidatorMixin:
+    @staticmethod
+    def validate_weight_height_with_bmi(weight_kg=None, height_cm=None, **kwargs):
+        try:
+            bmi = calculate_bmi(weight_kg=weight_kg, height_cm=height_cm, **kwargs)
+        except CalculatorError as e:
+            raise forms.ValidationError(f"Please check weight and height. {e}")
+        return bmi

edc_vitals/model_mixins/__init__.py

@@ -0,0 +1,5 @@
+from .blood_pressure_model_mixin import (
+    BloodPressureModelMixin,
+    SimpleBloodPressureModelMixin,
+)
+from .weight_height_bmi_model_mixin import WeightHeightBmiModelMixin

edc_vitals/model_mixins/blood_pressure_model_mixin.py

@@ -0,0 +1,80 @@
+from django.db import models
+
+from edc_constants.choices import YES_NO
+
+from ..models import DiastolicPressureField, SystolicPressureField
+from ..utils import calculate_avg_bp
+
+
+class SimpleBloodPressureModelMixin(models.Model):
+    sys_blood_pressure = SystolicPressureField(
+        null=True,
+        blank=True,
+    )
+
+    dia_blood_pressure = DiastolicPressureField(
+        null=True,
+        blank=True,
+    )
+
+    class Meta:
+        abstract = True
+
+
+class BloodPressureModelMixin(models.Model):
+    sys_blood_pressure_one = SystolicPressureField(
+        verbose_name="Blood pressure: systolic (first reading)",
+        null=True,
+        blank=True,
+    )
+
+    dia_blood_pressure_one = DiastolicPressureField(
+        verbose_name="Blood pressure: diastolic (first reading)",
+        null=True,
+        blank=True,
+    )
+
+    sys_blood_pressure_two = SystolicPressureField(
+        verbose_name="Blood pressure: systolic (second reading)",
+        null=True,
+        blank=True,
+    )
+
+    dia_blood_pressure_two = DiastolicPressureField(
+        verbose_name="Blood pressure: diastolic (second reading)",
+        null=True,
+        blank=True,
+    )
+
+    sys_blood_pressure_avg = models.IntegerField(
+        verbose_name="Blood pressure: systolic (average)",
+        null=True,
+        blank=True,
+    )
+
+    dia_blood_pressure_avg = models.IntegerField(
+        verbose_name="Blood pressure: diastolic (average)",
+        null=True,
+        blank=True,
+    )
+
+    # TODO: is this being validated
+
+    severe_htn = models.CharField(
+        verbose_name="Does the patient have severe hypertension?",
+        max_length=15,
+        choices=YES_NO,
+        help_text="Based on the above readings. Severe HTN is any BP reading > 180/110mmHg",
+        null=True,
+        blank=True,
+    )
+
+    def save(self, *args, **kwargs):
+        (
+            self.sys_blood_pressure_avg,
+            self.dia_blood_pressure_avg,
+        ) = calculate_avg_bp(**self.__dict__)
+        super().save(*args, **kwargs)
+
+    class Meta:
+        abstract = True