Update api/routes/pdf.py

api/routes/pdf.py

@@ -40,70 +40,75 @@ 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")
 
-        # Prepare table content
+        # Prepare table content with proper LaTeX formatting
+        def prepare_table_content(items, columns, default_message):
+            if not items:
+                return f"\\multicolumn{{{columns}}}{{l}}{{{default_message}}} \\\\"
+            
+            content = []
+            for item in items:
+                row = []
+                for field in item:
+                    value = item.get(field, "") or ""
+                    row.append(escape_latex_special_chars(hyphenate_long_strings(value)))
+                content.append(" & ".join(row) + " \\\\")
+            return "\n".join(content)
+
+        # Notes table
         notes = patient.get("notes", [])
-        notes_content = ""
-        if notes:
-            notes_content = "\\toprule\n" + " \\\\\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
-            ) + "\n\\bottomrule"
-        else:
-            notes_content = "\\multicolumn{3}{l}{No notes available}"
+        notes_content = prepare_table_content(
+            [{
+                "date": format_timestamp(n.get("date", "")),
+                "type": n.get("type", ""),
+                "text": n.get("text", "")
+            } for n in notes],
+            3,
+            "No notes available"
+        )
 
+        # Conditions table
         conditions = patient.get("conditions", [])
-        conditions_content = ""
-        if conditions:
-            conditions_content = "\\toprule\n" + " \\\\\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
-            ) + "\n\\bottomrule"
-        else:
-            conditions_content = "\\multicolumn{5}{l}{No conditions available}"
+        conditions_content = prepare_table_content(
+            [{
+                "id": c.get("id", ""),
+                "code": c.get("code", ""),
+                "status": c.get("status", ""),
+                "onset": format_timestamp(c.get("onset_date", "")),
+                "verification": c.get("verification_status", "")
+            } for c in conditions],
+            5,
+            "No conditions available"
+        )
 
+        # Medications table
         medications = patient.get("medications", [])
-        medications_content = ""
-        if medications:
-            medications_content = "\\toprule\n" + " \\\\\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
-            ) + "\n\\bottomrule"
-        else:
-            medications_content = "\\multicolumn{5}{l}{No medications available}"
+        medications_content = prepare_table_content(
+            [{
+                "id": m.get("id", ""),
+                "name": m.get("name", ""),
+                "status": m.get("status", ""),
+                "date": format_timestamp(m.get("prescribed_date", "")),
+                "dosage": m.get("dosage", "")
+            } for m in medications],
+            5,
+            "No medications available"
+        )
 
+        # Encounters table
         encounters = patient.get("encounters", [])
-        encounters_content = ""
-        if encounters:
-            encounters_content = "\\toprule\n" + " \\\\\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
-            ) + "\n\\bottomrule"
-        else:
-            encounters_content = "\\multicolumn{5}{l}{No encounters available}"
+        encounters_content = prepare_table_content(
+            [{
+                "id": e.get("id", ""),
+                "type": e.get("type", ""),
+                "status": e.get("status", ""),
+                "start": format_timestamp(e.get("period", {}).get("start", "")),
+                "provider": e.get("service_provider", "")
+            } for e in encounters],
+            5,
+            "No encounters available"
+        )
 
-        # Use Template for safe insertion
+        # LaTeX template with improved table formatting
         latex_template = Template(r"""
 \documentclass[a4paper,12pt]{article}
 \usepackage[utf8]{inputenc}
@@ -113,8 +118,8 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 \usepackage{booktabs,longtable,fancyhdr}
 \usepackage{array}
 \usepackage{microtype}
-\microtypesetup{expansion=false}  % Disable font expansion to avoid errors
-\setlength{\headheight}{14.5pt}  % Fix fancyhdr warning
+\microtypesetup{expansion=false}
+\setlength{\headheight}{14.5pt}
 \pagestyle{fancy}
 \fancyhf{}
 \fancyhead[L]{Patient Report}
@@ -142,31 +147,43 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 \end{itemize}
 
 \section*{Clinical Notes}
-\begin{longtable}{>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{6.5cm}}
+\begin{longtable}[l]{>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{6.5cm}}
+\caption{Clinical Notes} \\
+\toprule
 \textbf{Date} & \textbf{Type} & \textbf{Text} \\
-\endhead
+\midrule
 $notes
+\bottomrule
 \end{longtable}
 
 \section*{Conditions}
-\begin{longtable}{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
+\begin{longtable}[l]{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
+\caption{Conditions} \\
+\toprule
 \textbf{ID} & \textbf{Code} & \textbf{Status} & \textbf{Onset} & \textbf{Verification} \\
-\endhead
+\midrule
 $conditions
+\bottomrule
 \end{longtable}
 
 \section*{Medications}
-\begin{longtable}{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
+\begin{longtable}[l]{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
+\caption{Medications} \\
+\toprule
 \textbf{ID} & \textbf{Name} & \textbf{Status} & \textbf{Date} & \textbf{Dosage} \\
-\endhead
+\midrule
 $medications
+\bottomrule
 \end{longtable}
 
 \section*{Encounters}
-\begin{longtable}{>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{3.5cm}}
+\begin{longtable}[l]{>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{2.5cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{3.5cm}}
+\caption{Encounters} \\
+\toprule
 \textbf{ID} & \textbf{Type} & \textbf{Status} & \textbf{Start} & \textbf{Provider} \\
-\endhead
+\midrule
 $encounters
+\bottomrule
 \end{longtable}
 
 \end{document}
@@ -206,13 +223,22 @@ $encounters
                 f.write(latex_filled)
 
             try:
-                subprocess.run(
-                    ["latexmk", "-pdf", "-interaction=nonstopmode", tex_path],
-                    cwd=tmpdir,
-                    check=True,
-                    capture_output=True,
-                    text=True
-                )
+                # Run latexmk twice to ensure proper table rendering
+                for _ in range(2):
+                    result = subprocess.run(
+                        ["latexmk", "-pdf", "-interaction=nonstopmode", tex_path],
+                        cwd=tmpdir,
+                        check=False,
+                        capture_output=True,
+                        text=True
+                    )
+                
+                if result.returncode != 0:
+                    raise HTTPException(
+                        status_code=500,
+                        detail=f"LaTeX compilation failed: stdout={result.stdout}, stderr={result.stderr}"
+                    )
+
             except subprocess.CalledProcessError as e:
                 raise HTTPException(
                     status_code=500,