Update api/routes/patients.py

api/routes/patients.py

@@ -338,66 +338,141 @@ async def import_patients(
             detail=f"Import failed: {str(e)}"
         )
 
-@router.get("/", response_model=List[dict])
+@router.get("/patients", response_model=List[dict])
 async def list_patients(
     search: Optional[str] = Query(None),
-    skip: int = Query(0, ge=0),
+    min_notes: int = Query(0, ge=0),
+    min_conditions: int = Query(0, ge=0),
     limit: int = Query(100, ge=1, le=500),
-    current_user: dict = Depends(get_current_user)
+    skip: int = Query(0, ge=0)
 ):
-    """List all patients with optional search and pagination"""
+    logger.info(f"Listing patients with search: {search}, limit: {limit}, skip: {skip}")
+    query = {"source": "synthea"}
+    
+    if search:
+        query["$or"] = [
+            {"full_name": {"$regex": search, "$options": "i"}},
+            {"fhir_id": search}
+        ]
+    
+    if min_notes > 0:
+        query[f"notes.{min_notes-1}"] = {"$exists": True}
+    
+    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,
+        "city": 1,
+        "state": 1,
+        "conditions": 1,
+        "medications": 1,
+        "encounters": 1,
+        "notes": 1
+    }
+    
     try:
-        query = {}
-        if search:
-            query["$or"] = [
-                {"full_name": {"$regex": search, "$options": "i"}},
-                {"fhir_id": search},
-                {"_id": search}
-            ]
-
-        cursor = patients_collection.find(query).skip(skip).limit(limit)
+        cursor = patients_collection.find(query, projection).skip(skip).limit(limit)
         patients = []
         
         async for patient in cursor:
-            patient["id"] = str(patient["_id"])
-            patient["age"] = calculate_age(patient.get("date_of_birth"))
-            patients.append(patient)
+            patients.append({
+                "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"),
+                "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", [])),
+                    "conditions": len(patient.get("conditions", [])),
+                    "medications": len(patient.get("medications", []))
+                }
+            })
         
+        logger.info(f"Retrieved {len(patients)} patients")
         return patients
-
+        
     except Exception as e:
         logger.error(f"Failed to list patients: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="Failed to retrieve patients"
+            detail=f"Failed to retrieve patients: {str(e)}"
         )
 
-@router.get("/{patient_id}", response_model=dict)
-async def get_patient(
-    patient_id: str,
-    current_user: dict = Depends(get_current_user)
-):
-    """Get a specific patient by ID or FHIR ID"""
+@router.get("/patients/{patient_id}", response_model=dict)
+async def get_patient(patient_id: str):
+    logger.info(f"Retrieving patient: {patient_id}")
     try:
-        # Try as ObjectId first
-        try:
-            patient = await patients_collection.find_one({"_id": ObjectId(patient_id)})
-        except:
-            # Fall back to FHIR ID
-            patient = await patients_collection.find_one({"fhir_id": patient_id})
-
+        patient = await patients_collection.find_one({
+            "$or": [
+                {"_id": ObjectId(patient_id)},
+                {"fhir_id": patient_id}
+            ]
+        })
+        
         if not patient:
-            raise HTTPException(status_code=404, detail="Patient not found")
-
-        patient["id"] = str(patient["_id"])
-        patient["age"] = calculate_age(patient.get("date_of_birth"))
-        return patient
-
+            logger.warning(f"Patient not found: {patient_id}")
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Patient not found"
+            )
+        
+        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")
+            }
+        }
+        
+        logger.info(f"Successfully retrieved patient: {patient_id}")
+        return response
+        
+    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 get patient {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="Failed to retrieve patient"
+            detail=f"Failed to retrieve patient: {str(e)}"
         )
 
 @router.post("/{patient_id}/notes", status_code=status.HTTP_201_CREATED)