Update src/patient_history.py

src/patient_history.py

@@ -1,8 +1,10 @@
+# src/patient_history.py
 import logging
 import json
 import html
 from datetime import datetime
-from typing import List, Dict, Optional, Tuple
+from typing import List, Dict, Optional, Tuple, Any
+
 
 class PatientHistoryManager:
     """
@@ -11,7 +13,7 @@ class PatientHistoryManager:
     Key schema expectations this class honors:
       - questionnaire_responses.patient_id -> patients.id (INT/BIGINT)
       - patients.uuid is the stable string identifier for string-FK tables
-      - wounds.patient_id, wound_images.patient_id, notes.patient_id are VARCHAR -> store patients.uuid
+      - wounds.patient_id, wound_images.patient_id, notes.patient_id may be VARCHAR -> store patients.uuid
       - ai_analyses.questionnaire_id -> questionnaires.id (template-level linkage)
     """
 
@@ -63,7 +65,8 @@ class PatientHistoryManager:
     ) -> List[Dict]:
         """
         Full visit list for a practitioner, optionally filtered by patient name.
-        Includes joins to wounds, wound_images (via patients.uuid) and ai_analyses (via questionnaire template).
+        Includes joins to wounds, wound_images (via patients.uuid or string id)
+        and ai_analyses (via questionnaire template).
         """
         try:
             # Defensive bounds for pagination
@@ -77,7 +80,7 @@ class PatientHistoryManager:
                     qr.submitted_at AS visit_date,
                     qr.response_data,
 
-                    p.id   AS patient_id_int,
+                    p.id   AS patient_id,
                     p.uuid AS patient_uuid,
                     p.name AS patient_name,
                     p.age  AS patient_age,
@@ -121,7 +124,7 @@ class PatientHistoryManager:
             return rows
 
         except Exception as e:
-            logging.error(f"Error fetching patient complete history: {e}")
+            logging.error(f"Error fetching patient complete history: {e}", exc_info=True)
             return []
 
     def get_patient_list(self, user_id: int) -> List[Dict]:
@@ -131,6 +134,8 @@ class PatientHistoryManager:
         try:
             sql = """
                 SELECT 
+                    p.id AS id,
+                    p.uuid,
                     p.name AS patient_name,
                     p.age AS patient_age,
                     p.gender AS patient_gender,
@@ -140,17 +145,18 @@ class PatientHistoryManager:
                 FROM questionnaire_responses qr
                 JOIN patients p ON p.id = qr.patient_id
                 WHERE qr.practitioner_id = %s
-                GROUP BY p.name, p.age, p.gender
+                GROUP BY p.id, p.uuid, p.name, p.age, p.gender
                 ORDER BY last_visit DESC
             """
             return self.db.execute_query(sql, (user_id,), fetch=True) or []
         except Exception as e:
