Fix fact extraction - pass raw data for simple tools......

report_generator.py

@@ -51,6 +51,12 @@ class PreVisitReport:
     current_medications: List[str] = field(default_factory=list)
     recent_vitals: Dict[str, str] = field(default_factory=dict)
     
+    # NEW: Additional medical history
+    immunizations: List[Dict] = field(default_factory=list)
+    procedures: List[Dict] = field(default_factory=list)
+    recent_encounters: List[Dict] = field(default_factory=list)
+    allergies: List[Dict] = field(default_factory=list)
+    
     # Attachments
     attachments: List[Dict] = field(default_factory=list)
     
@@ -69,6 +75,10 @@ class PreVisitReport:
             "relevant_conditions": self.relevant_conditions,
             "current_medications": self.current_medications,
             "recent_vitals": self.recent_vitals,
+            "immunizations": self.immunizations,
+            "procedures": self.procedures,
+            "recent_encounters": self.recent_encounters,
+            "allergies": self.allergies,
             "attachments": self.attachments,
             "key_quotes": self.key_quotes
         }
@@ -97,7 +107,11 @@ async def generate_report(
     patient_info: Dict,
     conversation_history: List[Dict],
     tool_results: List[Dict],
-    attachments: List[Dict] = None
+    attachments: List[Dict] = None,
+    immunizations: List[Dict] = None,
+    procedures: List[Dict] = None,
+    encounters: List[Dict] = None,
+    allergies: List[Dict] = None
 ) -> PreVisitReport:
     """
     Generate a pre-visit report from conversation and medical data.
@@ -107,6 +121,10 @@ async def generate_report(
         conversation_history: List of {"role": "user"|"assistant", "content": "..."}
         tool_results: List of {"tool": "...", "facts": "..."}
         attachments: List of {"type": "audio"|"chart", "title": "...", "summary": "..."}
+        immunizations: List of immunization records from DB
+        procedures: List of procedure records from DB
+        encounters: List of encounter records from DB
+        allergies: List of allergy records from DB
     
     Returns:
         PreVisitReport object
@@ -207,6 +225,10 @@ Output ONLY the JSON, no other text.
         relevant_conditions=report_data.get('relevant_conditions', []),
         current_medications=report_data.get('current_medications', []),
         recent_vitals=report_data.get('recent_vitals', {}),
+        immunizations=immunizations or [],
+        procedures=procedures or [],
+        recent_encounters=encounters or [],
+        allergies=allergies or [],
         attachments=attachments or [],
         key_quotes=report_data.get('key_quotes', [])
     )
@@ -242,10 +264,64 @@ def format_report_html(report: PreVisitReport) -> str:
             </div>
         """
     
