teest

api/routes/patients.py

@@ -3,7 +3,7 @@ from db.mongo import patients_collection, db  # Added db import
 from core.security import get_current_user
 from utils.db import create_indexes
 from utils.helpers import calculate_age, standardize_language
-from models.entities import Note, PatientCreate
+from models.entities import PatientCreate
 from models.schemas import PatientListResponse  # Fixed import
 from api.services.fhir_integration import HAPIFHIRIntegrationService
 from api.services.synthea_integration import SyntheaIntegrationService
@@ -58,36 +58,6 @@ def get_synthea_data_dir():
 SYNTHEA_DATA_DIR = get_synthea_data_dir()
 
 # 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
-    notes: 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
-
-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 NoteUpdate(BaseModel):
-    id: Optional[str] = None
-    title: Optional[str] = None
-    date: Optional[str] = None
-    author: Optional[str] = None
-    content: Optional[str] = None
 
 class PatientUpdate(BaseModel):
     full_name: Optional[str] = None
@@ -98,12 +68,24 @@ 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
-    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
+    medical_notes: Optional[str] = None
+    symptoms: Optional[List[str]] = None
+    vital_signs: Optional[dict] = None
+    source: Optional[str] = None
+    status: Optional[str] = None
+    assigned_doctor_id: Optional[str] = None
+    registration_date: Optional[str] = None
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
 
 @router.get("/debug/count")
 async def debug_patient_count():
@@ -958,60 +940,7 @@ async def get_patient(patient_id: str):
             detail=f"Failed to retrieve patient: {str(e)}"
         )
 
-@router.post("/{patient_id}/notes", status_code=status.HTTP_201_CREATED)
-async def add_note(
-    patient_id: str,
-    note: Note,
-    current_user: dict = Depends(get_current_user)
-):
-    logger.info(f"Adding note for patient {patient_id} by user {current_user.get('email')}")
-    if not any(role in current_user.get('roles', []) for role in ['doctor', 'admin']):
-        logger.warning(f"Unauthorized note addition attempt by {current_user.get('email')}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Only clinicians can add notes"
-        )
-    
-    try:
-        note_data = note.dict()
-        note_data.update({
-            "author": current_user.get('full_name', 'System'),
-            "timestamp": datetime.utcnow().isoformat()
-        })
-        
-        result = await patients_collection.update_one(
-            {"$or": [
-                {"_id": ObjectId(patient_id)},
-                {"fhir_id": patient_id}
-            ]},
-            {
-                "$push": {"notes": note_data},
-                "$set": {"last_updated": datetime.utcnow().isoformat()}
-            }
-        )
-        
-        if result.modified_count == 0:
-            logger.warning(f"Patient not found for note addition: {patient_id}")
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="Patient not found"
-            )
-        
-        logger.info(f"Note added successfully for patient {patient_id}")
-        return {"status": "success", "message": "Note added"}
-        
-    except ValueError as ve:
-        logger.error(f"Invalid patient ID format: {patient_id}, error: {str(ve)}")
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Invalid patient ID format"
-        )
-    except Exception as e:
-        logger.error(f"Failed to add note for patient {patient_id}: {str(e)}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to add note: {str(e)}"
-        )
+
 
 @router.put("/patients/{patient_id}", status_code=status.HTTP_200_OK)
 async def update_patient(

models/entities.py

@@ -2,36 +2,6 @@ from pydantic import BaseModel
 from typing import List, Optional
 from datetime import datetime
 
-class Condition(BaseModel):
-    id: str
-    code: str
-    status: Optional[str] = ""
-    onset_date: Optional[str] = None
-    recorded_date: Optional[str] = None
-    verification_status: Optional[str] = ""
-
-class Medication(BaseModel):
-    id: str
-    name: str
-    status: str
-    prescribed_date: Optional[str] = None
-    requester: Optional[str] = ""
-    dosage: Optional[str] = ""
-
-class Encounter(BaseModel):
-    id: str
-    type: str
-    status: str
-    period: dict
-    service_provider: Optional[str] = ""
-
-class Note(BaseModel):
-    date: str
-    type: str
-    text: str
-    context: Optional[str] = ""
-    author: Optional[str] = "System"
-
 class PatientCreate(BaseModel):
     full_name: str
     gender: str
@@ -41,9 +11,22 @@ class PatientCreate(BaseModel):
     state: Optional[str] = ""
     postal_code: Optional[str] = ""
     country: Optional[str] = "US"
-    marital_status: Optional[str] = "Never Married"
-    language: Optional[str] = "en"
-    conditions: Optional[List[Condition]] = []
-    medications: Optional[List[Medication]] = []
-    encounters: Optional[List[Encounter]] = []
-    notes: Optional[List[Note]] = []
+    national_id: Optional[str] = ""
+    blood_type: Optional[str] = ""
+    allergies: Optional[List[str]] = []
+    chronic_conditions: Optional[List[str]] = []
+    medications: Optional[List[str]] = []
+    emergency_contact_name: Optional[str] = ""
+    emergency_contact_phone: Optional[str] = ""
+    insurance_provider: Optional[str] = ""
+    insurance_policy_number: Optional[str] = ""
+    medical_notes: Optional[str] = ""
+    symptoms: Optional[List[str]] = []
+    vital_signs: Optional[dict] = {
+        "blood_pressure": "",
+        "temperature": "",
+        "heart_rate": "",
+        "respiratory_rate": "",
+        "weight": "",
+        "height": ""
+    }

routes/patients.py

@@ -3,7 +3,7 @@ from db.mongo import patients_collection, db  # Added db import
 from core.security import get_current_user
 from utils.db import create_indexes
 from utils.helpers import calculate_age, standardize_language
-from models.entities import Note, PatientCreate
+from models.entities import PatientCreate
 from models.schemas import PatientListResponse  # Fixed import
 from api.services.fhir_integration import HAPIFHIRIntegrationService
 from datetime import datetime
@@ -713,34 +713,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}")
@@ -759,60 +757,7 @@ async def get_patient(patient_id: str):
             detail=f"Failed to retrieve patient: {str(e)}"
         )
 