-            logging.error(f"Error fetching patient list: {e}")
+            logging.error(f"Error fetching patient list: {e}", exc_info=True)
             return []
 
     def get_wound_progression(self, user_id: int, patient_name: str) -> List[Dict]:
         """
-        Ascending temporal list for one patient — useful for timeline charts.
+        Ascending temporal list for one patient (by name) — kept for backward compatibility.
+        Prefer get_wound_progression_by_id().
         """
         try:
             sql = """
@@ -166,7 +172,9 @@ class PatientHistoryManager:
                     a.risk_level,
                     a.summary,
 
-                    wi.image AS image_url
+                    wi.image AS image_url,
+
+                    p.name AS patient_name
                 FROM questionnaire_responses qr
                 JOIN patients p ON p.id = qr.patient_id
                 LEFT JOIN wounds w 
@@ -187,7 +195,52 @@ class PatientHistoryManager:
                     r["wound_location"] = loc_json
             return rows
         except Exception as e:
-            logging.error(f"Error fetching wound progression: {e}")
+            logging.error(f"Error fetching wound progression: {e}", exc_info=True)
+            return []
+
+    def get_wound_progression_by_id(self, user_id: int, patient_id: int) -> List[Dict]:
+        """
+        Ascending temporal list for one patient (by numeric patient_id).
+        Use this for “View Details” when a patient is chosen from a dropdown.
+        """
+        try:
+            sql = """
+                SELECT 
+                    qr.submitted_at AS visit_date,
+                    qr.response_data,
+
+                    w.position AS wound_location,
+                    w.moisture,
+                    w.infection,
+
+                    a.risk_score,
+                    a.risk_level,
+                    a.summary,
+
+                    wi.image AS image_url,
+
+                    p.name AS patient_name
+                FROM questionnaire_responses qr
+                JOIN patients p ON p.id = qr.patient_id
+                LEFT JOIN wounds w 
+                    ON (w.patient_id = p.uuid OR w.patient_id = CAST(p.id AS CHAR))
+                LEFT JOIN wound_images wi 
+                    ON (wi.patient_id = p.uuid OR wi.patient_id = CAST(p.id AS CHAR))
+                LEFT JOIN ai_analyses a 
+                    ON a.questionnaire_id = qr.questionnaire_id
+                WHERE qr.practitioner_id = %s
+                  AND p.id = %s
+                ORDER BY qr.submitted_at ASC
+            """
+            rows = self.db.execute_query(sql, (user_id, int(patient_id)), fetch=True) or []
+            for r in rows:
+                r["pain_level"] = self._from_response(r, ["wound_details", "pain_level"])
+                loc_json = self._from_response(r, ["wound_details", "location"])
+                if loc_json:
+                    r["wound_location"] = loc_json
+            return rows
+        except Exception as e:
+            logging.error(f"Error fetching wound progression by id: {e}", exc_info=True)
             return []
 
     def save_patient_note(self, user_id: int, patient_name: str, note: str) -> bool:
@@ -221,21 +274,17 @@ class PatientHistoryManager:
             )
             return bool(rc)
         except Exception as e:
-            logging.error(f"Error saving patient note: {e}")
+            logging.error(f"Error saving patient note: {e}", exc_info=True)
             return False
 
     # --------------------------- UI Wrappers ---------------------------
 
     def get_user_patient_history(self, user_id: int) -> List[Dict]:
-        """
-        Wrapper used by UI: returns (paginated) latest history for all patients.
-        """
+        """Wrapper used by UI: latest history for all patients."""
         return self.get_patient_complete_history(user_id=user_id, limit=100, offset=0)
 
     def search_patient_by_name(self, user_id: int, patient_name: str) -> List[Dict]:
-        """
-        Wrapper used by UI: returns history for a single patient name.
-        """
+        """Wrapper used by UI: history filtered to a single patient name."""
         return self.get_patient_complete_history(user_id=user_id, patient_name=patient_name, limit=100, offset=0)
 
     # --------------------------- Render helpers ---------------------------
@@ -245,7 +294,6 @@ class PatientHistoryManager:
             if hasattr(dt_obj, "strftime"):
                 return dt_obj.strftime('%b %d, %Y %I:%M %p')
             if isinstance(dt_obj, str):
-                # Attempt to prettify ISO-like strings
                 try:
                     dt = datetime.fromisoformat(dt_obj.replace('Z', '+00:00'))
                     return dt.strftime('%b %d, %Y %I:%M %p')
@@ -264,7 +312,10 @@ class PatientHistoryManager:
             bg, fg = "#fff3cd", "#856404"
         elif rl.startswith("high"):
             bg, fg = "#f8d7da", "#721c24"
-        return f"<span style='background:{bg};color:{fg};padding:2px 8px;border-radius:10px;font-size:12px;font-weight:600;'>{html.escape(risk_level or 'Unknown')}</span>"
+        return (
+            "<span style='background:{bg};color:{fg};padding:2px 8px;border-radius:10px;"
+            "font-size:12px;font-weight:600;'>{txt}</span>"
+        ).format(bg=bg, fg=fg, txt=html.escape(risk_level or "Unknown"))
 
     def format_history_for_display(self, rows: List[Dict]) -> str:
         """
