Rename admission_date to encounter_date and clean column

care/abdm/utils/fhir.py

@@ -212,7 +212,7 @@
             title="Care Plan",
             description="This includes Treatment Summary, Prescribed Medication, General Notes and Special Instructions",
             period=Period(
-                start=self.consultation.admission_date.isoformat(),
+                start=self.consultation.encounter_date.isoformat(),
                 end=self.consultation.discharge_date.isoformat()
                 if self.consultation.discharge_date
                 else None,
@@ -355,7 +355,7 @@
 
         id = str(self.consultation.external_id)
         status = "finished" if self.consultation.discharge_date else "in-progress"
-        period_start = self.consultation.admission_date.isoformat()
+        period_start = self.consultation.encounter_date.isoformat()
         period_end = (
             self.consultation.discharge_date.isoformat()
             if self.consultation.discharge_date
@@ -463,7 +463,7 @@
     def _medication_request(self, medicine):
         id = str(uuid())
         prescription_date = (
-            self.consultation.admission_date.isoformat()
+            self.consultation.encounter_date.isoformat()
         )  # TODO: change to the time of prescription
         status = "unknown"  # TODO: get correct status active | on-hold | cancelled | completed | entered-in-error | stopped | draft | unknown
         dosage_text = f"{medicine['dosage_new']} / {medicine['dosage']} for {medicine['days']} days"

care/facility/api/serializers/bed.py

@@ -235,10 +235,7 @@ def validate(self, attrs):
             raise ValidationError(
                 {"end_date": "End date cannot be before the start date"}
             )
-        if (
-            consultation.admission_date
-            and consultation.admission_date > current_start_date
-        ):
+        if consultation.encounter_date > current_start_date:
             raise ValidationError(
                 {"start_date": "Start date cannot be before the admission date"}
             )

care/facility/api/serializers/patient_consultation.py

@@ -367,7 +367,7 @@
             and last_consultation.suggestion == SuggestionChoices.A
             and last_consultation.discharge_date
             and last_consultation.discharge_date + timedelta(days=30)
-            > consultation.admission_date
+            > consultation.encounter_date
         ):
             consultation.is_readmission = True
         consultation.save()
@@ -473,6 +473,13 @@
 
         return value
 
+    def validate_encounter_date(self, value):
+        if value > now():
+            raise ValidationError(
+                {"encounter_date": "This field value cannot be in the future."}
+            )
+        return value
+
     def validate(self, attrs):
         validated = super().validate(attrs)
         # TODO Add Bed Authorisation Validation
@@ -524,17 +531,6 @@
                     validated["referred_to"] = None
                 elif validated.get("referred_to"):
                     validated["referred_to_external"] = None
-            if validated["suggestion"] is SuggestionChoices.A:
-                if not validated.get("admission_date"):
-                    raise ValidationError(
-                        {
-                            "admission_date": "This field is required as the patient has been admitted."
-                        }
-                    )
-                if validated["admission_date"] > now():
-                    raise ValidationError(
-                        {"admission_date": "This field value cannot be in the future."}
-                    )
 
         if "action" in validated:
             if validated["action"] == PatientRegistration.ActionEnum.REVIEW:
@@ -634,13 +630,10 @@
                 raise ValidationError(
                     {"death_datetime": "This field value cannot be in the future."}
                 )
-            if (
-                self.instance.admission_date
-                and attrs.get("death_datetime") < self.instance.admission_date
-            ):
+            if attrs.get("death_datetime") < self.instance.encounter_date:
                 raise ValidationError(
                     {
-                        "death_datetime": "This field value cannot be before the admission date."
+                        "death_datetime": "This field value cannot be before the encounter date."
                     }
                 )
             if not attrs.get("death_confirmed_doctor"):
@@ -654,13 +647,10 @@
             raise ValidationError(
                 {"discharge_date": "This field value cannot be in the future."}
             )
-        elif (
-            self.instance.admission_date
-            and attrs.get("discharge_date") < self.instance.admission_date
-        ):
+        elif attrs.get("discharge_date") < self.instance.encounter_date:
             raise ValidationError(
                 {
-                    "discharge_date": "This field value cannot be before the admission date."
+                    "discharge_date": "This field value cannot be before the encounter date."
                 }
             )
         return attrs

care/facility/api/viewsets/patient.py

@@ -139,8 +139,8 @@ def filter_by_category(self, queryset, name, value):
     last_consultation_kasp_enabled_date = filters.DateFromToRangeFilter(
         field_name="last_consultation__kasp_enabled_date"
     )
-    last_consultation_admission_date = filters.DateFromToRangeFilter(
-        field_name="last_consultation__admission_date"
+    last_consultation_encounter_date = filters.DateFromToRangeFilter(
+        field_name="last_consultation__encounter_date"
     )
     last_consultation_discharge_date = filters.DateFromToRangeFilter(
         field_name="last_consultation__discharge_date"
@@ -332,7 +332,7 @@ class PatientViewSet(
         "date_declared_positive",
         "date_of_result",
         "last_vaccinated_date",
-        "last_consultation_admission_date",
+        "last_consultation_encounter_date",
         "last_consultation_discharge_date",
         "last_consultation_symptoms_onset_date",
     ]

care/facility/migrations/0403_rename_admission_date_to_encounter_date_and_more.py

@@ -0,0 +1,70 @@
+# Generated by Django 4.2.5 on 2023-11-27 07:00
+
+import django.utils.timezone
+from django.db import migrations, models
+from django.db.models import F
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("facility", "0402_patientconsultation_new_discharge_reason"),
+    ]
+
+    def clean_encounter_date(apps, schema_editor):
+        PatientConsultation = apps.get_model("facility", "PatientConsultation")
+
+        # Set `encounter_date` to `created_date` for all consultations with
+        # suggestions that are not Admission, Domiciliary Care.
+        #
+        # Reason:
+        # We were not capturing `admission_date` (now `encounter_date`) for
+        # these consultations earlier, but could still be set by mistake.
+        #
+        # Example:
+        # Edit Consultation allowed changing suggestion to non Admission/Domiciliary Care
+        # without clearing `admission_date` (now `encounter_date`).
+        PatientConsultation.objects.exclude(suggestion__in=["A", "DC"]).update(
+            encounter_date=F("created_date")
+        )
+
+        # Set `encounter_date` to `created_date` for all consultations with
+        # `encounter_date` as `null`.
+        #
+        # Reason:
+        # We were not capturing `encounter_date` for these consultations as
+        # it was not set for these.
+        PatientConsultation.objects.filter(encounter_date=None).update(
+            encounter_date=F("created_date")
+        )
+
+    def reverse_clean_encounter_date(apps, schema_editor):
+        PatientConsultation = apps.get_model("facility", "PatientConsultation")
+
+        # Set `encounter_date` to `null` for all consultations with suggestions
+        # that are not Admission/Domiciliary Care.
+        PatientConsultation.objects.exclude(suggestion__in=["A", "DC"]).update(
+            encounter_date=None
+        )
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="patientconsultation",
+            name="if_admitted",
+        ),
+        migrations.RenameField(
+            model_name="patientconsultation",
+            old_name="admission_date",
+            new_name="encounter_date",
+        ),
+        migrations.RunPython(
+            clean_encounter_date,
+            reverse_code=reverse_clean_encounter_date,
+        ),
+        migrations.AlterField(
+            model_name="patientconsultation",
+            name="encounter_date",
+            field=models.DateTimeField(
+                db_index=True, default=django.utils.timezone.now
+            ),
+        ),
+    ]

