Update api/routes/patients.py

api/routes/patients.py

@@ -341,28 +341,20 @@ async def import_patients(
 @router.get("/", response_model=List[dict])
 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(100, ge=1, le=500),
     skip: int = Query(0, ge=0),
+    limit: int = Query(100, ge=1, le=500),
     current_user: dict = Depends(get_current_user)
 ):
-    logger.info(f"Listing patients with search: {search}, limit: {limit}, skip: {skip}")
-    query = {}
-    
-    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}
-    
+    """List all patients with optional search and pagination"""
     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)
         patients = []
         
@@ -371,14 +363,13 @@ async def list_patients(
             patient["age"] = calculate_age(patient.get("date_of_birth"))
             patients.append(patient)
         
-        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=f"Failed to retrieve patients: {str(e)}"
+            detail="Failed to retrieve patients"
         )
 
 @router.get("/{patient_id}", response_model=dict)
@@ -386,33 +377,27 @@ async def get_patient(
     patient_id: str,
     current_user: dict = Depends(get_current_user)
 ):
-    logger.info(f"Retrieving patient: {patient_id}")
+    """Get a specific patient by ID or FHIR ID"""
     try:
-        # First try to find by ObjectId
+        # Try as ObjectId first
         try:
             patient = await patients_collection.find_one({"_id": ObjectId(patient_id)})
-        except (InvalidId, ValueError):
-            # If not valid ObjectId, try by fhir_id
+        except:
+            # Fall back to FHIR ID
             patient = await patients_collection.find_one({"fhir_id": patient_id})
-        
+
         if not patient:
-            logger.warning(f"Patient not found: {patient_id}")
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="Patient not found"
-            )
-        
+            raise HTTPException(status_code=404, detail="Patient not found")
+
         patient["id"] = str(patient["_id"])
         patient["age"] = calculate_age(patient.get("date_of_birth"))
-        
-        logger.info(f"Successfully retrieved patient: {patient_id}")
         return patient
-        
+
     except Exception as e:
-        logger.error(f"Failed to retrieve patient {patient_id}: {str(e)}")
+        logger.error(f"Failed to get patient {patient_id}: {str(e)}")
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to retrieve patient: {str(e)}"
+            detail="Failed to retrieve patient"
         )
 
 @router.post("/{patient_id}/notes", status_code=status.HTTP_201_CREATED)