@@ -287,28 +338,88 @@ class PatientHistoryManager:
             img = r.get("image_url")
 
             parts.append("<div style='padding:12px;border:1px solid #e2e8f0;border-radius:10px;background:#fff;'>")
-            parts.append(f"<div style='display:flex;justify-content:space-between;align-items:center;gap:8px;flex-wrap:wrap'>"
-                         f"<div><strong>{patient}</strong> • {age} • {gender}</div>"
-                         f"<div style='color:#4a5568;'>{dt}</div>"
-                         f"</div>")
+            parts.append(
+                "<div style='display:flex;justify-content:space-between;align-items:center;gap:8px;flex-wrap:wrap'>"
+                f"<div><strong>{patient}</strong> • {age} • {gender}</div>"
+                f"<div style='color:#4a5568;'>{dt}</div>"
+                "</div>"
+            )
 
-            row2 = (f"Wound: {wound_loc} • Pain: {pain} • Risk: {risk_chip}")
+            row2 = f"Wound: {wound_loc} • Pain: {pain} • Risk: {risk_chip}"
             parts.append(f"<div style='margin-top:6px'>{row2}</div>")
 
             if summary:
-                parts.append(f"<div style='margin-top:6px;color:#2d3748'><em>{html.escape(str(summary))}</em></div>")
+                parts.append(
+                    "<div style='margin-top:6px;color:#2d3748'><em>"
+                    f"{html.escape(str(summary))}"
+                    "</em></div>"
+                )
 
             if img:
-                parts.append(f"<div style='margin-top:10px'><img src='{html.escape(img)}' style='max-width:260px;border-radius:8px;border:1px solid #edf2f7'></div>")
+                parts.append(
+                    "<div style='margin-top:10px'><img src='{}' "
+                    "style='max-width:260px;border-radius:8px;border:1px solid #edf2f7'></div>"
+                    .format(html.escape(img))
+                )
 
             parts.append("</div>")  # card
         parts.append("</div>")
         return "".join(parts)
 
-    def format_patient_data_for_display(self, rows: List[Dict]) -> str:
+    def format_patient_progress_for_display(self, rows: List[Dict]) -> str:
         """
-        Renderer for a single patient's history (reuses card format).
+        Professional timeline for a single patient (used by 'View Details').
         """
+        if not rows:
+            return "<div class='status-warning'>No progression data available.</div>"
+
+        pname = html.escape(str(rows[0].get("patient_name", "Unknown Patient")))
+        header = (
+            "<div style='background:linear-gradient(135deg,#3182ce 0%,#2c5aa0 100%);color:#fff;"
+            "padding:16px;border-radius:12px;margin-bottom:14px;'>"
+            f"<h3 style='margin:0'>🧭 Wound Progress — {pname}</h3>"
+            "</div>"
+        )
+
+        items: List[str] = []
+        for r in rows:
+            visit_date = r.get("visit_date")
+            disp_date = visit_date.strftime("%B %d, %Y") if hasattr(visit_date, "strftime") else str(visit_date)
+            img = r.get("image_url") or ""
+            img_tag = (
+                "<img src='{src}' style='max-width:380px;border-radius:10px;box-shadow:0 2px 10px rgba(0,0,0,.08);' />"
+                .format(src=html.escape(img))
+                if img else ""
+            )
+            risk = str(r.get("risk_level", "Unknown"))
+            risk_chip = self._risk_chip(risk)
+            summary = html.escape(str(r.get("summary") or "No summary."))
+
+            items.append(
+                "<div style='display:grid;grid-template-columns:1fr 2fr;gap:16px;align-items:start;"
+                "background:#fff;border:1px solid #e9ecef;border-radius:12px;padding:16px;'>"
+                "<div style='text-align:center;'>"
+                f"<div style='font-weight:700;color:#0f172a;'>{html.escape(disp_date)}</div>"
+                f"<div style='margin-top:8px;'>{img_tag}</div>"
+                "</div>"
+                "<div>"
+                f"<div style='margin-bottom:10px;'>{risk_chip}</div>"
+                f"<div style='color:#334155;line-height:1.6;'>{summary}</div>"
+                "</div>"
+                "</div>"
+            )
+
+        body = "<div style='display:flex;flex-direction:column;gap:14px;'>" + "\n".join(items) + "</div>"
+        container = (
+            "<div style='max-width:1200px;margin:0 auto;'>"
+            f"{header}"
+            f"{body}"
+            "</div>"
+        )
+        return container
+
+    def format_patient_data_for_display(self, rows: List[Dict]) -> str:
+        """Renderer for a single patient's history (reuses card format)."""
         return self.format_history_for_display(rows)
 
 