-@router.post("/{patient_id}/notes", status_code=status.HTTP_201_CREATED)
-async def add_note(
-    patient_id: str,
-    note: Note,
-    current_user: dict = Depends(get_current_user)
-):
-    logger.info(f"Adding note for patient {patient_id} by user {current_user.get('email')}")
-    if current_user.get('role') not in ['doctor', 'admin']:
-        logger.warning(f"Unauthorized note addition attempt by {current_user.get('email')}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Only clinicians can add notes"
-        )
-    
-    try:
-        note_data = note.dict()
-        note_data.update({
-            "author": current_user.get('full_name', 'System'),
-            "timestamp": datetime.utcnow().isoformat()
-        })
-        
-        result = await patients_collection.update_one(
-            {"$or": [
-                {"_id": ObjectId(patient_id)},
-                {"fhir_id": patient_id}
-            ]},
-            {
-                "$push": {"notes": note_data},
-                "$set": {"last_updated": datetime.utcnow().isoformat()}
-            }
-        )
-        
-        if result.modified_count == 0:
-            logger.warning(f"Patient not found for note addition: {patient_id}")
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="Patient not found"
-            )
-        
-        logger.info(f"Note added successfully for patient {patient_id}")
-        return {"status": "success", "message": "Note added"}
-        
-    except ValueError as ve:
-        logger.error(f"Invalid patient ID format: {patient_id}, error: {str(ve)}")
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Invalid patient ID format"
-        )
-    except Exception as e:
-        logger.error(f"Failed to add note for patient {patient_id}: {str(e)}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to add note: {str(e)}"
-        )
+
 
 @router.put("/patients/{patient_id}", status_code=status.HTTP_200_OK)
 async def update_patient(