Update api/routes.py

api/routes.py

@@ -101,60 +101,68 @@ async def fetch_and_store_patients_from_fhir():
         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()
+            name_data = resource.get("name", [{}])[0]
+            full_name = f"{name_data.get('given', [''])[0]} {name_data.get('family', '')}".strip()
             gender = resource.get("gender")
             birth_date = resource.get("birthDate")
 
             address_data = resource.get("address", [{}])[0]
-            address = address_data.get("line", [""])[0]
+            address = address_data.get("line", [""])[0] if "line" in address_data else ""
             city = address_data.get("city", "")
             state = address_data.get("state", "")
             zip_code = address_data.get("postalCode", "")
 
-            # 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:
+            # Ensure required fields are present
+            if not all([fhir_id, full_name, gender, birth_date, address, city, state, zip_code]):
                 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,
-                "created_at": datetime.utcnow()
-            })
+            # Fetch encounters with notes
+            try:
+                async with httpx.AsyncClient(timeout=20.0) as client:
+                    enc_response = await client.get(f"{base_url}/Encounter?subject=Patient/{fhir_id}")
+
+                encounter_entries = enc_response.json().get("entry", []) if enc_response.status_code == 200 else []
+                notes = []
+
+                for enc in encounter_entries:
+                    enc_res = enc.get("resource", {})
+                    for note in enc_res.get("note", []):
+                        text = note.get("text")
+                        if text:
+                            notes.append(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()
+                })
+
+            except Exception as enc_err:
+                print(f"Skipping encounter fetch error for {fhir_id}: {enc_err}")
+                continue
 
         if not valid_patients:
-            return {"message": "No patients with complete info and notes were found."}
+            return {"message": "No valid patients found with complete data and notes."}
 
         result = await patients_collection.insert_many(valid_patients)
         return {
-            "message": "Imported patients with notes",
+            "message": "Imported valid patients with notes",
             "count": len(result.inserted_ids)
         }
 
     except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
+        print("❌ Server-side error during FHIR import:", e)
+        raise HTTPException(status_code=500, detail="Server error during patient import.")
 
 
 # --- GET FHIR PATIENTS ---