Update api/routes.py

api/routes.py

@@ -608,48 +608,64 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
         if not patient:
             raise HTTPException(status_code=404, detail="Patient not found")
 
-        # Format rows safely, ensuring proper column counts and hyphenation
-        note_rows = " \\\\\n".join(
-            "{} & {} & {}".format(
-                escape_latex_special_chars(hyphenate_long_strings(format_timestamp(n.get("date", "") or ""))),
-                escape_latex_special_chars(hyphenate_long_strings(n.get("type", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(n.get("text", "") or ""))
+        # Format rows safely, ensuring proper column counts
+        notes = patient.get("notes", [])
+        if notes:
+            note_rows = " \\\\\n".join(
+                "{} & {} & {}".format(
+                    escape_latex_special_chars(hyphenate_long_strings(format_timestamp(n.get("date", "") or ""))),
+                    escape_latex_special_chars(hyphenate_long_strings(n.get("type", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(n.get("text", "") or ""))
+                )
+                for n in notes
             )
-            for n in patient.get("notes", [])
-        ) or "\\multicolumn{3}{l}{No notes available}\n\\hline"
-
-        condition_rows = " \\\\\n".join(
-            "{} & {} & {} & {} & {}".format(
-                escape_latex_special_chars(hyphenate_long_strings(c.get("id", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(c.get("code", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(c.get("status", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(format_timestamp(c.get("onset_date", "") or ""))),
-                escape_latex_special_chars(hyphenate_long_strings(c.get("verification_status", "") or ""))
+        else:
+            note_rows = "\\multicolumn{3}{l}{No notes available}"
+
+        conditions = patient.get("conditions", [])
+        if conditions:
+            condition_rows = " \\\\\n".join(
+                "{} & {} & {} & {} & {}".format(
+                    escape_latex_special_chars(hyphenate_long_strings(c.get("id", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(c.get("code", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(c.get("status", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(format_timestamp(c.get("onset_date", "") or ""))),
+                    escape_latex_special_chars(hyphenate_long_strings(c.get("verification_status", "") or ""))
+                )
+                for c in conditions
             )
-            for c in patient.get("conditions", [])
-        ) or "\\multicolumn{5}{l}{No conditions available}\n\\hline"
-
-        medication_rows = " \\\\\n".join(
-            "{} & {} & {} & {} & {}".format(
-                escape_latex_special_chars(hyphenate_long_strings(m.get("id", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(m.get("name", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(m.get("status", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(format_timestamp(m.get("prescribed_date", "") or ""))),
-                escape_latex_special_chars(hyphenate_long_strings(m.get("dosage", "") or ""))
+        else:
+            condition_rows = "\\multicolumn{5}{l}{No conditions available}"
+
+        medications = patient.get("medications", [])
+        if medications:
+            medication_rows = " \\\\\n".join(
+                "{} & {} & {} & {} & {}".format(
+                    escape_latex_special_chars(hyphenate_long_strings(m.get("id", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(m.get("name", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(m.get("status", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(format_timestamp(m.get("prescribed_date", "") or ""))),
+                    escape_latex_special_chars(hyphenate_long_strings(m.get("dosage", "") or ""))
+                )
+                for m in medications
             )
-            for m in patient.get("medications", [])
-        ) or "\\multicolumn{5}{l}{No medications available}\n\\hline"
-
-        encounter_rows = " \\\\\n".join(
-            "{} & {} & {} & {} & {}".format(
-                escape_latex_special_chars(hyphenate_long_strings(e.get("id", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(e.get("type", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(e.get("status", "") or "")),
-                escape_latex_special_chars(hyphenate_long_strings(format_timestamp(e.get("period", {}).get("start", "") or ""))),
-                escape_latex_special_chars(hyphenate_long_strings(e.get("service_provider", "") or ""))
+        else:
+            medication_rows = "\\multicolumn{5}{l}{No medications available}"
+
+        encounters = patient.get("encounters", [])
+        if encounters:
+            encounter_rows = " \\\\\n".join(
+                "{} & {} & {} & {} & {}".format(
+                    escape_latex_special_chars(hyphenate_long_strings(e.get("id", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(e.get("type", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(e.get("status", "") or "")),
+                    escape_latex_special_chars(hyphenate_long_strings(format_timestamp(e.get("period", {}).get("start", "") or ""))),
+                    escape_latex_special_chars(hyphenate_long_strings(e.get("service_provider", "") or ""))
+                )
+                for e in encounters
             )
-            for e in patient.get("encounters", [])
-        ) or "\\multicolumn{5}{l}{No encounters available}\n\\hline"
+        else:
+            encounter_rows = "\\multicolumn{5}{l}{No encounters available}"
 
         # Use Template for safe insertion
         latex_template = Template(r"""
@@ -660,7 +676,8 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 \geometry{margin=1in}
 \usepackage{booktabs,longtable,fancyhdr}
 \usepackage{array}
-\usepackage{microtype}  % Added for better text wrapping and hyphenation
+\usepackage{microtype}
+\microtypesetup{expansion=false}  % Disable font expansion to avoid errors
 \setlength{\headheight}{14.5pt}  % Fix fancyhdr warning
 \pagestyle{fancy}
 \fancyhf{}
@@ -731,8 +748,8 @@ $encounters
 \end{document}
 """)
 
-        # Set the generated_on date to 05:08 PM CET, May 16, 2025
-        generated_on = datetime.strptime("2025-05-16 17:08:00+01:00", "%Y-%m-%d %H:%M:%S%z").strftime("%A, %B %d, %Y at %I:%M %p")
+        # Set the generated_on date to 05:14 PM CET, May 16, 2025
+        generated_on = datetime.strptime("2025-05-16 17:14:00+01:00", "%Y-%m-%d %H:%M:%S%z").strftime("%A, %B %d, %Y at %I:%M %p")
 
         latex_filled = latex_template.substitute(
             generated_on=generated_on,