@@ -348,145 +459,146 @@ class ReportGenerator:
         lis = "".join(f"<li>{html.escape(i)}</li>" for i in items if len(i) > 2)
         return f"<ul>{lis}</ul>"
 
-    def generate_analysis_report(self, patient_data: Dict, analysis_data: Dict, image_url: str = None) -> str:
-            """
-            Generate comprehensive printable HTML report for a single analysis.
-            """
-            risk_level = (analysis_data or {}).get("risk_level", "Unknown")
-            risk_class = f"risk-{str(risk_level).lower().replace(' ', '-')}"
-            summary = (analysis_data or {}).get("summary", "No analysis summary available.")
-            recs = self._format_recommendations((analysis_data or {}).get("recommendations", ""))
-        
-            # Build optional image section first to avoid nested f-strings
+    def generate_analysis_report(
+        self, patient_data: Dict[str, Any], analysis_data: Dict[str, Any], image_url: Optional[str] = None
+    ) -> str:
+        """
+        Generate comprehensive printable HTML report for a single analysis.
+        (No nested f-strings)
+        """
+        risk_level = (analysis_data or {}).get("risk_level", "Unknown")
+        risk_class = f"risk-{str(risk_level).lower().replace(' ', '-')}"
+        summary = (analysis_data or {}).get("summary", "No analysis summary available.")
+        recs = self._format_recommendations((analysis_data or {}).get("recommendations", ""))
+
+        # Build optional image section first to avoid nested f-strings
+        if image_url:
             image_section = (
-                f"""
-                <div class="section">
-                    <h2>Wound Image</h2>
-                    <div class="image-wrap">
-                        <img src="{html.escape(image_url)}" alt="Wound Image" class="wound-image" />
-                    </div>
-                </div>
-                """ if image_url else ""
+                "<div class=\"section\">"
+                "<h2>Wound Image</h2>"
+                "<div class=\"image-wrap\">"
+                f"<img src=\"{html.escape(image_url)}\" alt=\"Wound Image\" class=\"wound-image\" />"
+                "</div></div>"
             )
