try to fix the response parser , fingers crossed

utils/oneclick.py

@@ -91,63 +91,55 @@ def generate_discharge_paper_one_click(
 
         logger.info(f"Found {len(extractor.patients)} patients in the data")
         
-        matching_patients = []
-        all_patient_ids = []
-        all_patient_names = []
-        
+        matching_patient = None
+        patient_id_input = str(patient_id).strip().lower()
+        first_name_input = str(first_name).strip().lower()
+        last_name_input = str(last_name).strip().lower()
+
         for i in range(len(extractor.patients)):
             extractor.set_patient_by_index(i)
             patient_data = extractor.get_patient_dict()
-            
+            logger.debug(f"Processing patient {i}: {patient_data}")  # Add debug log
             patient_id_from_data = str(patient_data.get('id', '')).strip().lower()
-            first_name_from_data = str(patient_data.get('first_name', '')).strip().lower()
-            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}".strip())
-            
-            patient_id_input = str(patient_id).strip().lower()
-            first_name_input = str(first_name).strip().lower()
-            last_name_input = str(last_name).strip().lower()
-            
-            logger.debug(f"Patient {i}: ID={patient_id_from_data}, Name={first_name_from_data} {last_name_from_data}")
-            logger.debug(f"Comparing - Input: ID={patient_id_input}, First={first_name_input}, Last={last_name_input}")
             
-            # Match logic: ID takes precedence, then first/last name
-            matches = False
             if patient_id_input and patient_id_from_data == patient_id_input:
-                matches = True
-            elif not patient_id_input and first_name_input and last_name_input:
-                if first_name_input == first_name_from_data and last_name_input == last_name_from_data:
-                    matches = True
-            elif not patient_id_input and not first_name_input and not last_name_input:
-                continue  # Skip if no criteria provided
-            
-            if matches:
-                matching_patients.append(patient_data)
-                logger.info(f"Found matching patient: ID={patient_id_from_data}, "
-                           f"Name={first_name_from_data} {last_name_from_data}")
-
-        if not matching_patients:
+                matching_patient = patient_data
+                logger.info(f"Exact match found for patient ID: {patient_id_from_data}")
+                break
+
+        if not matching_patient and (first_name_input or last_name_input):
+            for i in range(len(extractor.patients)):
+                extractor.set_patient_by_index(i)
+                patient_data = extractor.get_patient_dict()
+                first_name_from_data = str(patient_data.get('first_name', '')).strip().lower()
+                last_name_from_data = str(patient_data.get('last_name', '')).strip().lower()
+                
+                if (first_name_input == first_name_from_data and 
+                    last_name_input == last_name_from_data):
+                    matching_patient = patient_data
+                    logger.info(f"Match found by name: {first_name_from_data} {last_name_from_data}")
+                    break
+
+        if not matching_patient:
             search_criteria = f"ID: {patient_id or 'N/A'}, First: {first_name or 'N/A'}, Last: {last_name or 'N/A'}"
+            all_patient_ids = [str(p.get('id', '')) for p in extractor.get_all_patients()]
+            all_patient_names = [f"{p.get('first_name', '')} {p.get('last_name', '')}".strip() 
+                               for p in extractor.get_all_patients()]
             logger.warning(f"No patients matched criteria: {search_criteria}")
-            logger.info(f"Available patient IDs: {all_patient_ids}")
-            logger.info(f"Available patient names: {all_patient_names}")
             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, None
+
+        logger.info(f"Selected patient data: {matching_patient}")
         
-        patient_data = matching_patients[0]  # Take the first match
-        logger.info(f"Selected patient data: {patient_data}")
-        
-        basic_summary = format_discharge_summary(patient_data)
-        ai_summary, verified_summary = generate_ai_discharge_summary(patient_data, client)
+        basic_summary = format_discharge_summary(matching_patient)
+        ai_summary, verified_summary = generate_ai_discharge_summary(matching_patient, client)
         
         if not ai_summary or not verified_summary:
             return None, "Failed to generate or verify AI summary", basic_summary, None, None
             
         pdf_gen = PDFGenerator()