+    # NEW: Format immunizations
+    immunizations_html = ""
+    if report.immunizations:
+        for imm in report.immunizations[:8]:  # Limit to 8 most recent
+            vaccine_name = imm.get('vaccine_display', 'Unknown vaccine')
+            # Truncate long vaccine names
+            if len(vaccine_name) > 40:
+                vaccine_name = vaccine_name[:37] + "..."
+            date = imm.get('occurrence_date', '')[:10] if imm.get('occurrence_date') else 'Unknown'
+            immunizations_html += f"<li>{vaccine_name} <span class='date-badge'>({date})</span></li>"
+    else:
+        immunizations_html = "<li>No immunization records</li>"
+    
+    # NEW: Format procedures (surgical history)
+    procedures_html = ""
+    if report.procedures:
+        for proc in report.procedures[:6]:  # Limit to 6 most recent
+            proc_name = proc.get('display', 'Unknown procedure')
+            if len(proc_name) > 45:
+                proc_name = proc_name[:42] + "..."
+            date = proc.get('performed_date', '')[:10] if proc.get('performed_date') else 'Unknown'
+            procedures_html += f"<li>{proc_name} <span class='date-badge'>({date})</span></li>"
+    else:
+        procedures_html = "<li>No surgical history</li>"
+    
+    # NEW: Format recent encounters
+    encounters_html = ""
+    if report.recent_encounters:
+        for enc in report.recent_encounters[:5]:  # Limit to 5 most recent
+            enc_type = enc.get('type_display', enc.get('class_display', 'Visit'))
+            if len(enc_type) > 35:
+                enc_type = enc_type[:32] + "..."
+            reason = enc.get('reason_display', '')
+            if reason and len(reason) > 30:
+                reason = reason[:27] + "..."
+            date = enc.get('period_start', '')[:10] if enc.get('period_start') else 'Unknown'
+            reason_text = f" - {reason}" if reason else ""
+            encounters_html += f"<li>{enc_type}{reason_text} <span class='date-badge'>({date})</span></li>"
+    else:
+        encounters_html = "<li>No recent encounters</li>"
+    
+    # NEW: Format allergies with severity
+    allergies_html = ""
+    if report.allergies:
+        for allergy in report.allergies:
+            substance = allergy.get('substance', 'Unknown')
+            reaction = allergy.get('reaction', allergy.get('reaction_display', ''))
+            criticality = allergy.get('criticality', '')
+            severity_class = 'allergy-high' if criticality == 'high' else 'allergy-low'
+            reaction_text = f" → {reaction}" if reaction else ""
+            allergies_html += f"<li class='{severity_class}'><strong>{substance}</strong>{reaction_text}</li>"
+    else:
+        allergies_html = "<li>No known allergies</li>"
+    
     html = f"""
     <div class="previsit-report">
         <div class="report-header">
-            <h2>Pre-Visit Summary</h2>
+            <h2>📋 Pre-Visit Summary</h2>
             <div class="report-meta">
                 <div class="patient-info">
                     <strong>{report.patient_name}</strong> · {report.patient_age}y · {report.patient_gender}
@@ -255,7 +331,7 @@ def format_report_html(report: PreVisitReport) -> str:
         </div>
         
         <div class="report-section">
-            <h3>📋 Chief Concerns</h3>
+            <h3>🎯 Chief Concerns</h3>
             <ul class="concerns-list">{concerns_html}</ul>
         </div>
         
@@ -271,20 +347,41 @@ def format_report_html(report: PreVisitReport) -> str:
         
         <div class="report-columns">
             <div class="report-section half">
-                <h3>📁 Relevant Conditions</h3>
+                <h3>📁 Active Conditions</h3>
                 <ul>{conditions_html}</ul>
             </div>
             <div class="report-section half">
-                <h3>💊 Current Medications</h3>
-                <ul>{medications_html}</ul>
+                <h3>⚠️ Allergies</h3>
+                <ul class="allergies-list">{allergies_html}</ul>
             </div>
         </div>
         
+        <div class="report-section">
+            <h3>💊 Current Medications</h3>
+            <ul>{medications_html}</ul>
+        </div>
+        
         {f'''<div class="report-section">
             <h3>📊 Recent Vitals</h3>
             <div class="vitals-grid">{vitals_html}</div>
         </div>''' if report.recent_vitals else ""}
         
+        <div class="report-columns">
+            <div class="report-section half">
+                <h3>💉 Immunizations</h3>
+                <ul class="compact-list">{immunizations_html}</ul>
+            </div>
+            <div class="report-section half">
+                <h3>🏥 Surgical History</h3>
+                <ul class="compact-list">{procedures_html}</ul>
+            </div>
+        </div>
+        
+        <div class="report-section">
+            <h3>📅 Recent Encounters</h3>
+            <ul class="compact-list">{encounters_html}</ul>
+        </div>
+        
         {f'''<div class="report-section">
             <h3>💬 Patient Quotes</h3>
             {quotes_html}

server.py

@@ -167,13 +167,43 @@ async def get_encounters(patient_id: str, limit: int = 10):
     conn = get_db()
     try:
         cursor = conn.execute("""