-        
-            return f"""
-            <!DOCTYPE html>
-            <html lang="en">
-            <head>
-                <meta charset="UTF-8">
-                <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                <title>SmartHeal AI - Wound Analysis Report</title>
-                <style>
-                    body {{
-                        font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-                        line-height: 1.6; margin: 0; padding: 20px; background-color: #f8f9fa;
-                    }}
-                    .report-container {{ max-width: 920px; margin: 0 auto; background: white; border-radius: 10px;
-                        box-shadow: 0 4px 20px rgba(0,0,0,0.1); overflow: hidden; }}
-                    .header {{ background: linear-gradient(135deg, #3182ce 0%, #2c5aa0 100%); color: white; padding: 30px; text-align: center; }}
-                    .header h1 {{ margin: 0; font-size: 28px; font-weight: 600; }}
-                    .header p {{ margin: 10px 0 0 0; opacity: 0.9; font-size: 16px; }}
-                    .content {{ padding: 30px; }}
-                    .section {{ margin-bottom: 30px; border-left: 4px solid #3182ce; padding-left: 20px; }}
-                    .section h2 {{ color: #2c5aa0; margin-top: 0; font-size: 20px; font-weight: 600; }}
-                    .grid2 {{ display:grid; grid-template-columns:1fr 1fr; gap:20px; }}
-                    .card {{ background:#f8f9fa; padding:15px; border-radius:8px; border:1px solid #e9ecef; }}
-                    .card h3 {{ margin:0 0 10px 0; color:#495057; font-size:13px; font-weight:700; text-transform:uppercase; }}
-                    .card p {{ margin:0; font-weight:500; color:#212529; }}
-                    .risk-indicator {{ display:inline-block; padding:8px 16px; border-radius:20px; font-weight:600; text-transform:uppercase; font-size:12px; letter-spacing:.5px; }}
-                    .risk-low {{ background:#d4edda; color:#155724; }}
-                    .risk-moderate {{ background:#fff3cd; color:#856404; }}
-                    .risk-high {{ background:#f8d7da; color:#721c24; }}
-                    .recommendations {{ background:#e7f3ff; border:1px solid #b3d9ff; border-radius:8px; padding:20px; margin-top:15px; }}
-                    .image-wrap {{ text-align:center; margin:20px 0; }}
-                    .wound-image {{ max-width:100%; height:auto; border-radius:8px; box-shadow:0 4px 12px rgba(0,0,0,.15); }}
-                    .footer {{ background:#f8f9fa; padding:20px 30px; text-align:center; color:#6c757d; border-top:1px solid #e9ecef; }}
-                    @media print {{ body {{ background:white; }} .report-container {{ box-shadow:none; }} }}
-                </style>
-            </head>
-            <body>
-                <div class="report-container">
-                    <div class="header">
-                        <h1>🩺 SmartHeal AI Wound Analysis Report</h1>
-                        <p>Advanced AI-Powered Clinical Assessment</p>
-                    </div>
-        
-                    <div class="content">
-                        <div class="section">
-                            <h2>Patient Information</h2>
-                            <div class="grid2">
-                                <div class="card"><h3>Patient Name</h3><p>{html.escape(str(patient_data.get('patient_name','N/A')))}</p></div>
-                                <div class="card"><h3>Age</h3><p>{html.escape(str(patient_data.get('patient_age','N/A')))} years</p></div>
-                                <div class="card"><h3>Gender</h3><p>{html.escape(str(patient_data.get('patient_gender','N/A')))}</p></div>
-                                <div class="card"><h3>Assessment Date</h3><p>{datetime.now().strftime('%B %d, %Y at %I:%M %p')}</p></div>
-                            </div>
-                        </div>
-        
-                        <div class="section">
-                            <h2>Wound Assessment</h2>
-                            <div class="grid2">
-                                <div class="card"><h3>Location</h3><p>{html.escape(str(patient_data.get('wound_location','N/A')))}</p></div>
-                                <div class="card"><h3>Duration</h3><p>{html.escape(str(patient_data.get('wound_duration','N/A')))}</p></div>
-                                <div class="card"><h3>Pain Level</h3><p>{html.escape(str(patient_data.get('pain_level','N/A')))} / 10</p></div>
-                                <div class="card"><h3>Risk Assessment</h3>
-                                    <p><span class="risk-indicator risk-{html.escape(risk_class)}">{html.escape(str(risk_level))} Risk</span></p>
-                                </div>
-                            </div>
-                        </div>
-        
-                        {image_section}
-        
-                        <div class="section">
-                            <h2>AI Analysis Summary</h2>
-                            <p>{html.escape(str(summary))}</p>
-                            <div class="recommendations">
-                                <h3>🎯 Clinical Recommendations</h3>
-                                {recs}
-                            </div>
-                        </div>
-        
-                        <div class="section">
-                            <h2>Medical History</h2>
-                            <div class="grid2">
-                                <div class="card"><h3>Medical History</h3><p>{html.escape(str(patient_data.get('medical_history','None reported')))}</p></div>
-                                <div class="card"><h3>Current Medications</h3><p>{html.escape(str(patient_data.get('medications','None reported')))}</p></div>
-                                <div class="card"><h3>Known Allergies</h3><p>{html.escape(str(patient_data.get('allergies','None reported')))}</p></div>
-                                <div class="card"><h3>Additional Notes</h3><p>{html.escape(str(patient_data.get('additional_notes','None')))}</p></div>
-                            </div>
-                        </div>
-                    </div>
-        
-                    <div class="footer">
-                        <p><strong>SmartHeal AI</strong> — Advanced Wound Care Analysis & Clinical Support System</p>
-                        <p>Generated on {datetime.now().strftime('%B %d, %Y at %I:%M %p')} | For professional medical use only</p>
-                        <p>⚠️ This AI analysis is for clinical support only. Always consult qualified professionals.</p>
-                    </div>
-                </div>
-            </body>
-            </html>
-            """
-        
-        
-                      
+        else:
+            image_section = ""
+
+        # Note: this is an f-string. All literal braces are doubled.
+        return f"""
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>SmartHeal AI - Wound Analysis Report</title>
+<style>
+body {{
+  font-family:'Segoe UI',Tahoma,Geneva,Verdana,sans-serif; line-height:1.6; margin:0; padding:20px; background-color:#f8f9fa;
+}}
+.report-container {{
+  max-width:920px; margin:0 auto; background:#fff; border-radius:10px; box-shadow:0 4px 20px rgba(0,0,0,0.1); overflow:hidden;
+}}
+.header {{
+  background:linear-gradient(135deg,#3182ce 0%,#2c5aa0 100%); color:#fff; padding:30px; text-align:center;
+}}
+.header h1 {{ margin:0; font-size:28px; font-weight:600; }}
+.header p {{ margin:10px 0 0 0; opacity:.9; font-size:16px; }}
+.content {{ padding:30px; }}
+.section {{ margin-bottom:30px; border-left:4px solid #3182ce; padding-left:20px; }}
+.section h2 {{ color:#2c5aa0; margin-top:0; font-size:20px; font-weight:600; }}
+.grid2 {{ display:grid; grid-template-columns:1fr 1fr; gap:20px; }}
+.card {{ background:#f8f9fa; padding:15px; border-radius:8px; border:1px solid #e9ecef; }}
+.card h3 {{ margin:0 0 10px 0; color:#495057; font-size:13px; font-weight:700; text-transform:uppercase; }}
+.card p {{ margin:0; font-weight:500; color:#212529; }}
+.risk-indicator {{ display:inline-block; padding:8px 16px; border-radius:20px; font-weight:600; text-transform:uppercase; font-size:12px; letter-spacing:.5px; }}
+.risk-low {{ background:#d4edda; color:#155724; }}
+.risk-moderate {{ background:#fff3cd; color:#856404; }}
+.risk-high {{ background:#f8d7da; color:#721c24; }}
+.recommendations {{ background:#e7f3ff; border:1px solid #b3d9ff; border-radius:8px; padding:20px; margin-top:15px; }}
+.image-wrap {{ text-align:center; margin:20px 0; }}
+.wound-image {{ max-width:100%; height:auto; border-radius:8px; box-shadow:0 4px 12px rgba(0,0,0,.15); }}
+.footer {{ background:#f8f9fa; padding:20px 30px; text-align:center; color:#6c757d; border-top:1px solid #e9ecef; }}
+@media print {{ body {{ background:white; }} .report-container {{ box-shadow:none; }} }}
+</style>
+</head>
+<body>
+  <div class="report-container">
+    <div class="header">
+      <h1>🩺 SmartHeal AI Wound Analysis Report</h1>
+      <p>Advanced AI-Powered Clinical Assessment</p>
+    </div>
+
+    <div class="content">
+      <div class="section">
+        <h2>Patient Information</h2>
+        <div class="grid2">
+          <div class="card"><h3>Patient Name</h3><p>{html.escape(str(patient_data.get('patient_name','N/A')))}</p></div>
+          <div class="card"><h3>Age</h3><p>{html.escape(str(patient_data.get('patient_age','N/A')))} years</p></div>
+          <div class="card"><h3>Gender</h3><p>{html.escape(str(patient_data.get('patient_gender','N/A')))}</p></div>
+          <div class="card"><h3>Assessment Date</h3><p>{datetime.now().strftime('%B %d, %Y at %I:%M %p')}</p></div>
+        </div>
+      </div>
+
+      <div class="section">
+        <h2>Wound Assessment</h2>
+        <div class="grid2">
+          <div class="card"><h3>Location</h3><p>{html.escape(str(patient_data.get('wound_location','N/A')))}</p></div>
+          <div class="card"><h3>Duration</h3><p>{html.escape(str(patient_data.get('wound_duration','N/A')))}</p></div>
+          <div class="card"><h3>Pain Level</h3><p>{html.escape(str(patient_data.get('pain_level','N/A')))} / 10</p></div>
+          <div class="card"><h3>Risk Assessment</h3>
+            <p><span class="risk-indicator risk-{html.escape(risk_class)}">{html.escape(str(risk_level))} Risk</span></p>
+          </div>
+        </div>
+      </div>
+
+      {image_section}
+
+      <div class="section">
+        <h2>AI Analysis Summary</h2>
+        <p>{html.escape(str(summary))}</p>
+        <div class="recommendations">
+          <h3>🎯 Clinical Recommendations</h3>
+          {recs}
+        </div>
+      </div>
+
+      <div class="section">
+        <h2>Medical History</h2>
+        <div class="grid2">
+          <div class="card"><h3>Medical History</h3><p>{html.escape(str(patient_data.get('medical_history','None reported')))}</p></div>
+          <div class="card"><h3>Current Medications</h3><p>{html.escape(str(patient_data.get('medications','None reported')))}</p></div>
+          <div class="card"><h3>Known Allergies</h3><p>{html.escape(str(patient_data.get('allergies','None reported')))}</p></div>
+          <div class="card"><h3>Additional Notes</h3><p>{html.escape(str(patient_data.get('additional_notes','None')))}</p></div>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer">
+      <p><strong>SmartHeal AI</strong> — Advanced Wound Care Analysis & Clinical Support System</p>
+      <p>Generated on {datetime.now().strftime('%B %d, %Y at %I:%M %p')} | For professional medical use only</p>
+      <p>⚠️ This AI analysis is for clinical support only. Always consult qualified professionals.</p>
+    </div>
+  </div>
+</body>
+</html>
+"""
+
     def generate_patient_history_report(self, patient_history: List[Dict]) -> str:
         """
         Large, printable HTML summarizing multiple visits for a patient.
+        (Fixed: no nested f-strings)
         """
         if not patient_history:
             return "<p>No patient history available.</p>"
 
         pname = html.escape(str(patient_history[0].get('patient_name', 'Unknown Patient')))
