teest

models/entities.py

@@ -3,78 +3,36 @@ from typing import List, Optional
 from datetime import datetime
 
 class Condition(BaseModel):
-    id: Optional[str] = None
+    id: str
     code: str
     status: Optional[str] = ""
     onset_date: Optional[str] = None
     recorded_date: Optional[str] = None
     verification_status: Optional[str] = ""
-    category: Optional[str] = ""
 
 class Medication(BaseModel):
-    id: Optional[str] = None
+    id: str
     name: str
     status: str
     prescribed_date: Optional[str] = None
     requester: Optional[str] = ""
     dosage: Optional[str] = ""
-    intent: Optional[str] = ""
-    priority: Optional[str] = ""
 
 class Encounter(BaseModel):
-    id: Optional[str] = None
+    id: str
     type: str
     status: str
-    period: Optional[dict] = None
+    period: dict
     service_provider: Optional[str] = ""
-    class_type: Optional[str] = ""
-    reason: Optional[str] = ""
-
-class Observation(BaseModel):
-    id: Optional[str] = None
-    code: str
-    value: Optional[str] = ""
-    unit: Optional[str] = ""
-    status: Optional[str] = ""
-    effective_date: Optional[str] = None
-    category: Optional[str] = ""
-
-class Procedure(BaseModel):
-    id: Optional[str] = None
-    code: str
-    status: str
-    performed_date: Optional[str] = None
-    performer: Optional[str] = ""
-    reason: Optional[str] = ""
-
-class Immunization(BaseModel):
-    id: Optional[str] = None
-    vaccine: str
-    status: str
-    date: Optional[str] = None
-    lot_number: Optional[str] = ""
-    expiration_date: Optional[str] = ""
-    manufacturer: Optional[str] = ""
-
-class Allergy(BaseModel):
-    id: Optional[str] = None
-    substance: str
-    status: Optional[str] = ""
-    severity: Optional[str] = ""
-    onset_date: Optional[str] = None
-    reaction: Optional[str] = ""
 
 class Note(BaseModel):
-    id: Optional[str] = None
-    title: Optional[str] = ""
-    date: Optional[str] = None
-    author: Optional[str] = "System"
-    content: str
-    type: Optional[str] = ""
+    date: str
+    type: str
+    text: str
     context: Optional[str] = ""
+    author: Optional[str] = "System"
 
 class PatientCreate(BaseModel):
-    fhir_id: Optional[str] = None
     full_name: str
     gender: str
     date_of_birth: str
@@ -85,14 +43,7 @@ class PatientCreate(BaseModel):
     country: Optional[str] = "US"
     marital_status: Optional[str] = "Never Married"
     language: Optional[str] = "en"
-    source: Optional[str] = "appointment_booking"
-    import_date: Optional[str] = None
-    last_updated: Optional[str] = None
     conditions: Optional[List[Condition]] = []
     medications: Optional[List[Medication]] = []
     encounters: Optional[List[Encounter]] = []
-    observations: Optional[List[Observation]] = []
-    procedures: Optional[List[Procedure]] = []
-    immunizations: Optional[List[Immunization]] = []
-    allergies: Optional[List[Allergy]] = []
     notes: Optional[List[Note]] = []

routes/patients.py

@@ -45,77 +45,6 @@ except PermissionError:
     os.makedirs(SYNTHEA_DATA_DIR, exist_ok=True)
 
 # Pydantic models for update validation
