Update api/routes.py

api/routes.py

@@ -579,75 +579,103 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
         try:
             obj_id = ObjectId(patient_id)
             query = {"$or": [{"_id": obj_id}, {"fhir_id": patient_id}]}
-        except Exception:
+        except InvalidId:
             query = {"fhir_id": patient_id}
 
         patient = await patients_collection.find_one(query)
-
         if not patient:
             raise HTTPException(status_code=404, detail="Patient not found")
 
-        # Create temporary directory
+        # Prepare LaTeX template
+        latex_template = Template(r"""
+\documentclass[a4paper,12pt]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{geometry}
+\geometry{margin=1in}
+\usepackage{booktabs,longtable,fancyhdr}
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[L]{Patient Report}
+\fancyhead[R]{Generated: \today}
+\fancyfoot[C]{\thepage}
+
+\begin{document}
+
+\begin{center}
+    \Large\textbf{Patient Medical Report} \\
+    \vspace{0.2cm}
+    \textit{Generated on $date}
+\end{center}
+
+\section*{Demographics}
+\begin{itemize}
+    \item \textbf{FHIR ID:} $fhir_id
+    \item \textbf{Full Name:} $full_name
+    \item \textbf{Gender:} $gender
+    \item \textbf{Date of Birth:} $dob
+    \item \textbf{Age:} $age
+    \item \textbf{Address:} $address
+    \item \textbf{Marital Status:} $marital_status
+    \item \textbf{Language:} $language
+\end{itemize}
+
+\section*{Clinical Notes}
+\begin{longtable}{p{3cm}p{3cm}p{7cm}}
+\toprule
+\textbf{Date} & \textbf{Type} & \textbf{Text} \\
+\midrule
+\endhead
+$notes
+\bottomrule
+\end{longtable}
+
+\end{document}
+""")
+
+        # Format notes
+        notes_rows = " \\\\\n".join(
+            f"{n.get('date', '')} & {n.get('type', '')} & {n.get('text', '').replace('&', '\\&')}"
+            for n in patient.get("notes", [])
+        )
+
+        # Fill in template
+        latex = latex_template.substitute(
+            date=datetime.now().strftime('%A, %B %d, %Y at %I:%M %p'),
+            fhir_id=patient.get("fhir_id", ""),
+            full_name=patient.get("full_name", ""),
+            gender=patient.get("gender", ""),
+            dob=patient.get("date_of_birth", ""),
+            age=calculate_age(patient.get("date_of_birth", "")),
+            address=", ".join(filter(None, [
+                patient.get("address", ""),
+                patient.get("city", ""),
+                patient.get("state", ""),
+                patient.get("postal_code", ""),
+                patient.get("country", "")
+            ])),
+            marital_status=patient.get("marital_status", ""),
+            language=patient.get("language", ""),
+            notes=notes_rows
+        )
+
+        # Save and compile PDF
         with tempfile.TemporaryDirectory() as tmpdir:
-            tex_path = os.path.join(tmpdir, "patient.tex")
-            pdf_path = os.path.join(tmpdir, "patient.pdf")
-
-            latex = f"""
-\\documentclass[a4paper,12pt]{{article}}
-\\usepackage[utf8]{{inputenc}}
-\\usepackage[T1]{{fontenc}}
-\\usepackage{{geometry}}
-\\geometry{{margin=1in}}
-\\usepackage{{booktabs,longtable,fancyhdr}}
-\\pagestyle{{fancy}}
-\\fancyhf{{}}
-\\fancyhead[L]{{Patient Report}}
-\\fancyhead[R]{{Generated: \\today}}
-\\fancyfoot[C]{{\\thepage}}
-
-\\begin{{document}}
-
-\\begin{{center}}
-    \\Large\\textbf{{Patient Medical Report}} \\\\
-    \\vspace{{0.2cm}}
-    \\textit{{Generated on {datetime.now().strftime('%A, %B %d, %Y at %I:%M %p')}}}
-\\end{{center}}
-
-\\section*{{Demographics}}
-\\begin{{itemize}}
-    \\item \\textbf{{FHIR ID:}} {patient.get("fhir_id", "")}
-    \\item \\textbf{{Full Name:}} {patient.get("full_name", "")}
-    \\item \\textbf{{Gender:}} {patient.get("gender", "")}
-    \\item \\textbf{{Date of Birth:}} {patient.get("date_of_birth", "")}
-    \\item \\textbf{{Age:}} {calculate_age(patient.get("date_of_birth", ""))}
-    \\item \\textbf{{Address:}} {patient.get("address", "")}, {patient.get("city", "")}, {patient.get("state", "")}, {patient.get("postal_code", "")}, {patient.get("country", "")}
-    \\item \\textbf{{Marital Status:}} {patient.get("marital_status", "")}
-    \\item \\textbf{{Language:}} {patient.get("language", "")}
-\\end{{itemize}}
-
-\\section*{{Clinical Notes}}
-\\begin{{longtable}}{{p{{3cm}}p{{3cm}}p{{7cm}}}}
-\\toprule
-\\textbf{{Date}} & \\textbf{{Type}} & \\textbf{{Text}} \\\\
-\\midrule
-\\endhead
-{" \\\\ \n".join([f"{n.get('date', '')} & {n.get('type', '')} & {n.get('text', '')}" for n in patient.get("notes", [])])}
-\\bottomrule
-\\end{{longtable}}
-
-\\end{{document}}
-            """
-
-            with open(tex_path, "w") as f:
+            tex_path = os.path.join(tmpdir, "report.tex")
+            pdf_path = os.path.join(tmpdir, "report.pdf")
+
+            with open(tex_path, "w", encoding="utf-8") as f:
                 f.write(latex)
 
             try:
-                subprocess.run(["latexmk", "-pdf", tex_path], check=True, cwd=tmpdir)
+                subprocess.run(["latexmk", "-pdf", "-interaction=nonstopmode", tex_path],
+                               check=True, cwd=tmpdir)
+
                 with open(pdf_path, "rb") as f:
                     pdf_bytes = f.read()
 
                 response = Response(content=pdf_bytes, media_type="application/pdf")
-                response.headers["Content-Disposition"] = f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_record.pdf"
+                response.headers["Content-Disposition"] = f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_report.pdf"
                 return response
 
             except subprocess.CalledProcessError as e:
@@ -655,9 +683,8 @@ async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get
                 raise HTTPException(status_code=500, detail="LaTeX compilation failed")
 
     except Exception as e:
-        logger.error(f"PDF generation error: {e}")
+        logger.exception("Unexpected error generating PDF")
         raise HTTPException(status_code=500, detail="Failed to generate PDF")
-
 @router.post("/signup", status_code=status.HTTP_201_CREATED)
 async def signup(data: SignupForm):
     logger.info(f"Signup attempt for email: {data.email}")