-        rows_html = []
+        rows_html: List[str] = []
 
-        # Render each visit
         for i, visit in enumerate(patient_history):
             dt = visit.get('visit_date')
-            try:
-                if hasattr(dt, "strftime"):
-                    dt_str = dt.strftime('%B %d, %Y')
-                else:
-                    dt_str = str(dt)
-            except Exception:
+            if hasattr(dt, "strftime"):
+                dt_str = dt.strftime('%B %d, %Y')
+            else:
                 dt_str = str(dt)
 
             wound_loc = html.escape(str(visit.get('wound_location', 'N/A')))
@@ -494,29 +606,40 @@ class ReportGenerator:
             risk = html.escape(str(visit.get('risk_level', 'Unknown')))
             summary = visit.get('summary')
 
-            rows_html.append(f"""
-            <div style="padding:20px;border-bottom:1px solid #f0f0f0;">
-                <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;">
-                    <h3 style="margin:0;color:#2c5aa0;">Visit #{len(patient_history)-i}</h3>
-                    <span style="color:#6c757d;font-size:14px;">{dt_str}</span>
-                </div>
-                <div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:12px;margin:10px 0;">
-                    <div style="background:#f8f9fa;padding:10px;border-radius:6px;"><strong>Location:</strong> {wound_loc}</div>
-                    <div style="background:#f8f9fa;padding:10px;border-radius:6px;"><strong>Pain:</strong> {pain}/10</div>
-                    <div style="background:#f8f9fa;padding:10px;border-radius:6px;"><strong>Risk:</strong> {risk}</div>
-                </div>
-                {f"<p style='margin:0.5rem 0 0 0'><strong>Summary:</strong> {html.escape(str(summary))}</p>" if summary else ""}
-            </div>
-            """)
+            # Build optional summary block separately to avoid nested f-string
+            if summary:
+                summary_block = (
+                    "<p style='margin:0.5rem 0 0 0'><strong>Summary:</strong> "
+                    f"{html.escape(str(summary))}"
+                    "</p>"
+                )
+            else:
+                summary_block = ""
+
+            rows_html.append(
+                "<div style='padding:20px;border-bottom:1px solid #f0f0f0;'>"
+                "<div style='display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;'>"
+                f"<h3 style='margin:0;color:#2c5aa0;'>Visit #{len(patient_history)-i}</h3>"
+                f"<span style='color:#6c757d;font-size:14px;'>{html.escape(dt_str)}</span>"
+                "</div>"
+                "<div style='display:grid;grid-template-columns:1fr 1fr 1fr;gap:12px;margin:10px 0;'>"
+                f"<div style='background:#f8f9fa;padding:10px;border-radius:6px;'><strong>Location:</strong> {wound_loc}</div>"
+                f"<div style='background:#f8f9fa;padding:10px;border-radius:6px;'><strong>Pain:</strong> {pain}/10</div>"
+                f"<div style='background:#f8f9fa;padding:10px;border-radius:6px;'><strong>Risk:</strong> {risk}</div>"
+                "</div>"
+                f"{summary_block}"
+                "</div>"
+            )
 
-        return f"""
-        <div style="max-width:920px;margin:0 auto;font-family:'Segoe UI', sans-serif;">
-            <div style="background:linear-gradient(135deg,#3182ce 0%,#2c5aa0 100%);color:white;padding:20px;border-radius:10px 10px 0 0;">
-                <h2 style="margin:0;">📋 Patient History: {pname}</h2>
-                <p style="margin:8px 0 0 0;opacity:0.9;">Complete Treatment Timeline</p>
-            </div>
-            <div style="background:white;border:1px solid #e9ecef;border-top:none;border-radius:0 0 10px 10px;">
-                {''.join(rows_html)}
-            </div>
-        </div>
-        """
+        return (
+            "<div style=\"max-width:920px;margin:0 auto;font-family:'Segoe UI', sans-serif;\">"
+            "<div style=\"background:linear-gradient(135deg,#3182ce 0%,#2c5aa0 100%);color:white;"
+            "padding:20px;border-radius:10px 10px 0 0;\">"
+            f"<h2 style=\"margin:0;\">📋 Patient History: {pname}</h2>"
+            "<p style=\"margin:8px 0 0 0;opacity:0.9;\">Complete Treatment Timeline</p>"
+            "</div>"
+            "<div style=\"background:white;border:1px solid #e9ecef;border-top:none;border-radius:0 0 10px 10px;\">"
+            + "".join(rows_html) +
+            "</div>"
+            "</div>"
+        )