Update view_consultation.py

view_consultation.py

@@ -17,25 +17,6 @@ def format_field_as_string(data):
                           for item in data])
     return str(data)
 
-def expand_field_to_table(field_data, columns):
-    """Expand the formatted string back into a DataFrame."""
-    if not field_data:
-        return pd.DataFrame(columns=columns)
-    
-    rows = [item.split(" (") for item in field_data.split("; ")]
-    formatted_rows = []
-    for row in rows:
-        if len(columns) == 4:  # Prescription
-            drug_name = row[0]
-            frequency, quantity = row[1].replace(")", "").split(" - ")
-            formatted_rows.append([len(formatted_rows) + 1, drug_name, frequency, quantity])
-        else:  # Lab Investigations
-            test_name = row[0]
-            department = row[1].replace(")", "")
-            formatted_rows.append([len(formatted_rows) + 1, test_name, department])
-    
-    return pd.DataFrame(formatted_rows, columns=columns)
-
 def get_consultation_details(patient_id):
     """Retrieve consultation details for a given Patient ID."""
     columns = ["Consultation ID", "Patient ID", "Patient Name", "Height", "Weight", 
@@ -50,7 +31,7 @@ def get_consultation_details(patient_id):
             # Ensure all required columns are present
             missing_cols = [col for col in columns if col not in df.columns]
             if missing_cols:
-                return f"Error: Missing columns in consultation data: {', '.join(missing_cols)}", None, None
+                return f"Error: Missing columns in consultation data: {', '.join(missing_cols)}"
             
             # Convert Patient ID to numeric
             df["Patient ID"] = pd.to_numeric(df["Patient ID"], errors='coerce')
@@ -59,7 +40,7 @@ def get_consultation_details(patient_id):
             consultation = df[df["Patient ID"] == patient_id]
             
             if consultation.empty:
-                return f"No consultation records found for Patient ID: {patient_id}.", None, None
+                return f"No consultation records found for Patient ID: {patient_id}."
 
             # Rename columns for display purposes
             consultation = consultation.rename(columns={"Height": "Height (cms)", "Weight": "Weight (kgs)"})
@@ -68,30 +49,24 @@ def get_consultation_details(patient_id):
             consultation["Prescription"] = consultation["Prescription"].apply(format_field_as_string)
             consultation["Lab Investigations"] = consultation["Lab Investigations"].apply(format_field_as_string)
 
-            details = consultation.iloc[0].to_dict()
-            
-            # Extract prescriptions and lab investigations into tables
-            prescription_table = expand_field_to_table(details.get("Prescription", ""), ["Row Number", "Drug Name", "Frequency", "Quantity"])
-            lab_table = expand_field_to_table(details.get("Lab Investigations", ""), ["Row Number", "Test Name", "Department"])
-            
-            # Remove Prescription and Lab Investigations from the general info table
-            general_info = {key: value for key, value in details.items() if key not in ["Prescription", "Lab Investigations"]}
-            return general_info, prescription_table, lab_table
+            details = consultation.to_dict(orient="records")
+            print("Details:", details)  # Debugging line
+            return details
         
         except pd.errors.ParserError as e:
-            return f"Error reading CSV file: {e}", None, None
+            return f"Error reading CSV file: {e}"
         except Exception as e:
-            return f"Unexpected error occurred: {e}", None, None
+            return f"Unexpected error occurred: {e}"
     else:
-        return "Consultation data file does not exist.", None, None
+        return "Consultation data file does not exist."
 
 def view_consultations(patient_id):
-    details, prescription_table, lab_table = get_consultation_details(patient_id)
-    if details:
-        general_info = pd.DataFrame([details])
-        return general_info, prescription_table, lab_table
+    details = get_consultation_details(patient_id)
+    if isinstance(details, list) and details:
+        return pd.DataFrame(details)
     else:
-        return pd.DataFrame(columns=["Message"], data=[[details]]), pd.DataFrame(), pd.DataFrame()
+        print("View Consultation Error:", details)  # Debugging line
+        return pd.DataFrame(columns=["Message"], data=[[details]])
 
 def gradio_interface():
     """Create Gradio interface for viewing consultation details."""
@@ -104,29 +79,15 @@ def gradio_interface():
                 consultations_output = gr.Dataframe(
                     headers=["Consultation ID", "Patient ID", "Patient Name", "Height (cms)", "Weight (kgs)", 
                              "Diastolic BP", "Systolic BP", "Temperature", "Chief Complaints", 
-                             "Revisit Date", "Revisit Time"], 
-                    row_count=1, 
-                    col_count=11
-                )
-                prescription_output = gr.Dataframe(
-                    headers=["Row Number", "Drug Name", "Frequency", "Quantity"],
-                    row_count=10,
-                    col_count=4
+                             "Prescription", "Lab Investigations", "Revisit Date", "Revisit Time"], 
+                    row_count=10, 
+                    col_count=13
                 )
-                lab_output = gr.Dataframe(
-                    headers=["Row Number", "Test Name", "Department"],
-                    row_count=10,
-                    col_count=3
-                )
-
-                def update_consultation_view(patient_id):
-                    general_info, prescription_table, lab_table = view_consultations(patient_id)
-                    return general_info, prescription_table, lab_table
 
                 patient_id_input.change(
-                    fn=update_consultation_view,
+                    fn=view_consultations,
                     inputs=patient_id_input,
-                    outputs=[consultations_output, prescription_output, lab_output]
+                    outputs=consultations_output
                 )
 
     return demo
@@ -134,4 +95,4 @@ def gradio_interface():
 # Run the Gradio app
 if __name__ == "__main__":
     interface = gradio_interface()
-    interface.launch()
+    interface.launch()