Update api/routes.py

api/routes.py

@@ -608,23 +608,25 @@ 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
+        # Prepare table content
         notes = patient.get("notes", [])
+        notes_content = ""
         if notes:
-            note_rows = " \\\\\n".join(
+            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:
-            note_rows = "\\multicolumn{3}{l}{No notes available}"
+            notes_content = "\\multicolumn{3}{l}{No notes available}"
 
         conditions = patient.get("conditions", [])
+        conditions_content = ""
         if conditions:
-            condition_rows = " \\\\\n".join(
+            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 "")),
@@ -633,13 +635,14 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
                     escape_latex_special_chars(hyphenate_long_strings(c.get("verification_status", "") or ""))
                 )
                 for c in conditions
-            )
+            ) + "\n\\bottomrule"
         else:
-            condition_rows = "\\multicolumn{5}{l}{No conditions available}"
+            conditions_content = "\\multicolumn{5}{l}{No conditions available}"
 
         medications = patient.get("medications", [])
+        medications_content = ""
         if medications:
-            medication_rows = " \\\\\n".join(
+            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 "")),
@@ -648,13 +651,14 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
                     escape_latex_special_chars(hyphenate_long_strings(m.get("dosage", "") or ""))
                 )
                 for m in medications
-            )
+            ) + "\n\\bottomrule"
         else:
-            medication_rows = "\\multicolumn{5}{l}{No medications available}"
+            medications_content = "\\multicolumn{5}{l}{No medications available}"
 
         encounters = patient.get("encounters", [])
+        encounters_content = ""
         if encounters:
-            encounter_rows = " \\\\\n".join(
+            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 "")),
@@ -663,9 +667,9 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
                     escape_latex_special_chars(hyphenate_long_strings(e.get("service_provider", "") or ""))
                 )
                 for e in encounters
-            )
+            ) + "\n\\bottomrule"
         else:
-            encounter_rows = "\\multicolumn{5}{l}{No encounters available}"
+            encounters_content = "\\multicolumn{5}{l}{No encounters available}"
 
         # Use Template for safe insertion
         latex_template = Template(r"""
@@ -707,49 +711,37 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
 
 \section*{Clinical Notes}
 \begin{longtable}{>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}>{\raggedright\arraybackslash}p{6.5cm}}
-\toprule
 \textbf{Date} & \textbf{Type} & \textbf{Text} \\
-\midrule
 \endhead
 $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}}
-\toprule
 \textbf{ID} & \textbf{Code} & \textbf{Status} & \textbf{Onset} & \textbf{Verification} \\
-\midrule
 \endhead
 $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{2cm}}
-\toprule
+\begin{longtable}{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{3.5cm}>{\raggedright\arraybackslash}p{3cm}}
 \textbf{ID} & \textbf{Name} & \textbf{Status} & \textbf{Date} & \textbf{Dosage} \\
-\midrule
 \endhead
 $medications
-\bottomrule
 \end{longtable}
 
 \section*{Encounters}
-\begin{longtable}{>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4cm}>{\raggedright\arraybackslash}p{2cm}>{\raggedright\arraybackslash}p{4.5cm}>{\raggedright\arraybackslash}p{3cm}}
-\toprule
+\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}}
 \textbf{ID} & \textbf{Type} & \textbf{Status} & \textbf{Start} & \textbf{Provider} \\
-\midrule
 \endhead
 $encounters
-\bottomrule
 \end{longtable}
 
 \end{document}
 """)
 
-        # 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")
+        # Set the generated_on date to 05:26 PM CET, May 16, 2025
+        generated_on = datetime.strptime("2025-05-16 17:26: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,
@@ -767,10 +759,10 @@ $encounters
             ]))),
             marital_status=escape_latex_special_chars(patient.get("marital_status", "") or ""),
             language=escape_latex_special_chars(patient.get("language", "") or ""),
-            notes=note_rows,
-            conditions=condition_rows,
-            medications=medication_rows,
-            encounters=encounter_rows
+            notes=notes_content,
+            conditions=conditions_content,
+            medications=medications_content,
+            encounters=encounters_content
         )
 
         # Compile LaTeX in a temporary directory