-            SELECT * FROM encounters WHERE patient_id = ?
-            ORDER BY start_date DESC LIMIT ?
+            SELECT id, status, class_code, class_display, type_code, type_display,
+                   reason_code, reason_display, period_start, period_end
+            FROM encounters WHERE patient_id = ?
+            ORDER BY period_start DESC LIMIT ?
         """, (patient_id, limit))
         encounters = [dict_from_row(row) for row in cursor.fetchall()]
         return {"encounters": encounters}
     finally:
         conn.close()
+
+@app.get("/api/patients/{patient_id}/immunizations")
+async def get_immunizations(patient_id: str):
+    conn = get_db()
+    try:
+        cursor = conn.execute("""
+            SELECT id, vaccine_code, vaccine_display, status, occurrence_date
+            FROM immunizations WHERE patient_id = ?
+            ORDER BY occurrence_date DESC
+        """, (patient_id,))
+        immunizations = [dict_from_row(row) for row in cursor.fetchall()]
+        return {"immunizations": immunizations}
+    finally:
+        conn.close()
+
+@app.get("/api/patients/{patient_id}/procedures")
+async def get_procedures(patient_id: str):
+    conn = get_db()
+    try:
+        cursor = conn.execute("""
+            SELECT id, code, display, status, performed_date
+            FROM procedures WHERE patient_id = ?
+            ORDER BY performed_date DESC
+        """, (patient_id,))
+        procedures = [dict_from_row(row) for row in cursor.fetchall()]
+        return {"procedures": procedures}
+    finally:
+        conn.close()
 # ============================================================================
 # LLM Integration
 # ============================================================================
@@ -543,9 +573,11 @@ async def generate_report_endpoint(request: ReportRequest):
         conn = get_db()
         cursor = conn.execute("SELECT * FROM patients WHERE id = ?", (request.patient_id,))
         patient = cursor.fetchone()
-        conn.close()
+        
         if not patient:
+            conn.close()
             raise HTTPException(status_code=404, detail="Patient not found")
+        
         from datetime import datetime
         birth = datetime.strptime(patient["birth_date"], "%Y-%m-%d")
         age = (datetime.now() - birth).days // 365
@@ -554,13 +586,53 @@ async def generate_report_endpoint(request: ReportRequest):
             "age": age,
             "gender": patient['gender']
         }
-        # Generate report
+        
+        # Fetch immunizations
+        cursor = conn.execute("""
+            SELECT id, vaccine_code, vaccine_display, status, occurrence_date
+            FROM immunizations WHERE patient_id = ?
+            ORDER BY occurrence_date DESC
+        """, (request.patient_id,))
+        immunizations = [dict_from_row(row) for row in cursor.fetchall()]
+        
+        # Fetch procedures (surgical history)
+        cursor = conn.execute("""
+            SELECT id, code, display, status, performed_date
+            FROM procedures WHERE patient_id = ?
+            ORDER BY performed_date DESC
+        """, (request.patient_id,))
+        procedures = [dict_from_row(row) for row in cursor.fetchall()]
+        
+        # Fetch recent encounters
+        cursor = conn.execute("""
+            SELECT id, status, class_code, class_display, type_code, type_display,
+                   reason_code, reason_display, period_start, period_end
+            FROM encounters WHERE patient_id = ?
+            ORDER BY period_start DESC LIMIT 10
+        """, (request.patient_id,))
+        encounters = [dict_from_row(row) for row in cursor.fetchall()]
+        
+        # Fetch allergies
+        cursor = conn.execute("""
+            SELECT id, substance, reaction_display as reaction, criticality, category
+            FROM allergies WHERE patient_id = ?
+        """, (request.patient_id,))
+        allergies = [dict_from_row(row) for row in cursor.fetchall()]
+        
+        conn.close()
+        
+        # Generate report with all data
         report = await generate_report(
             patient_info=patient_info,
             conversation_history=request.conversation,
             tool_results=request.tool_results,
-            attachments=request.attachments
+            attachments=request.attachments,
+            immunizations=immunizations,
+            procedures=procedures,
+            encounters=encounters,
+            allergies=allergies
         )
+        
         # Return both structured data and HTML
         return {
             "success": True,

static/index.html

@@ -929,6 +929,45 @@
             color: var(--text-muted);
             text-align: center;
         }
+        
+        /* NEW: Compact list styling for immunizations/procedures/encounters */
+        .previsit-report .compact-list {
+            font-size: 12px;
+            margin: 0;
+            padding-left: 16px;
+        }
+        
+        .previsit-report .compact-list li {
+            margin: 3px 0;
+            line-height: 1.4;
+        }
+        
+        .previsit-report .date-badge {
+            color: var(--text-muted);
+            font-size: 11px;
+        }
+        
+        /* Allergy styling with severity indicators */
+        .previsit-report .allergies-list {
+            margin: 0;
+            padding-left: 16px;
+        }
+        
+        .previsit-report .allergies-list li {
+            margin: 4px 0;
+        }
+        
+        .previsit-report .allergies-list .allergy-high {
+            color: #ff6b6b;
+        }
+        
+        .previsit-report .allergies-list .allergy-high strong {
+            color: #ff4757;
+        }
+        
+        .previsit-report .allergies-list .allergy-low {
+            color: var(--text-main);
+        }
     </style>
 </head>
 <body>
@@ -1966,6 +2005,12 @@
                         .pdf-report .report-section.half { flex: 1; }
                         .pdf-report .patient-info { color: #000 !important; }
                         .pdf-report .report-date { color: #333 !important; }
+                        .pdf-report .compact-list { font-size: 12px; padding-left: 16px; }
+                        .pdf-report .compact-list li { margin: 3px 0; }
+                        .pdf-report .date-badge { color: #666 !important; font-size: 11px; }
+                        .pdf-report .allergies-list .allergy-high { color: #c0392b !important; }
+                        .pdf-report .allergies-list .allergy-high strong { color: #c0392b !important; }
+                        .pdf-report .allergies-list .allergy-low { color: #000 !important; }
                     </style>
                     <div class="pdf-report">
                         ${currentReport.html}