Update api/routes.py

api/routes.py

@@ -128,90 +128,49 @@ async def list_patients(current_user: dict = Depends(get_current_user)):
             "full_name": p.get("full_name", ""),
             "date_of_birth": p.get("date_of_birth"),
             "gender": p.get("gender", ""),
-            "notes": p.get("notes", "")
+            "notes": p.get("notes", [])
         })
     return patients
 
-# --- IMPORT FROM PUBLIC FHIR API ---
-
+# --- IMPORT FROM FHIR (Switch to mock source with full data) ---
 @router.post("/ehr/fetch-from-api")
 async def fetch_and_store_patients_from_fhir():
-    base_url = "https://hapi.fhir.org/baseR4"
-    patient_url = f"{base_url}/Patient?_count=50"
-    valid_patients = []
-
     try:
         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")
+            response = await client.get("https://txagent-medical-data.s3.amazonaws.com/fhir_mock_patients.json")
 
-        patients_data = patient_response.json().get("entry", [])
+        if response.status_code != 200:
+            raise HTTPException(status_code=502, detail="Failed to fetch mock FHIR patients")
 
-        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")
+        raw_data = response.json()
+        valid_patients = []
 
-            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):
+        for resource in raw_data:
+            if not all(k in resource for k in ("fhir_id", "full_name", "gender", "date_of_birth", "address", "city", "state", "zip", "notes")):
                 continue
 
-            # 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 encounter_entries:
-                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,
+                "fhir_id": resource["fhir_id"],
+                "full_name": resource["full_name"],
+                "gender": resource["gender"],
+                "date_of_birth": resource["date_of_birth"],
+                "address": resource["address"],
+                "city": resource["city"],
+                "state": resource["state"],
+                "zip": resource["zip"],
+                "notes": resource["notes"],
                 "created_at": datetime.utcnow()
             })
 
         if not valid_patients:
-            return {"message": "No patients with complete info and notes were found."}
+            return {"message": "No complete patients in mock file."}
 
         result = await patients_collection.insert_many(valid_patients)
-        return {
-            "message": "Imported patients with notes",
-            "count": len(result.inserted_ids)
-        }
+        return {"message": "Mock FHIR patients imported", "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}})