Update api/routes.py

api/routes.py

@@ -548,207 +548,130 @@ async def add_note(
 @router.get("/ehr/patients/{patient_id}/pdf", response_class=Response)
 async def generate_patient_pdf(patient_id: str, current_user: dict = Depends(get_current_user)):
     logger.info(f"Generating PDF for patient: {patient_id} by user {current_user.get('email')}")
+
     if current_user.get('role') not in ['doctor', 'admin']:
         logger.warning(f"Unauthorized PDF generation attempt by {current_user.get('email')}")
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Only clinicians can generate patient PDFs"
-        )
-    
+        raise HTTPException(status_code=403, detail="Only clinicians can generate patient PDFs")
+
     try:
-        patient = await patients_collection.find_one({
-            "$or": [
-                {"_id": ObjectId(patient_id)},
-                {"fhir_id": patient_id}
-            ]
-        })
-        
+        # Determine if input is ObjectId or fallback to fhir_id
+        try:
+            obj_id = ObjectId(patient_id)
+            query = { "$or": [ { "_id": obj_id }, { "fhir_id": patient_id } ] }
+        except InvalidId:
+            query = { "fhir_id": patient_id }
+
+        patient = await patients_collection.find_one(query)
+
         if not patient:
             logger.warning(f"Patient not found: {patient_id}")
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail="Patient not found"
-            )
+            raise HTTPException(status_code=404, detail="Patient not found")
+
+        # Generate LaTeX content
+        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}}
+
+\\section*{{Conditions}}
+\\begin{{longtable}}{{p{{2cm}}p{{3cm}}p{{2cm}}p{{2cm}}p{{3cm}}}}
+\\toprule
+\\textbf{{ID}} & \\textbf{{Code}} & \\textbf{{Status}} & \\textbf{{Onset}} & \\textbf{{Verification}} \\\\
+\\midrule
+\\endhead
+{" \\\\ \n".join([f"{c.get('id','')} & {c.get('code','')} & {c.get('status','')} & {c.get('onset_date','')} & {c.get('verification_status','')}" for c in patient.get("conditions", [])])}
+\\bottomrule
+\\end{{longtable}}
+
+\\section*{{Medications}}
+\\begin{{longtable}}{{p{{2cm}}p{{4cm}}p{{2cm}}p{{2cm}}p{{2cm}}}}
+\\toprule
+\\textbf{{ID}} & \\textbf{{Name}} & \\textbf{{Status}} & \\textbf{{Date}} & \\textbf{{Dosage}} \\\\
+\\midrule
+\\endhead
+{" \\\\ \n".join([f"{m.get('id','')} & {m.get('name','')} & {m.get('status','')} & {m.get('prescribed_date','')} & {m.get('dosage','')}" for m in patient.get("medications", [])])}
+\\bottomrule
+\\end{{longtable}}
+
+\\section*{{Encounters}}
+\\begin{{longtable}}{{p{{2cm}}p{{4cm}}p{{2cm}}p{{3cm}}p{{3cm}}}}
+\\toprule
+\\textbf{{ID}} & \\textbf{{Type}} & \\textbf{{Status}} & \\textbf{{Start}} & \\textbf{{Provider}} \\\\
+\\midrule
+\\endhead
+{" \\\\ \n".join([f"{e.get('id','')} & {e.get('type','')} & {e.get('status','')} & {e.get('period',{}).get('start','')} & {e.get('service_provider','')}" for e in patient.get("encounters", [])])}
+\\bottomrule
+\\end{{longtable}}
+
+\\end{{document}}
+        """
+
+        # Save and compile to PDF
+        with NamedTemporaryFile(suffix=".tex", mode="w", delete=False) as tex_file:
+            tex_file.write(latex)
+            tex_path = tex_file.name
 
-        # Prepare LaTeX content
-        latex_content = r"""
-\documentclass[a4paper,12pt]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{geometry}
-\geometry{margin=1in}
-\usepackage{booktabs}
-\usepackage{longtable}
-\usepackage{DejaVuSans} % English font
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-\fancyhf{}
-\fancyhead[L]{Patient Medical Record}
-\fancyhead[R]{Generated: \today}
-\fancyfoot[C]{\thepage}
-\renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\footrulewidth}{0.4pt}
-
-\begin{document}
-
-\begin{center}
-    \textbf{\Large Patient Medical Record Report} \\
-    \vspace{0.2cm}
-    \textit{Generated on Friday, May 16, 2025 at 12:42 PM CET}
-\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 Data}
-
-\subsection*{Notes}
-\begin{longtable}{p{2cm} p{3cm} p{8cm}}
-\toprule
-\textbf{Date} & \textbf{Type} & \textbf{Text} \\
-\midrule
-\endhead
-for note in patient.get("notes", []):
-    note.get("date") & note.get("type") & note.get("text") \\
-\midrule
-\bottomrule
-\end{longtable}
-
-\subsection*{Conditions}
-\begin{longtable}{p{2cm} p{3cm} p{2cm} p{2cm} p{2cm}}
-\toprule
-\textbf{ID} & \textbf{Code} & \textbf{Status} & \textbf{Onset Date} & \textbf{Verification Status} \\
-\midrule
-\endhead
-for condition in patient.get("conditions", []):
-    condition.get("id") & condition.get("code") & condition.get("status") & condition.get("onset_date") & condition.get("verification_status") \\
-\midrule
-\bottomrule
-\end{longtable}
-
-\subsection*{Medications}
-\begin{longtable}{p{2cm} p{4cm} p{2cm} p{2cm} p{2cm}}
-\toprule
-\textbf{ID} & \textbf{Name} & \textbf{Status} & \textbf{Prescribed Date} & \textbf{Dosage} \\
-\midrule
-\endhead
-for medication in patient.get("medications", []):
-    medication.get("id") & medication.get("name") & medication.get("status") & medication.get("prescribed_date") & medication.get("dosage") \\
-\midrule
-\bottomrule
-\end{longtable}
-
-\subsection*{Encounters}
-\begin{longtable}{p{2cm} p{4cm} p{2cm} p{2cm} p{3cm}}
-\toprule
-\textbf{ID} & \textbf{Type} & \textbf{Status} & \textbf{Start Date} & \textbf{Service Provider} \\
-\midrule
-\endhead
-for encounter in patient.get("encounters", []):
-    encounter.get("id") & encounter.get("type") & encounter.get("status") & encounter.get("period", {}).get("start") & encounter.get("service_provider") \\
-\midrule
-\bottomrule
-\end{longtable}
-
-\section*{Metadata}
-\begin{itemize}
-    \item \textbf{Source:} patient.get("source")
-    \item \textbf{Import Date:} patient.get("import_date")
-    \item \textbf{Last Updated:} patient.get("last_updated")
-\end{itemize}
-
-\end{document}
-        """.strip()
-
-        # Replace placeholders with actual patient data
-        latex_content = latex_content.replace("patient.get(\"fhir_id\")", str(patient.get("fhir_id", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"full_name\")", str(patient.get("full_name", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"gender\")", str(patient.get("gender", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"date_of_birth\")", str(patient.get("date_of_birth", "N/A")))
-        latex_content = latex_content.replace("calculate_age(patient.get(\"date_of_birth\"))", str(calculate_age(patient.get("date_of_birth")) or "N/A"))
-        latex_content = latex_content.replace("patient.get(\"address\")", str(patient.get("address", "")))
-        latex_content = latex_content.replace("patient.get(\"city\")", str(patient.get("city", "")))
-        latex_content = latex_content.replace("patient.get(\"state\")", str(patient.get("state", "")))
-        latex_content = latex_content.replace("patient.get(\"postal_code\")", str(patient.get("postal_code", "")))
-        latex_content = latex_content.replace("patient.get(\"country\")", str(patient.get("country", "")))
-        latex_content = latex_content.replace("patient.get(\"marital_status\")", str(patient.get("marital_status", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"language\")", str(patient.get("language", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"source\")", str(patient.get("source", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"import_date\")", str(patient.get("import_date", "N/A")))
-        latex_content = latex_content.replace("patient.get(\"last_updated\")", str(patient.get("last_updated", "N/A")))
-
-        # Handle lists (notes, conditions, medications, encounters)
-        notes_rows = "\n".join([f"{note.get('date', 'N/A')} & {note.get('type', 'N/A')} & {note.get('text', 'N/A')} \\\\" for note in patient.get("notes", [])])
-        conditions_rows = "\n".join([f"{cond.get('id', 'N/A')} & {cond.get('code', 'N/A')} & {cond.get('status', 'N/A')} & {cond.get('onset_date', 'N/A')} & {cond.get('verification_status', 'N/A')} \\\\" for cond in patient.get("conditions", [])])
-        medications_rows = "\n".join([f"{med.get('id', 'N/A')} & {med.get('name', 'N/A')} & {med.get('status', 'N/A')} & {med.get('prescribed_date', 'N/A')} & {med.get('dosage', 'N/A')} \\\\" for med in patient.get("medications", [])])
-        encounters_rows = "\n".join([f"{enc.get('id', 'N/A')} & {enc.get('type', 'N/A')} & {enc.get('status', 'N/A')} & {enc.get('period', {}).get('start', 'N/A')} & {enc.get('service_provider', 'N/A')} \\\\" for enc in patient.get("encounters", [])])
-
-        latex_content = latex_content.replace("for note in patient.get(\"notes\", []):\n    note.get(\"date\") & note.get(\"type\") & note.get(\"text\") \\\\", notes_rows)
-        latex_content = latex_content.replace("for condition in patient.get(\"conditions\", []):\n    condition.get(\"id\") & condition.get(\"code\") & condition.get(\"status\") & condition.get(\"onset_date\") & condition.get(\"verification_status\") \\\\", conditions_rows)
-        latex_content = latex_content.replace("for medication in patient.get(\"medications\", []):\n    medication.get(\"id\") & medication.get(\"name\") & medication.get(\"status\") & medication.get(\"prescribed_date\") & medication.get(\"dosage\") \\\\", medications_rows)
-        latex_content = latex_content.replace("for encounter in patient.get(\"encounters\", []):\n    encounter.get(\"id\") & encounter.get(\"type\") & encounter.get(\"status\") & encounter.get(\"period\", {}).get(\"start\") & encounter.get(\"service_provider\") \\\\", encounters_rows)
-
-        # Write LaTeX to a temporary file
-        with NamedTemporaryFile(mode='w', suffix='.tex', delete=False) as temp_file:
-            temp_file.write(latex_content)
-            temp_file_path = temp_file.name
-
-        # Compile LaTeX to PDF using latexmk
         try:
-            subprocess.run(['latexmk', '-pdf', temp_file_path], check=True, capture_output=True, text=True)
-            pdf_path = temp_file_path.replace('.tex', '.pdf')
-            
-            # Read the generated PDF
-            with open(pdf_path, 'rb') as pdf_file:
-                pdf_content = pdf_file.read()
-
-            # Clean up temporary files
-            subprocess.run(['latexmk', '-c', temp_file_path], check=True, capture_output=True, text=True)
-            for file in [temp_file_path, pdf_path]:
-                if os.path.exists(file):
-                    os.unlink(file)
-
-            # Return the PDF as a response
-            response = Response(content=pdf_content, media_type="application/pdf")
+            subprocess.run(["latexmk", "-pdf", tex_path], check=True, capture_output=True)
+            pdf_path = tex_path.replace(".tex", ".pdf")
+            with open(pdf_path, "rb") as f:
+                pdf_bytes = f.read()
+
+            # Clean up
+            subprocess.run(["latexmk", "-c", tex_path], check=True)
+            os.remove(tex_path)
+            os.remove(pdf_path)
+
+            # Send PDF as response
+            response = Response(content=pdf_bytes, media_type="application/pdf")
             response.headers["Content-Disposition"] = f"attachment; filename=patient_{patient.get('fhir_id', 'unknown')}_record.pdf"
-            logger.info(f"PDF generated successfully for patient {patient_id}")
             return response
 
         except subprocess.CalledProcessError as e:
-            logger.error(f"Failed to compile LaTeX for patient {patient_id}: {str(e)}")
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail=f"Failed to generate PDF: {str(e.output)}"
-            )
-        except Exception as e:
-            logger.error(f"Unexpected error generating PDF for patient {patient_id}: {str(e)}")
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail=f"Unexpected error generating PDF: {str(e)}"
-            )
+            logger.error(f"LaTeX compilation failed: {e.stderr}")
+            raise HTTPException(status_code=500, detail="LaTeX compilation failed")
 
-    except ValueError as ve:
-        logger.error(f"Invalid patient ID format: {patient_id}, error: {str(ve)}")
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Invalid patient ID format"
-        )
     except Exception as e:
-        logger.error(f"Failed to retrieve patient {patient_id} for PDF generation: {str(e)}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to generate PDF: {str(e)}"
-        )
-
+        logger.error(f"PDF generation error: {e}")
+        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}")