-class ConditionUpdate(BaseModel):
-    id: Optional[str] = None
-    code: Optional[str] = None
-    status: Optional[str] = None
-    onset_date: Optional[str] = None
-    recorded_date: Optional[str] = None
-    verification_status: Optional[str] = None
-    category: Optional[str] = None
-
-class MedicationUpdate(BaseModel):
-    id: Optional[str] = None
-    name: Optional[str] = None
-    status: Optional[str] = None
-    prescribed_date: Optional[str] = None
-    requester: Optional[str] = None
-    dosage: Optional[str] = None
-    intent: Optional[str] = None
-    priority: Optional[str] = None
-
-class EncounterUpdate(BaseModel):
-    id: Optional[str] = None
-    type: Optional[str] = None
-    status: Optional[str] = None
-    period: Optional[Dict[str, str]] = None
-    service_provider: Optional[str] = None
-    class_type: Optional[str] = None
-    reason: Optional[str] = None
-
-class ObservationUpdate(BaseModel):
-    id: Optional[str] = None
-    code: Optional[str] = None
-    value: Optional[str] = None
-    unit: Optional[str] = None
-    status: Optional[str] = None
-    effective_date: Optional[str] = None
-    category: Optional[str] = None
-
-class ProcedureUpdate(BaseModel):
-    id: Optional[str] = None
-    code: Optional[str] = None
-    status: Optional[str] = None
-    performed_date: Optional[str] = None
-    performer: Optional[str] = None
-    reason: Optional[str] = None
-
-class ImmunizationUpdate(BaseModel):
-    id: Optional[str] = None
-    vaccine: Optional[str] = None
-    status: Optional[str] = None
-    date: Optional[str] = None
-    lot_number: Optional[str] = None
-    expiration_date: Optional[str] = None
-    manufacturer: Optional[str] = None
-
-class AllergyUpdate(BaseModel):
-    id: Optional[str] = None
-    substance: Optional[str] = None
-    status: Optional[str] = None
-    severity: Optional[str] = None
-    onset_date: Optional[str] = None
-    reaction: Optional[str] = None
-
-class NoteUpdate(BaseModel):
-    id: Optional[str] = None
-    title: Optional[str] = None
-    date: Optional[str] = None
-    author: Optional[str] = None
-    content: Optional[str] = None
-    type: Optional[str] = None
-    context: Optional[str] = None
-
 class PatientUpdate(BaseModel):
     full_name: Optional[str] = None
     gender: Optional[str] = None
@@ -125,16 +54,21 @@ class PatientUpdate(BaseModel):
     state: Optional[str] = None
     postal_code: Optional[str] = None
     country: Optional[str] = None
-    marital_status: Optional[str] = None
-    language: Optional[str] = None
-    conditions: Optional[List[ConditionUpdate]] = None
-    medications: Optional[List[MedicationUpdate]] = None
-    encounters: Optional[List[EncounterUpdate]] = None
-    observations: Optional[List[ObservationUpdate]] = None
-    procedures: Optional[List[ProcedureUpdate]] = None
-    immunizations: Optional[List[ImmunizationUpdate]] = None
-    allergies: Optional[List[AllergyUpdate]] = None
-    notes: Optional[List[NoteUpdate]] = None
+    national_id: Optional[str] = None
+    blood_type: Optional[str] = None
+    allergies: Optional[List[str]] = None
+    chronic_conditions: Optional[List[str]] = None
+    medications: Optional[List[str]] = None
+    emergency_contact_name: Optional[str] = None
+    emergency_contact_phone: Optional[str] = None
+    insurance_provider: Optional[str] = None
+    insurance_policy_number: Optional[str] = None
+    source: Optional[str] = None
+    status: Optional[str] = None
+    assigned_doctor_id: Optional[str] = None
+    registration_date: Optional[datetime] = None
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
 
 @router.get("/debug/count")
 async def debug_patient_count():
