Update api/routes/patients.py

api/routes/patients.py

@@ -1,3 +1,4 @@
+
 from fastapi import APIRouter, HTTPException, Depends, Query, status, Body
 from db.mongo import patients_collection
 from core.security import get_current_user
@@ -26,14 +27,14 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-router = APIRouter(prefix="/ehr", tags=["patients"])
+router = APIRouter()
 
 # Configuration
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 SYNTHEA_DATA_DIR = BASE_DIR / "output" / "fhir"
 os.makedirs(SYNTHEA_DATA_DIR, exist_ok=True)
 
-@router.post("/patients", status_code=status.HTTP_201_CREATED)
+@router.post("/", status_code=status.HTTP_201_CREATED)
 async def create_patient(
     patient_data: PatientCreate,
     current_user: dict = Depends(get_current_user)
@@ -198,7 +199,7 @@ async def process_synthea_patient(bundle: dict, file_path: str) -> Optional[dict
     logger.warning(f"No valid patient data found in {file_path}")
     return None
 
-@router.post("/patients/import", status_code=status.HTTP_201_CREATED)
+@router.post("/import", status_code=status.HTTP_201_CREATED)
 async def import_patients(
     limit: int = Query(100, ge=1, le=1000),
     current_user: dict = Depends(get_current_user)
@@ -339,15 +340,15 @@ async def import_patients(
         )
 
 @router.get("/patients", response_model=List[dict])
-async def get_patients(
+async def list_patients(
     search: Optional[str] = Query(None),
     min_notes: int = Query(0, ge=0),
     min_conditions: int = Query(0, ge=0),
-    limit: int = Query(10, ge=1, le=100),
+    limit: int = Query(100, ge=1, le=500),
     skip: int = Query(0, ge=0)
 ):
-    logger.info(f"Retrieving patients with search: {search}, limit: {limit}, skip: {skip}")
-    query = {}
+    logger.info(f"Listing patients with search: {search}, limit: {limit}, skip: {skip}")
+    query = {"source": "synthea"}
     
     if search:
         query["$or"] = [
@@ -361,6 +362,7 @@ async def get_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,
@@ -368,10 +370,10 @@ async def get_patients(
         "date_of_birth": 1,
         "city": 1,
         "state": 1,
-        "conditions": {"$slice": 3},
-        "medications": {"$slice": 3},
-        "encounters": {"$slice": 3},
-        "notes": {"$slice": 3}
+        "conditions": 1,
+        "medications": 1,
+        "encounters": 1,
+        "notes": 1
     }
     
     try:
@@ -403,15 +405,15 @@ async def get_patients(
         return patients
         
     except Exception as e:
-        logger.error(f"Failed to retrieve patients: {str(e)}")
+        logger.error(f"Failed to list patients: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"Failed to retrieve patients: {str(e)}"
         )
 
 @router.get("/patients/{patient_id}", response_model=dict)
-async def get_patient_details(patient_id: str):
-    logger.info(f"Retrieving patient details: {patient_id}")
+async def get_patient(patient_id: str):
+    logger.info(f"Retrieving patient: {patient_id}")
     try:
         patient = await patients_collection.find_one({
             "$or": [
@@ -458,7 +460,7 @@ async def get_patient_details(patient_id: str):
             }
         }
         
-        logger.info(f"Successfully retrieved patient details: {patient_id}")
+        logger.info(f"Successfully retrieved patient: {patient_id}")
         return response
         
     except ValueError as ve:
@@ -468,14 +470,14 @@ async def get_patient_details(patient_id: str):
             detail="Invalid patient ID format"
         )
     except Exception as e:
-        logger.error(f"Failed to retrieve patient details {patient_id}: {str(e)}")
+        logger.error(f"Failed to retrieve patient {patient_id}: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to retrieve patient details: {str(e)}"
+            detail=f"Failed to retrieve patient: {str(e)}"
         )
 
-@router.post("/patients/{patient_id}/notes", status_code=status.HTTP_201_CREATED)
-async def add_patient_note(
+@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)
@@ -529,4 +531,5 @@ async def add_patient_note(
             detail=f"Failed to add note: {str(e)}"
         )
 
-patients = router        
+# Export the router as 'patients' for api.__init__.py
+patients = router