Fix for Incorrect Discharge Reasons in Patient Transfers and Readmissions

care/facility/api/serializers/patient.py

@@ -27,6 +27,7 @@
     PatientNotes,
     PatientRegistration,
 )
+from care.facility.models.bed import ConsultationBed
 from care.facility.models.notification import Notification
 from care.facility.models.patient_base import (
     BLOOD_GROUP_CHOICES,
@@ -453,9 +454,18 @@
 
     def save(self, **kwargs):
         self.instance.facility = self.validated_data["facility"]
-        PatientConsultation.objects.filter(
+        consultation = PatientConsultation.objects.filter(
             patient=self.instance, discharge_date__isnull=True
-        ).update(discharge_date=localtime(now()))
+        ).first()
+
+        consultation.discharge_date = localtime(now())
+        consultation.discharge_reason = "REF"
+        consultation.current_bed = None
+        consultation.save()
+
+        ConsultationBed.objects.filter(
+            consultation=consultation, end_date__isnull=True
+        ).update(end_date=now())
         self.instance.save()
 
 

care/facility/api/viewsets/patient.py

@@ -426,10 +426,21 @@
     @action(detail=True, methods=["POST"])
     def transfer(self, request, *args, **kwargs):
         patient = PatientRegistration.objects.get(external_id=kwargs["external_id"])
+        facility = Facility.objects.get(external_id=request.data["facility"])
+
+        if patient.is_active and facility == patient.facility:
+            return Response(
+                {
+                    "Patient": "Patient transfer cannot be completed because the patient has an active consultation in the same facility"
+                },
+                status=status.HTTP_406_NOT_ACCEPTABLE,
+            )
 
         if patient.allow_transfer is False:
             return Response(
-                {"Patient": "Cannot Transfer Patient , Source Facility Does Not Allow"},
+                {
+                    "Patient": "Patient transfer cannot be completed because the source facility does not permit it"
+                },
                 status=status.HTTP_406_NOT_ACCEPTABLE,
             )
         patient.allow_transfer = False

care/facility/migrations/0394_auto_20231114_2219.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.6 on 2023-11-14 16:49
+
+from django.db import migrations
+
+
+def free_discharged_beds(apps, schema_editor):
+    PatientConsultation = apps.get_model("facility", "PatientConsultation")
+    ConsultationBed = apps.get_model("facility", "ConsultationBed")
+
+    for consultation in PatientConsultation.objects.filter(
+        discharge_date__isnull=False
+    ):
+        ConsultationBed.objects.filter(
+            consultation=consultation, end_date__isnull=True
+        ).update(end_date=consultation.discharge_date)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "facility",
+            "0393_rename_diagnosis_patientconsultation_deprecated_diagnosis_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RunPython(free_discharged_beds),
+    ]