Update api/routes.py

api/routes.py

@@ -136,89 +136,82 @@ 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_patients_url = "https://hapi.fhir.org/baseR4/Patient?_count=50"
-    fhir_encounters_url = "https://hapi.fhir.org/baseR4/Encounter?_count=100"
+    base_url = "https://hapi.fhir.org/baseR4"
+    patient_url = f"{base_url}/Patient?_count=50"
+    valid_patients = []
 
     try:
-        async with httpx.AsyncClient() as client:
-            # 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
-
-            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)
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            patient_response = await client.get(patient_url)
 
-        operations = []
-        for entry in patient_entries:
-            resource = entry.get("resource", {})
-            fhir_id = resource.get("id")
-            name_info = resource.get("name", [{}])[0]
-            address_info = resource.get("address", [{}])[0]
+        if patient_response.status_code != 200:
+            raise HTTPException(status_code=502, detail="Failed to fetch patients")
 
-            given = name_info.get("given", [""])[0]
-            family = name_info.get("family", "")
-            full_name = f"{given} {family}".strip()
+        patients_data = patient_response.json().get("entry", [])
 
+        for p_entry in patients_data:
+            resource = p_entry.get("resource", {})
+            fhir_id = resource.get("id")
+            name = resource.get("name", [{}])[0]
+            full_name = f"{name.get('given', [''])[0]} {name.get('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]):
+            address_data = resource.get("address", [{}])[0]
+            address = address_data.get("line", [""])[0]
+            city = address_data.get("city", "")
+            state = address_data.get("state", "")
+            zip_code = address_data.get("postalCode", "")
+
+            # Skip incomplete patients
+            if not (fhir_id and full_name and gender and birth_date and address and city and state and zip_code):
                 continue
 
-            notes = patient_notes.get(fhir_id, [])
-
-            operations.append(UpdateOne(
-                {"fhir_id": fhir_id},
-                {"$set": {
-                    "fhir_id": fhir_id,
-                    "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
-            ))
-
-        if operations:
-            result = await patients_collection.bulk_write(operations)
-            return {
-                "message": "Fetched and stored patients with linked notes successfully",
-                "inserted": result.upserted_count,
-                "modified": result.modified_count
-            }
-
-        return {"message": "No valid patients to store"}
+            # Fetch encounters for this patient
+            async with httpx.AsyncClient(timeout=30.0) as client:
+                encounter_response = await client.get(f"{base_url}/Encounter?subject=Patient/{fhir_id}")
+
+            if encounter_response.status_code != 200:
+                continue
+
+            encounter_entries = encounter_response.json().get("entry", [])
+            notes = []
+
+            for enc in encounter_entries:
+                enc_resource = enc.get("resource", {})
+                for n in enc_resource.get("note", []):
+                    if n.get("text"):
+                        notes.append(n["text"])
+
+            if not notes:
+                continue  # ✅ Skip if no notes
+
+            valid_patients.append({
+                "fhir_id": fhir_id,
+                "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()
+            })
+
+        if not valid_patients:
+            return {"message": "No patients with complete info and notes were found."}
+
+        result = await patients_collection.insert_many(valid_patients)
+        return {
+            "message": "Imported patients with notes",
+            "count": len(result.inserted_ids)
+        }
 
     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}})