care/facility/models/patient_consultation.py

@@ -2,6 +2,7 @@
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import JSONField
+from django.utils import timezone
 from multiselectfield import MultiSelectField
 from multiselectfield.utils import get_max_length
 
@@ -127,7 +128,7 @@ class PatientConsultation(PatientBaseModel, ConsultationRelatedPermissionMixin):
     referred_by_external = models.TextField(default="", null=True, blank=True)
     is_readmission = models.BooleanField(default=False)
     admitted = models.BooleanField(default=False)  # Deprecated
-    admission_date = models.DateTimeField(null=True, blank=True)  # Deprecated
+    encounter_date = models.DateTimeField(default=timezone.now, db_index=True)
     icu_admission_date = models.DateTimeField(null=True, blank=True)
     discharge_date = models.DateTimeField(null=True, blank=True)
     discharge_reason = models.CharField(
@@ -236,7 +237,7 @@ def get_related_consultation(self):
 
     CSV_MAPPING = {
         "consultation_created_date": "Date of Consultation",
-        "admission_date": "Date of Admission",
+        "encounter_date": "Date of Admission",
         "symptoms_onset_date": "Date of Onset of Symptoms",
         "symptoms": "Symptoms at time of consultation",
         "deprecated_covid_category": "Covid Category",
@@ -256,7 +257,7 @@ def get_related_consultation(self):
     }
 
     # CSV_DATATYPE_DEFAULT_MAPPING = {
-    #     "admission_date": (None, models.DateTimeField(),),
+    #     "encounter_date": (None, models.DateTimeField(),),
     #     "symptoms_onset_date": (None, models.DateTimeField(),),
     #     "symptoms": ("-", models.CharField(),),
     #     "category": ("-", models.CharField(),),
@@ -286,10 +287,6 @@ class Meta:
                 | models.Q(referred_to__isnull=False)
                 | models.Q(referred_to_external__isnull=False),
             ),
-            models.CheckConstraint(
-                name="if_admitted",
-                check=models.Q(admitted=False) | models.Q(admission_date__isnull=False),
-            ),
         ]
 
     @staticmethod

care/facility/models/patient_icmr.py

@@ -179,8 +179,8 @@ def lab_pincode(self):
     @property
     def hospitalization_date(self):
         return (
-            self.consultation.admission_date.date()
-            if self.consultation and self.consultation.admission_date
+            self.consultation.encounter_date.date()
+            if self.consultation and self.consultation.encounter_date
             else None
         )
 

care/facility/tests/test_consultation_bed_api.py

@@ -242,8 +242,8 @@ def test_start_date_before_end_date(self):
             {"end_date": ["End date cannot be before the start date"]},
         )
 
-    def test_start_date_before_consultation_admission_date(self):
-        self.consultation.admission_date = timezone.now()
+    def test_start_date_before_consultation_encounter_date(self):
+        self.consultation.encounter_date = timezone.now()
         self.consultation.save()
         response = self.client.post(
             "/api/v1/consultationbed/",

care/facility/tests/test_patient_api.py

@@ -104,7 +104,7 @@ def setUpTestData(cls) -> None:
             facility=cls.facility,
             created_by=cls.user,
             suggestion="A",
-            admission_date=now(),
+            encounter_date=now(),
         )
 
     def setUp(self):
@@ -235,7 +235,7 @@ def setUpTestData(cls):
             facility=cls.facility,
             created_by=cls.user,
             suggestion="A",
-            admission_date=now(),
+            encounter_date=now(),
         )
         cls.bed = cls.create_bed(cls.facility, cls.location)
         cls.consultation_bed = cls.create_consultation_bed(cls.consultation, cls.bed)
@@ -287,7 +287,7 @@ def setUpTestData(cls):
             facility=cls.facility,
             created_by=cls.user,
             suggestion="A",
-            admission_date=now(),
+            encounter_date=now(),
             discharge_date=None,  # Patient is currently admitted
             discharge_reason=None,
         )