Update api/routes.py

api/routes.py

@@ -85,18 +85,21 @@ async def get_me(current_user: dict = Depends(get_current_user)):
 # --- IMPORT MOCKED FHIR PATIENTS ---
 @router.post("/ehr/fetch-from-api")
 async def fetch_and_store_patients_from_fhir():
-    json_path = Path("fhir_mock_patients.json")
-
-    if not json_path.exists():
-        raise HTTPException(status_code=404, detail="Mock FHIR JSON file not found")
+    base_url = "https://launch.smarthealthit.org/v/r4/fhir"
+    patient_url = f"{base_url}/Patient?_count=50"
+    valid_patients = []
 
     try:
-        with open(json_path, "r", encoding="utf-8") as f:
-            data = json.load(f)
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            patient_response = await client.get(patient_url)
+
+        if patient_response.status_code != 200:
+            raise HTTPException(status_code=502, detail="Failed to fetch patients")
+
+        patients_data = patient_response.json().get("entry", [])
 
-        valid_patients = []
-        for patient in data.get("entry", []):
-            resource = patient.get("resource", {})
+        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()
@@ -109,14 +112,25 @@ async def fetch_and_store_patients_from_fhir():
             state = address_data.get("state", "")
             zip_code = address_data.get("postalCode", "")
 
-            notes = []
-            for n in resource.get("note", []):
-                if n.get("text"):
-                    notes.append(n["text"])
+            # 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 not all([fhir_id, full_name, gender, birth_date, address, city, state, zip_code, notes]):
+            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 encounter_entries:
+                continue  # Skip if no notes
+
             valid_patients.append({
                 "fhir_id": fhir_id,
                 "full_name": full_name,
@@ -131,15 +145,18 @@ async def fetch_and_store_patients_from_fhir():
             })
 
         if not valid_patients:
-            return {"message": "No valid patients found in JSON."}
+            return {"message": "No patients with complete info and notes were found."}
 
         result = await patients_collection.insert_many(valid_patients)
-        return {"message": "Patients imported", "count": len(result.inserted_ids)}
+        return {
+            "message": "Imported patients with notes",
+            "count": len(result.inserted_ids)
+        }
 
     except Exception as e:
-        traceback.print_exc()
         raise HTTPException(status_code=500, detail=str(e))
 
+
 # --- GET FHIR PATIENTS ---
 @router.get("/ehr/fhir-patients")
 async def list_fhir_patients():