-        filename = f"discharge_{patient_data.get('id', 'unknown')}_{patient_data.get('last_name', 'patient')}.pdf"
+        filename = f"discharge_{matching_patient.get('id', 'unknown')}_{matching_patient.get('last_name', 'patient')}.pdf"
         pdf_path = pdf_gen.generate_pdf_from_text(ai_summary, filename)
         
         if pdf_path:
@@ -157,7 +149,7 @@ def generate_discharge_paper_one_click(
     except Exception as e:
         logger.error(f"Error in one-click discharge generation: {str(e)}", exc_info=True)
         return None, f"Error generating discharge summary: {str(e)}", None, None, None
-
+    
 def format_discharge_summary(patient_data: dict) -> str:
     """Format patient data into a discharge summary text."""
     patient_data.setdefault('id', 'Unknown')

utils/responseparser.py

@@ -256,32 +256,52 @@ class PatientDataExtractor:
     def get_patient_dict(self) -> Dict[str, str]:
         """Return a dictionary of patient data mapped to discharge form fields."""
         data = self.get_all_patient_data()
+        
+        # Get the latest encounter for admission/discharge dates
         latest_encounter = data["encounters"][-1] if data["encounters"] else {}
+        admission_date = latest_encounter.get("start", "")
+        discharge_date = latest_encounter.get("end", "")
+        
+        # Get the latest condition for diagnosis
         latest_condition = data["conditions"][-1] if data["conditions"] else {}
-        medications_str = "; ".join([m["description"] for m in data["medications"] if m["description"]])
+        diagnosis = latest_condition.get("description", "")
+        
+        # Format medications as a string
+        medications_str = "; ".join([m["description"] for m in data["medications"] if m["description"]]) or "None specified"
+        
+        # Safely extract fields with defaults to avoid KeyError
         return {
-            "id": data["id"],
-            "first_name": data["first_name"],
-            "last_name": data["last_name"],
-            "dob": data["dob"],
-            "age": data["age"],
-            "sex": data["gender"],
-            "address": data["address_line"],
-            "city": data["city"],
-            "state": data["state"],
-            "zip_code": data["zip_code"],
-            "phone": data["phone"],
-            "doctor_first_name": "",  # Could be extracted from Practitioner resource if available
+            "id": data.get("id", "Unknown"),
+            "first_name": data.get("first_name", ""),
+            "last_name": data.get("last_name", ""),
+            "name_prefix": data.get("name_prefix", ""),  # Safely handle missing name_prefix
+            "dob": data.get("dob", "Unknown"),
+            "age": data.get("age", "Unknown"),
+            "sex": data.get("gender", "Unknown"),
+            "address": data.get("address_line", "Unknown"),
+            "city": data.get("city", "Unknown"),
+            "state": data.get("state", "Unknown"),
+            "zip_code": data.get("zip_code", "Unknown"),
+            "phone": data.get("phone", "Unknown"),
+            "admission_date": admission_date,
+            "discharge_date": discharge_date,
+            "diagnosis": diagnosis,
+            "medications": medications_str,
+            "doctor_first_name": "",  # Could be extracted from Practitioner resource if linked
             "doctor_last_name": "",
-            "hospital_name": "",
+            "hospital_name": "",  # Could be extracted from Organization resource if linked
             "doctor_address": "",
             "doctor_city": "",
             "doctor_state": "",
             "doctor_zip": "",
-            "admission_date": latest_encounter.get("start", ""),
-            "discharge_date": latest_encounter.get("end", ""),
-            "diagnosis": latest_condition.get("description", ""),
-            "medications": medications_str if medications_str else "None specified",
+            "middle_initial": "",
+            "referral_source": "",
+            "admission_method": "",
+            "discharge_reason": "",
+            "date_of_death": "",
+            "procedures": "",
+            "preparer_name": "",
+            "preparer_job_title": ""
         }
 
     def get_all_patient_data(self) -> Dict[str, Union[str, List, Dict]]: