Update api/routes.py

api/routes.py

@@ -136,30 +136,59 @@ async def list_patients(current_user: dict = Depends(get_current_user)):
 
 @router.post("/ehr/fetch-from-api")
 async def fetch_and_store_patients_from_fhir():
-    fhir_api = "https://hapi.fhir.org/baseR4/Patient?_count=50"
+    fhir_patients_url = "https://hapi.fhir.org/baseR4/Patient?_count=50"
+    fhir_encounters_url = "https://hapi.fhir.org/baseR4/Encounter?_count=100"
 
     try:
         async with httpx.AsyncClient() as client:
-            response = await client.get(fhir_api)
-
-        if response.status_code != 200:
-            raise HTTPException(status_code=502, detail="Failed to fetch from FHIR server.")
+            # Fetch patients
+            patient_res = await client.get(fhir_patients_url)
+            if patient_res.status_code != 200:
+                raise HTTPException(status_code=502, detail="Failed to fetch patients")
+            patient_entries = patient_res.json().get("entry", [])
+
+            # Fetch encounters
+            encounter_res = await client.get(fhir_encounters_url)
+            if encounter_res.status_code != 200:
+                raise HTTPException(status_code=502, detail="Failed to fetch encounters")
+            encounter_entries = encounter_res.json().get("entry", [])
+
+        # Parse encounter notes grouped by patient ID
+        patient_notes = {}
+        for entry in encounter_entries:
+            resource = entry.get("resource", {})
+            ref = resource.get("subject", {}).get("reference")  # e.g., "Patient/abc123"
+            if not ref or "note" not in resource:
+                continue
 
-        data = response.json()
-        entries = data.get("entry", [])
-        if not entries:
-            return {"message": "No patients found."}
+            patient_id = ref.split("/")[-1]
+            notes_texts = [n.get("text") for n in resource.get("note", []) if n.get("text")]
+            if notes_texts:
+                patient_notes.setdefault(patient_id, []).extend(notes_texts)
 
         operations = []
-
-        for entry in entries:
+        for entry in patient_entries:
             resource = entry.get("resource", {})
-            name = resource.get("name", [{}])[0]
-            full_name = f"{name.get('given', [''])[0]} {name.get('family', '')}".strip()
-
             fhir_id = resource.get("id")
+            name_info = resource.get("name", [{}])[0]
+            address_info = resource.get("address", [{}])[0]
+
+            given = name_info.get("given", [""])[0]
+            family = name_info.get("family", "")
+            full_name = f"{given} {family}".strip()
+
             gender = resource.get("gender")
             birth_date = resource.get("birthDate")
+            address = address_info.get("line", [""])[0]
+            city = address_info.get("city", "")
+            state = address_info.get("state", "")
+            zip_code = address_info.get("postalCode", "")
+
+            # Skip if any essential field is missing
+            if not all([fhir_id, full_name, gender, birth_date, address, city, state, zip_code]):
+                continue
+
+            notes = patient_notes.get(fhir_id, [])
 
             operations.append(UpdateOne(
                 {"fhir_id": fhir_id},
@@ -168,24 +197,28 @@ async def fetch_and_store_patients_from_fhir():
                     "full_name": full_name,
                     "gender": gender,
                     "date_of_birth": birth_date,
+                    "address": address,
+                    "city": city,
+                    "state": state,
+                    "zip": zip_code,
+                    "notes": notes,
                     "created_at": datetime.utcnow()
                 }},
-                upsert=True  # 👈 This avoids duplicates
+                upsert=True
             ))
 
         if operations:
             result = await patients_collection.bulk_write(operations)
             return {
-                "message": "Fetched and stored successfully",
+                "message": "Fetched and stored patients with linked notes successfully",
                 "inserted": result.upserted_count,
                 "modified": result.modified_count
             }
 
-        return {"message": "No patients to store"}
+        return {"message": "No valid patients to store"}
 
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
-
 @router.get("/ehr/fhir-patients")
 async def list_fhir_patients():
     cursor = patients_collection.find({"fhir_id": {"$exists": True}})