Update api/routes/patients.py

api/routes/patients.py

@@ -131,13 +131,18 @@ async def delete_patient(
         )
     
     try:
-        # First check if patient exists
-        patient = await patients_collection.find_one({
-            "$or": [
-                {"_id": ObjectId(patient_id)},
-                {"fhir_id": patient_id}
-            ]
-        })
+        # Build the query based on whether patient_id is a valid ObjectId
+        query = {"fhir_id": patient_id}
+        if ObjectId.is_valid(patient_id):
+            query = {
+                "$or": [
+                    {"_id": ObjectId(patient_id)},
+                    {"fhir_id": patient_id}
+                ]
+            }
+        
+        # Check if patient exists
+        patient = await patients_collection.find_one(query)
         
         if not patient:
             logger.warning(f"Patient not found for deletion: {patient_id}")
@@ -146,13 +151,8 @@ async def delete_patient(
                 detail="Patient not found"
             )
         
-        # Perform deletion (removed the source check)
-        result = await patients_collection.delete_one({
-            "$or": [
-                {"_id": ObjectId(patient_id)},
-                {"fhir_id": patient_id}
-            ]
-        })
+        # Perform deletion
+        result = await patients_collection.delete_one(query)
         
         if result.deleted_count == 0:
             logger.error(f"Failed to delete patient {patient_id}")
@@ -164,12 +164,6 @@ async def delete_patient(
         logger.info(f"Successfully deleted patient {patient_id}")
         return None
         
-    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 HTTPException:
         raise
     except Exception as e: