fix: Add new fields for patient discharge feature

care/facility/api/viewsets/patient.py

@@ -369,6 +369,30 @@ def discharge_patient(self, request, *args, **kwargs):
             if last_consultation.discharge_date is None:
                 last_consultation.discharge_date = current_time
             last_consultation.current_bed = None
+            if reason == "EXP":
+                death_datetime = request.data.get("death_datetime")
+                death_confirmed_doctor = request.data.get("death_confirmed_doctor")
+                if death_datetime is None:
+                    raise serializers.ValidationError(
+                        {"death_datetime": "Please provide death date and time"}
+                    )
+                if death_confirmed_doctor is None:
+                    raise serializers.ValidationError(
+                        {"death_confirmed_doctor": "Please provide doctor details"}
+                    )
+                last_consultation.death_datetime = death_datetime
+                last_consultation.death_confirmed_doctor = death_confirmed_doctor
+            if reason == "REC":
+                prn_prescription = request.data.get("prn_prescription", [])
+                discharge_advice = request.data.get("discharge_advice", [])
+                discharge_date = request.data.get("discharge_date")
+                if discharge_date is None:
+                    raise serializers.ValidationError(
+                        {"discharge_date": "Please set the discharge date"}
+                    )
+                last_consultation.prn_prescription = prn_prescription
+                last_consultation.discharge_advice = discharge_advice
+                last_consultation.discharge_date = discharge_date
             last_consultation.save()
             ConsultationBed.objects.filter(
                 consultation=last_consultation, end_date__isnull=True

care/facility/migrations/0333_auto_20230112_2233.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.2.11 on 2023-01-12 17:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("facility", "0332_auto_20230110_2114"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="patientconsultation",
+            name="death_confirmed_doctor",
+            field=models.TextField(blank=True, default="", null=True),
+        ),
+        migrations.AddField(
+            model_name="patientconsultation",
+            name="death_datetime",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

care/facility/models/patient_consultation.py

@@ -34,7 +34,9 @@ class PatientConsultation(PatientBaseModel, PatientRelatedPermissionMixin):
     REVERSE_SUGGESTION_CHOICES = reverse_choices(SUGGESTION_CHOICES)
 
     patient = models.ForeignKey(
-        "PatientRegistration", on_delete=models.CASCADE, related_name="consultations"
+        "PatientRegistration",
+        on_delete=models.CASCADE,
+        related_name="consultations",
     )
 
     ip_no = models.CharField(max_length=100, default="", null=True, blank=True)
@@ -94,6 +96,8 @@ class PatientConsultation(PatientBaseModel, PatientRelatedPermissionMixin):
         null=True,
     )
     discharge_notes = models.TextField(default="", null=True, blank=True)
+    death_datetime = models.DateTimeField(null=True, blank=True)
+    death_confirmed_doctor = models.TextField(default="", null=True, blank=True)
     bed_number = models.CharField(max_length=100, null=True, blank=True)  # Deprecated
 
     is_kasp = models.BooleanField(default=False)
@@ -103,7 +107,10 @@ class PatientConsultation(PatientBaseModel, PatientRelatedPermissionMixin):
     last_updated_by_telemedicine = models.BooleanField(default=False)  # Deprecated
 
     assigned_to = models.ForeignKey(
-        User, on_delete=models.SET_NULL, null=True, related_name="patient_assigned_to"
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        related_name="patient_assigned_to",
     )
 
     verified_by = models.TextField(default="", null=True, blank=True)
@@ -113,11 +120,17 @@ class PatientConsultation(PatientBaseModel, PatientRelatedPermissionMixin):
     )
 
     last_edited_by = models.ForeignKey(
-        User, on_delete=models.SET_NULL, null=True, related_name="last_edited_user"
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        related_name="last_edited_user",
     )
 
     last_daily_round = models.ForeignKey(
-        "facility.DailyRound", on_delete=models.SET_NULL, null=True, default=None
+        "facility.DailyRound",
+        on_delete=models.SET_NULL,
+        null=True,
+        default=None,
     )
 
     current_bed = models.ForeignKey(