Show current location in encounter retrieve

ohcnetwork · Jan 29, 2025 · f9e1852 · f9e1852
1 parent 91b0735
commit f9e1852
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/care/emr/resources/encounter/spec.py b/care/emr/resources/encounter/spec.py
@@ -44,7 +44,13 @@ class HospitalizationSpec(BaseModel):
 
 class EncounterSpecBase(EMRResource):
     __model__ = Encounter
-    __exclude__ = ["patient", "organizations", "facility", "appointment"]
+    __exclude__ = [
+        "patient",
+        "organizations",
+        "facility",
+        "appointment",
+        "current_location",
+    ]
 
     id: UUID4 = None
     status: StatusChoices
@@ -111,7 +117,7 @@ class EncounterRetrieveSpec(EncounterListSpec):
     created_by: dict = {}
     updated_by: dict = {}
     organizations: list[dict] = []
-    current_location: dict = {}
+    current_location: dict | None = None
 
     @classmethod
     def perform_extra_serialization(cls, mapping, obj):
@@ -125,6 +131,7 @@ def perform_extra_serialization(cls, mapping, obj):
             FacilityOrganizationReadSpec.serialize(encounter_org.organization).to_json()
             for encounter_org in organizations
         ]
+        mapping["current_location"] = None
         if obj.current_location:
             mapping["current_location"] = FacilityLocationListSpec.serialize(
                 obj.current_location