try to fix the response parser , fingers crossed

templates/index.html

@@ -1,5 +1,80 @@
 {% extends "base.html" %}
 {% block content %}
-<h2>Welcome to Discharge Guard Cyber</h2>
-<p>Use the navigation above to access features.</p>
+<div class="container my-5">
+    <div class="row">
+        <div class="col-12">
+            <h2 class="text-center mb-4">Welcome to Discharge Guard</h2>
+            <div class="card shadow-sm mb-4">
+                <div class="card-body">
+                    <h3 class="card-title">💡 Inspiration</h3>
+                    <p class="card-text">
+                        Busy clinics are often overwhelmed with administrative tasks, and generating discharge papers
+                        manually is time-consuming and prone to errors.
+                        We were inspired to create a solution that streamlines this process, freeing up valuable time
+                        for healthcare professionals to focus on patient care.
+                        We saw the potential of MeldRX to access and leverage patient data securely and compliantly,
+                        making automated discharge paper generation a reality. 🏥 ⏱️ ➡️ 🧑‍⚕️
+                    </p>
+                </div>
+            </div>
+
+            <div class="card shadow-sm mb-4">
+                <div class="card-body">
+                    <h3 class="card-title">✨ What it does</h3>
+                    <p class="card-text">
+                        Discharge Guard is a single-button solution for generating compliant and comprehensive medical
+                        discharge papers directly within busy clinic workflows.
+                        By connecting to MeldRX, it automatically pulls necessary patient information and formats it
+                        into a professional discharge document.
+                        This eliminates manual data entry, reduces errors, and ensures adherence to healthcare
+                        standards, all with just one click! 🖱️ ✅ 📄
+                    </p>
+                </div>
+            </div>
+
+            <div class="card shadow-sm mb-4">
+                <div class="card-body">
+                    <h3 class="card-title">🛠️ How we built it</h3>
+                    <p class="card-text">
+                        We built Discharge Guard using a combination of powerful and user-friendly technologies. The
+                        front-end is developed with MultiTransformer huggingface, providing a simple and intuitive
+                        interface for clinic staff.
+                        Behind the scenes, we leverage the MeldRX API to securely access patient data in FHIR format.
+                    </p>
+                    <p class="card-text">
+                        Our prototype implements the following key steps:
+                    </p>
+                    <ul>
+                        <li><strong>Produce patient data download by ID:</strong> Clinic staff can input a patient ID,
+                            and the application retrieves the corresponding patient data from MeldRX using the API.</li>
+                        <li><strong>Parse patient data:</strong> The fetched FHIR data is processed to extract essential
+                            details like patient demographics, diagnoses, and treatment plans needed for discharge
+                            papers.</li>
+                        <li><strong>Produce prompts for discharge papers:</strong> Using the parsed data, the
+                            application generates the content for discharge papers, including medical information and
+                            post-discharge instructions tailored to the patient.</li>
+                        <li><strong>Create patient data in MeldRX:</strong> The generated discharge papers are uploaded
+                            back to MeldRX as new resources, ensuring the patient's record stays complete and up to
+                            date.</li>
+                    </ul>
+                </div>
+            </div>
+
+            <div class="card shadow-sm">
+                <div class="card-body">
+                    <h3 class="card-title">🚀 Next Steps</h3>
+                    <p class="card-text">
+                        We're continuously improving Discharge Guard with more features including customizable
+                        templates, additional clinic system integrations, and refinements based on user feedback.
+                        Our goal is to make Discharge Guard a widely adopted tool that empowers clinics to provide
+                        better patient care by streamlining administrative processes.
+                    </p>
+                    <div class="text-center mt-4">
+                        <a href="/generate" class="btn btn-primary btn-lg">Try Discharge Guard Now</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 {% endblock %}

utils/meldrx.py

@@ -59,18 +59,14 @@ class MeldRxAPI:
             headers["Authorization"] = f"Bearer {self.access_token}"
         return headers
 
-    def get_patients(self) -> Optional[Dict[str, Any]]:
-        url = f"{self.fhir_base_url}/Patient"
-        if not self.access_token and not self.authenticate():
-            print("Cannot proceed without authentication.")
-            return None
-        try:
-            response = self.session.get(url, headers=self._get_headers())
-            response.raise_for_status()
-            return response.json() if response.text else {}
-        except requests.RequestException as e:
-            print(f"Failed to retrieve patients: {e}")
-            return None
+    def get_patients(self):
+        # This should return the FHIR Bundle as per your sample output
+        headers = {"Authorization": f"Bearer {self.access_token}"}
+        response = requests.get(
+            f"https://app.meldrx.com/api/fhir/{self.workspace_id}/Patient",
+            headers=headers
+        )
+        return response.json() if response.status_code == 200 else None
 
     def get_authorization_url(self, scope: str = "patient/*.read openid profile", state: str = "random_state") -> str:
         code_verifier = self._generate_code_verifier()

utils/oneclick.py

@@ -102,6 +102,7 @@ def generate_discharge_paper_one_click(
             logger.debug(f"Processing patient {i}: {patient_data}")  # Add debug log
             patient_id_from_data = str(patient_data.get('id', '')).strip().lower()
             
+            
             if patient_id_input and patient_id_from_data == patient_id_input:
                 matching_patient = patient_data
                 logger.info(f"Exact match found for patient ID: {patient_id_from_data}")
@@ -120,9 +121,13 @@ def generate_discharge_paper_one_click(
                     logger.info(f"Match found by name: {first_name_from_data} {last_name_from_data}")
                     break
 
+        if not matching_patient:
         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()]
+            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}")
@@ -131,7 +136,11 @@ def generate_discharge_paper_one_click(
                          f"Available Names: {', '.join(all_patient_names)}"), None, None, None
 
         logger.info(f"Selected patient data: {matching_patient}")
+
+        logger.info(f"Selected patient data: {matching_patient}")
         
+        basic_summary = format_discharge_summary(matching_patient)
+        ai_summary, verified_summary = generate_ai_discharge_summary(matching_patient, client)
         basic_summary = format_discharge_summary(matching_patient)
         ai_summary, verified_summary = generate_ai_discharge_summary(matching_patient, client)
         
@@ -140,6 +149,7 @@ def generate_discharge_paper_one_click(
             
         pdf_gen = PDFGenerator()
         filename = f"discharge_{matching_patient.get('id', 'unknown')}_{matching_patient.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:

utils/responseparser.py

@@ -269,6 +269,7 @@ class PatientDataExtractor:
         # Format medications as a string
         medications_str = "; ".join([m["description"] for m in data["medications"] if m["description"]]) or "None specified"
         
+<<<<<<< HEAD
         # Safely extract fields with defaults to avoid KeyError
         return {
             "id": data.get("id", "Unknown"),
@@ -283,6 +284,21 @@ class PatientDataExtractor:
             "state": data.get("state", "Unknown"),
             "zip_code": data.get("zip_code", "Unknown"),
             "phone": data.get("phone", "Unknown"),
+=======
+        return {
+            "id": data["id"],
+            "first_name": data["first_name"],
+            "last_name": data["last_name"],
+            "name_prefix": data["name_prefix"],
+            "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"],
+>>>>>>> 9690499f96401745e214013c8a9267b332a69778
             "admission_date": admission_date,
             "discharge_date": discharge_date,
             "diagnosis": diagnosis,