@@ -177,21 +111,18 @@ async def create_patient(
         now = datetime.utcnow().isoformat()
         
         # Add system-generated fields if not provided
-        if not patient_doc.get('fhir_id'):
-            patient_doc['fhir_id'] = str(uuid.uuid4())
-        if not patient_doc.get('import_date'):
-            patient_doc['import_date'] = now
-        if not patient_doc.get('last_updated'):
-            patient_doc['last_updated'] = now
         if not patient_doc.get('source'):
             patient_doc['source'] = 'appointment_booking'
+        if not patient_doc.get('status'):
+            patient_doc['status'] = 'active'
         
         patient_doc['created_by'] = current_user.get('email')
+        patient_doc['created_at'] = datetime.utcnow()
+        patient_doc['updated_at'] = datetime.utcnow()
         
         # Ensure all array fields exist even if empty
         array_fields = [
-            'conditions', 'medications', 'encounters', 'observations', 
-            'procedures', 'immunizations', 'allergies', 'notes'
+            'allergies', 'chronic_conditions', 'medications'
         ]
         for field in array_fields:
             if field not in patient_doc or patient_doc[field] is None:
@@ -932,86 +863,34 @@ async def update_patient(
             "state": update_data.state,
             "postal_code": update_data.postal_code,
             "country": update_data.country,
-            "marital_status": update_data.marital_status,
-            "language": update_data.language
+            "national_id": update_data.national_id,
+            "blood_type": update_data.blood_type
         }
         for key, value in demographics.items():
             if value is not None:
                 update_ops["$set"][key] = value
         
-        # Handle array updates (all array fields)
+        # Handle contact and insurance updates
+        contact_fields = {
+            "emergency_contact_name": update_data.emergency_contact_name,
+            "emergency_contact_phone": update_data.emergency_contact_phone,
+            "insurance_provider": update_data.insurance_provider,
+            "insurance_policy_number": update_data.insurance_policy_number
+        }
+        for key, value in contact_fields.items():
+            if value is not None:
+                update_ops["$set"][key] = value
+        
+        # Handle array updates (simple string arrays)
         array_fields = {
-            "conditions": update_data.conditions,
-            "medications": update_data.medications,
-            "encounters": update_data.encounters,
-            "observations": update_data.observations,
-            "procedures": update_data.procedures,
-            "immunizations": update_data.immunizations,
             "allergies": update_data.allergies,
-            "notes": update_data.notes
+            "chronic_conditions": update_data.chronic_conditions,
+            "medications": update_data.medications
         }
         
         for field, items in array_fields.items():
             if items is not None:
-                # Fetch existing items
-                existing_items = patient.get(field, [])
-                updated_items = []
-                
-                for item in items:
-                    item_dict = item.dict(exclude_unset=True)
-                    if not item_dict:
-                        continue
-                    
-                    # Generate ID for new items
-                    if not item_dict.get("id"):
-                        item_dict["id"] = str(uuid.uuid4())
-                    
-                    # Validate required fields
-                    if field == "conditions" and not item_dict.get("code"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Condition code is required for {field}"
-                        )
-                    if field == "medications" and not item_dict.get("name"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Medication name is required for {field}"
-                        )
-                    if field == "encounters" and not item_dict.get("type"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Encounter type is required for {field}"
-                        )
-                    if field == "observations" and not item_dict.get("code"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Observation code is required for {field}"
-                        )
-                    if field == "procedures" and not item_dict.get("code"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Procedure code is required for {field}"
-                        )
-                    if field == "immunizations" and not item_dict.get("vaccine"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Immunization vaccine is required for {field}"
-                        )
-                    if field == "allergies" and not item_dict.get("substance"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Allergy substance is required for {field}"
-                        )
-                    if field == "notes" and not item_dict.get("content"):
-                        raise HTTPException(
-                            status_code=status.HTTP_400_BAD_REQUEST,
-                            detail=f"Note content is required for {field}"
-                        )
-                    
-                    updated_items.append(item_dict)
-                
-                # Replace the entire array
-                update_ops["$set"][field] = updated_items
+                update_ops["$set"][field] = items
         
         # Perform the update
         result = await patients_collection.update_one(query, update_ops)
@@ -1034,7 +913,6 @@ async def update_patient(
         
         response = {
             "id": str(updated_patient["_id"]),
-            "fhir_id": updated_patient.get("fhir_id"),
             "full_name": updated_patient.get("full_name"),
             "gender": updated_patient.get("gender"),
             "date_of_birth": updated_patient.get("date_of_birth"),
@@ -1043,19 +921,20 @@ async def update_patient(
             "state": updated_patient.get("state"),
             "postal_code": updated_patient.get("postal_code"),
             "country": updated_patient.get("country"),
-            "marital_status": updated_patient.get("marital_status"),
-            "language": updated_patient.get("language"),
-            "conditions": updated_patient.get("conditions", []),
-            "medications": updated_patient.get("medications", []),
-            "encounters": updated_patient.get("encounters", []),
-            "observations": updated_patient.get("observations", []),
-            "procedures": updated_patient.get("procedures", []),
-            "immunizations": updated_patient.get("immunizations", []),
+            "national_id": updated_patient.get("national_id"),
+            "blood_type": updated_patient.get("blood_type"),
             "allergies": updated_patient.get("allergies", []),
-            "notes": updated_patient.get("notes", []),
+            "chronic_conditions": updated_patient.get("chronic_conditions", []),
+            "medications": updated_patient.get("medications", []),
+            "emergency_contact_name": updated_patient.get("emergency_contact_name"),
+            "emergency_contact_phone": updated_patient.get("emergency_contact_phone"),
+            "insurance_provider": updated_patient.get("insurance_provider"),
+            "insurance_policy_number": updated_patient.get("insurance_policy_number"),
             "source": updated_patient.get("source"),
-            "import_date": updated_patient.get("import_date"),
-            "last_updated": updated_patient.get("last_updated")
+            "status": updated_patient.get("status"),
+            "assigned_doctor_id": updated_patient.get("assigned_doctor_id"),
+            "created_at": updated_patient.get("created_at"),
+            "updated_at": updated_patient.get("updated_at")
         }
         
         logger.info(f"Successfully updated patient {patient_id}")