teest

api/routes/patients.py

@@ -130,14 +130,15 @@ async def create_patient(
         # Add system-generated fields
         patient_doc.update({
             "fhir_id": str(uuid.uuid4()),
-            "import_date": now,
-            "last_updated": now,
             "source": "manual",
-            "created_by": current_user.get('email')
+            "status": "active",
+            "created_by": current_user.get('email'),
+            "created_at": datetime.utcnow(),
+            "updated_at": datetime.utcnow()
         })
         
         # Ensure arrays exist even if empty
-        for field in ['conditions', 'medications', 'encounters', 'notes']:
+        for field in ['allergies', 'chronic_conditions', 'medications']:
             if field not in patient_doc:
                 patient_doc[field] = []
         
@@ -257,21 +258,21 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
                 raw_full_name = f"{' '.join(name.get('given', ['']))} {name.get('family', '')}".strip()
                 clean_full_name = re.sub(r'\d+', '', raw_full_name).strip()
                 
-                patient_data = {
-                    'fhir_id': resource.get('id'),
-                    'full_name': clean_full_name,
-                    'gender': resource.get('gender', 'unknown'),
-                    'date_of_birth': resource.get('birthDate', ''),
-                    'address': ' '.join(address.get('line', [''])),
-                    'city': address.get('city', ''),
-                    'state': address.get('state', ''),
-                    'postal_code': address.get('postalCode', ''),
-                    'country': address.get('country', ''),
-                    'marital_status': resource.get('maritalStatus', {}).get('text', ''),
-                    'language': standardize_language(resource.get('communication', [{}])[0].get('language', {}).get('text', '')),
-                    'source': 'synthea',
-                    'last_updated': datetime.utcnow().isoformat()
-                }
+                                 patient_data = {
+                     'fhir_id': resource.get('id'),
+                     'full_name': clean_full_name,
+                     'gender': resource.get('gender', 'unknown'),
+                     'date_of_birth': resource.get('birthDate', ''),
+                     'address': ' '.join(address.get('line', [''])),
+                     'city': address.get('city', ''),
+                     'state': address.get('state', ''),
+                     'postal_code': address.get('postalCode', ''),
+                     'country': address.get('country', ''),
+                     'source': 'synthea',
+                     'status': 'active',
+                     'created_at': datetime.utcnow(),
+                     'updated_at': datetime.utcnow()
+                 }
                 
             elif resource_type == 'Encounter':
                 encounter = {
@@ -317,18 +318,25 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
             logger.error(f"Error processing {resource_type} in {file_path}: {str(e)}")
             continue
     
-    if patient_data:
-        patient_data.update({
-            'notes': notes,
-            'conditions': conditions,
-            'medications': medications,
-            'encounters': encounters,
-            'import_date': datetime.utcnow().isoformat()
-        })
-        logger.info(f"Successfully processed patient {patient_data.get('fhir_id')} from {file_path}")
-        return patient_data
-    logger.warning(f"No valid patient data found in {file_path}")
-    return None
+         if patient_data:
+         patient_data.update({
+             'allergies': [],  # Convert conditions to allergies if needed
+             'chronic_conditions': conditions,
+             'medications': medications,
+             'symptoms': [],
+             'vital_signs': {},
+             'medical_notes': '',
+             'emergency_contact_name': '',
+             'emergency_contact_phone': '',
+             'insurance_provider': '',
+             'insurance_policy_number': '',
+             'national_id': '',
+             'blood_type': ''
+         })
+         logger.info(f"Successfully processed patient {patient_data.get('fhir_id')} from {file_path}")
+         return patient_data
+     logger.warning(f"No valid patient data found in {file_path}")
+     return None
 
 @router.post("/import", status_code=status.HTTP_201_CREATED)
 async def import_patients(
@@ -894,34 +902,32 @@ async def get_patient(patient_id: str):
             )
         
         response = {
-            "demographics": {
-                "id": str(patient["_id"]),
-                "fhir_id": patient.get("fhir_id"),
-                "full_name": patient.get("full_name"),
-                "gender": patient.get("gender"),
-                "date_of_birth": patient.get("date_of_birth"),
-                "age": calculate_age(patient.get("date_of_birth")),
-                "address": {
-                    "line": patient.get("address"),
-                    "city": patient.get("city"),
-                    "state": patient.get("state"),
-                    "postal_code": patient.get("postal_code"),
-                    "country": patient.get("country")
-                },
-                "marital_status": patient.get("marital_status"),
-                "language": patient.get("language")
-            },
-            "clinical_data": {
-                "notes": patient.get("notes", []),
-                "conditions": patient.get("conditions", []),
-                "medications": patient.get("medications", []),
-                "encounters": patient.get("encounters", [])
-            },
-            "metadata": {
-                "source": patient.get("source"),
-                "import_date": patient.get("import_date"),
-                "last_updated": patient.get("last_updated")
-            }
+            "id": str(patient["_id"]),
+            "full_name": patient.get("full_name"),
+            "gender": patient.get("gender"),
+            "date_of_birth": patient.get("date_of_birth"),
+            "address": patient.get("address"),
+            "city": patient.get("city"),
+            "state": patient.get("state"),
+            "postal_code": patient.get("postal_code"),
+            "country": patient.get("country"),
+            "national_id": patient.get("national_id"),
+            "blood_type": patient.get("blood_type"),
+            "allergies": patient.get("allergies", []),
+            "chronic_conditions": patient.get("chronic_conditions", []),
+            "medications": patient.get("medications", []),
+            "emergency_contact_name": patient.get("emergency_contact_name"),
+            "emergency_contact_phone": patient.get("emergency_contact_phone"),
+            "insurance_provider": patient.get("insurance_provider"),
+            "insurance_policy_number": patient.get("insurance_policy_number"),
+            "medical_notes": patient.get("medical_notes"),
+            "symptoms": patient.get("symptoms", []),
+            "vital_signs": patient.get("vital_signs", {}),
+            "source": patient.get("source"),
+            "status": patient.get("status"),
+            "assigned_doctor_id": patient.get("assigned_doctor_id"),
+            "created_at": patient.get("created_at"),
+            "updated_at": patient.get("updated_at")
         }
         
         logger.info(f"Successfully retrieved patient: {patient_id}")
@@ -991,62 +997,44 @@ 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 (conditions, medications, encounters, notes)
+        # 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 medical information updates
+        medical_fields = {
+            "medical_notes": update_data.medical_notes,
+            "symptoms": update_data.symptoms,
+            "vital_signs": update_data.vital_signs
+        }
+        for key, value in medical_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,
-            "notes": update_data.notes
+            "allergies": update_data.allergies,
+            "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 == "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)
@@ -1078,15 +1066,23 @@ 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", []),
+            "national_id": updated_patient.get("national_id"),
+            "blood_type": updated_patient.get("blood_type"),
+            "allergies": updated_patient.get("allergies", []),
+            "chronic_conditions": updated_patient.get("chronic_conditions", []),
             "medications": updated_patient.get("medications", []),
-            "encounters": updated_patient.get("encounters", []),
-            "notes": updated_patient.get("notes", []),
+            "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"),
+            "medical_notes": updated_patient.get("medical_notes"),
+            "symptoms": updated_patient.get("symptoms", []),
+            "vital_signs": updated_patient.get("vital_signs", {}),
             "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}")