refactor matching algo

utils/oneclick.py

@@ -4,6 +4,7 @@ from .meldrx import MeldRxAPI
 from .responseparser import PatientDataExtractor
 from .pdfutils import PDFGenerator
 import logging
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -54,12 +55,6 @@ def generate_discharge_paper_one_click(
     first_name: str = "",
     last_name: str = ""
 ) -> Tuple[Optional[str], str, Optional[str], Optional[str]]:
-    """
-    Generate a discharge summary PDF with one click using MeldRx API data.
-    
-    Returns:
-        Tuple of (pdf_path, status_message, basic_summary, ai_summary)
-    """
     try:
         patients_data = api.get_patients()
         if not patients_data or "entry" not in patients_data:
@@ -89,7 +84,7 @@ def generate_discharge_paper_one_click(
             last_name_from_data = str(patient_data.get('last_name', '')).strip().lower()
             
             all_patient_ids.append(patient_id_from_data)
-            all_patient_names.append(f"{first_name_from_data} {last_name_from_data}")
+            all_patient_names.append(f"{first_name_from_data} {last_name_from_data}".strip())
             
             patient_id_input = str(patient_id).strip().lower()
             first_name_input = str(first_name).strip().lower()
@@ -99,11 +94,13 @@ def generate_discharge_paper_one_click(
             logger.debug(f"Comparing - Input: ID={patient_id_input}, First={first_name_input}, Last={last_name_input}")
             
             matches = True
-            if patient_id_input and patient_id_input != patient_id_from_data:
+            # Only enforce ID match if both input and data have non-empty IDs
+            if patient_id_input and patient_id_from_data and patient_id_input != patient_id_from_data:
                 matches = False
-            if first_name_input and first_name_input not in first_name_from_data:
+            # Use exact match for names if provided, ignoring case
+            if first_name_input and first_name_input != first_name_from_data:
                 matches = False
-            if last_name_input and last_name_input not in last_name_from_data:
+            if last_name_input and last_name_input != last_name_from_data:
                 matches = False
                 
             if matches:
@@ -119,7 +116,7 @@ def generate_discharge_paper_one_click(
             return None, (f"No patients found matching criteria: {search_criteria}\n"
                          f"Available IDs: {', '.join(all_patient_ids)}\n"
                          f"Available Names: {', '.join(all_patient_names)}"), None, None
-        
+        logger.debug(f"Raw patient data from API: {json.dumps(patients_data, indent=2)}")
         patient_data = matching_patients[0]
         logger.info(f"Selected patient data: {patient_data}")
         

utils/responseparser.py

@@ -59,14 +59,22 @@ class PatientDataExtractor:
         """Get the currently selected patient resource."""
         return self.patients[self.current_patient_idx]
 
-    # Basic Identification Fields
     def get_id(self) -> str:
         patient = self._get_current_patient()
         if self.format == "xml":
             id_list = patient.xpath("//hl7:recordTarget/hl7:patientRole/hl7:id/@extension", namespaces=self.ns)
             return id_list[0] if id_list else ""
         elif self.format == "json":
-            return patient.get("id", "")
+            # Check top-level 'id' first
+            patient_id = patient.get("id", "")
+            if patient_id:
+                return patient_id
+            # Fallback to 'identifier' field
+            identifiers = patient.get("identifier", [])
+            for identifier in identifiers:
+                if identifier.get("value"):  # Return the first non-empty identifier value
+                    return identifier["value"]
+            return ""  # Default to empty string if no ID found
 
     def get_resource_type(self) -> str:
         patient = self._get_current_patient()