Update api/routes.py

api/routes.py

@@ -42,14 +42,27 @@ class Note(BaseModel):
     author: Optional[str] = Field(None, example="Dr. Smith")
 
 class Condition(BaseModel):
+    id: str = Field(..., example="cond123")
     code: str = Field(..., example="Hypertension")
     status: str = Field(..., example="Active")
     onset_date: str = Field(..., example="2020-05-15")
+    recorded_date: Optional[str] = Field(None, example="2020-05-16")
+    verification_status: Optional[str] = Field(None, example="Confirmed")
 
 class Medication(BaseModel):
+    id: str = Field(..., example="med123")
     name: str = Field(..., example="Lisinopril 10mg")
     status: str = Field(..., example="Active")
     prescribed_date: str = Field(..., example="2021-02-10")
+    requester: Optional[str] = Field(None, example="Dr. Smith")
+    dosage: Optional[str] = Field(None, example="10mg daily")
+
+class Encounter(BaseModel):
+    id: str = Field(..., example="enc123")
+    type: str = Field(..., example="Outpatient Visit")
+    status: str = Field(..., example="Finished")
+    period: Dict = Field(..., example={"start": "2023-01-01T10:00:00Z"})
+    service_provider: Optional[str] = Field(None, example="City Hospital")
 
 class PatientUpdate(BaseModel):
     notes: Optional[List[Note]] = None
@@ -137,7 +150,7 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
                     'marital_status': resource.get('maritalStatus', {}).get('text', ''),
                     'language': standardize_language(resource.get('communication', [{}])[0].get('language', {}).get('text', '')),
                     'source': 'synthea',
-                    'last_updated': datetime.utcnow()
+                    'last_updated': datetime.utcnow().isoformat()
                 }
                 
             elif resource_type == 'Encounter':
@@ -190,7 +203,7 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
             'conditions': conditions,
             'medications': medications,
             'encounters': encounters,
-            'import_date': datetime.utcnow()
+            'import_date': datetime.utcnow().isoformat()
         })
         logger.info(f"Successfully processed patient {patient_data.get('fhir_id')} from {file_path}")
         return patient_data
@@ -307,7 +320,7 @@ async def import_patients(
                 logger.info(f"Import request {request_id} completed: {imported} patients processed, "
                            f"{result.upserted_count} upserted, {len(errors)} errors")
             except BulkWriteError as bwe:
-                logger.error(f"Partial bulk write failure PTI request {request_id}: {str(bwe.details)}")
+                logger.error(f"Partial bulk write failure for request {request_id}: {str(bwe.details)}")
                 response.update({
                     "upserted": bwe.details.get('nUpserted', 0),
                     "existing": len(operations) - bwe.details.get('nUpserted', 0),
@@ -361,14 +374,18 @@ async def list_patients(
     if min_conditions > 0:
         query[f"conditions.{min_conditions-1}"] = {"$exists": True}
     
+    # Removed $slice to return full arrays for the frontend
     projection = {
         "fhir_id": 1,
         "full_name": 1,
         "gender": 1,
         "date_of_birth": 1,
-        "notes": {"$slice": 1},
-        "conditions": {"$slice": 1},
-        "medications": {"$slice": 1}
+        "city": 1,
+        "state": 1,
+        "conditions": 1,
+        "medications": 1,
+        "encounters": 1,
+        "notes": 1
     }
     
     try:
@@ -381,6 +398,13 @@ async def list_patients(
                 "fhir_id": patient.get("fhir_id"),
                 "full_name": patient.get("full_name"),
                 "gender": patient.get("gender"),
+                "date_of_birth": patient.get("date_of_birth"),
+                "city": patient.get("city"),
+                "state": patient.get("state"),
+                "conditions": patient.get("conditions", []),
+                "medications": patient.get("medications", []),
+                "encounters": patient.get("encounters", []),
+                "notes": patient.get("notes", []),
                 "age": calculate_age(patient.get("date_of_birth")),
                 "stats": {
                     "notes": len(patient.get("notes", [])),
@@ -482,7 +506,7 @@ async def add_note(
         note_data = note.dict()
         note_data.update({
             "author": current_user.get('full_name', 'System'),
-            "timestamp": datetime.utcnow()
+            "timestamp": datetime.utcnow().isoformat()
         })
         
         result = await patients_collection.update_one(
@@ -492,7 +516,7 @@ async def add_note(
             ]},
             {
                 "$push": {"notes": note_data},
-                "$set": {"last_updated": datetime.utcnow()}
+                "$set": {"last_updated": datetime.utcnow().isoformat()}
             }
         )
         
@@ -538,8 +562,8 @@ async def signup(data: SignupForm):
         "full_name": data.full_name.strip(),
         "password": hashed_pw,
         "role": "patient",
-        "created_at": datetime.utcnow(),
-        "updated_at": datetime.utcnow()
+        "created_at": datetime.utcnow().isoformat(),
+        "updated_at": datetime.utcnow().isoformat()
     }
     
     try:
@@ -587,8 +611,8 @@ async def create_doctor(
         "role": "doctor",
         "specialty": data.specialty,
         "license_number": data.license_number,
-        "created_at": datetime.utcnow(),
-        "updated_at": datetime.utcnow()
+        "created_at": datetime.utcnow().isoformat(),
+        "updated_at": datetime.utcnow().isoformat()
     }
     
     try: