Update src/report_generator.py

src/report_generator.py

@@ -198,163 +198,145 @@ def build_medical_report(data: dict) -> bytes:
     logo_path = "src/assets/logo.png"
     
     # Get logo image
-    logo_img = get_reportlab_image(logo_path, width=1.0*inch, height=1.0*inch)
-    
-    # Company info
-    company_info = Paragraph(
-        """
-        <b><font color="#E0B0FF">Daease</font></b><br/>
-        Website: <font color="#E0B0FF">http://daease.com/</font><br/>
-        Email: <font color="#E0B0FF">daease.main@gmail.com</font>
-        """, 
-        styles['CompanyInfo']
-    )
+    logo_img = get_reportlab_image(logo_path, width=2.5*inch, height=1.0*inch)
     
-    # Add header with logo or text-only fallback
+    # Add the logo if available
     if logo_img:
-        header_table = Table([[logo_img, company_info]], colWidths=[doc.width/2.0]*2)
-        header_table.setStyle(TableStyle([
-            ('VALIGN', (0, 0), (-1, -1), 'TOP'),
-            ('ALIGN', (0, 0), (0, 0), 'LEFT'),
-            ('ALIGN', (1, 0), (1, 0), 'RIGHT'),
-            ('BOTTOMPADDING', (0, 0), (-1, -1), 10),
-            ('BACKGROUND', (0, 0), (-1, -1), background_color),
-        ]))
-        elems.append(header_table)
-    else:
-        company_header = Paragraph(
-            """
-            <b><font color="#E0B0FF" size="14">Daease</font></b><br/>
-            Website: <font color="#E0B0FF">http://daease.com/</font><br/>
-            Email: <font color="#E0B0FF">daease.main@gmail.com</font>
-            """, 
-            styles['CompanyInfo']
-        )
-        elems.append(company_header)
+        elems.append(logo_img)
     
+    # Add report title
     elems.append(Spacer(1, 0.3*inch))
-
-    # Add title with subtle gradient-like effect
-    title = Paragraph(
-        '<font color="#E0B0FF">Daease</font> '
-        '<font color="#D8BFD8">Medical</font> '
-        '<font color="#DA70D6">Consultation</font> '
-        '<font color="#BA55D3">Report</font>', 
-        styles['ReportTitle']
-    )
+    title = Paragraph('Medical Consultation Report', styles['ReportTitle'])
     elems.append(title)
-    elems.append(Spacer(1, 0.2*inch))
-
-    # Add a horizontal separator line
-    separator = Table([['']],  colWidths=[doc.width], rowHeights=[1])
-    separator.setStyle(TableStyle([
-        ('LINEABOVE', (0, 0), (-1, -1), 1, accent_color),
-        ('BACKGROUND', (0, 0), (-1, -1), background_color),
-    ]))
-    elems.append(separator)
+    
+    # Add patient info table
     elems.append(Spacer(1, 0.3*inch))
-
-    # --- TABLE 1: Patient Information ---
-    patient = data.get('patient', {})
     
-    # Create a cleaner patient info table with proper Paragraph objects
+    patient_title = Paragraph('Patient Information', styles['SectionHeading'])
+    elems.append(patient_title)
+    elems.append(Spacer(1, 0.1*inch))
+    
     patient_data = [
-        [Paragraph('<font color="#BA55D3"><b>Patient Information</b></font>', styles['SectionHeading']), ''],
-        [Paragraph('Name:', styles['NormalText']), Paragraph(f'{patient.get("name", "–")}', styles['NormalText'])],
-        [Paragraph('Age:', styles['NormalText']), Paragraph(f'{patient.get("age", "–")}', styles['NormalText'])],
-        [Paragraph('Gender:', styles['NormalText']), Paragraph(f'{patient.get("gender", "–")}', styles['NormalText'])],
-        [Paragraph('Visit Date:', styles['NormalText']), Paragraph(f'{data.get("visit_date", datetime.now().strftime("%Y-%m-%d"))}', styles['NormalText'])]
+        ['Name:', Paragraph(data["patient"]["name"] or "Not provided", styles['NormalText'])],
+        ['Age:', Paragraph(data["patient"]["age"] or "Not provided", styles['NormalText'])],
+        ['Gender:', Paragraph(data["patient"]["gender"] or "Not provided", styles['NormalText'])],
+        ['Date:', Paragraph(data["visit_date"] or datetime.now().strftime("%Y-%m-%d"), styles['NormalText'])]
     ]
     
-    patient_table = Table(
-        patient_data, 
-        colWidths=[doc.width * 0.3, doc.width * 0.7],
-        rowHeights=[0.4*inch, 0.25*inch, 0.25*inch, 0.25*inch, 0.25*inch]
-    )
-    
+    patient_table = Table(patient_data, colWidths=[doc.width * 0.25, doc.width * 0.65])
     patient_table.setStyle(TableStyle([
-        # Header styling
-        ('SPAN', (0, 0), (1, 0)),  # Span the header cell
-        ('ALIGN', (0, 0), (0, 0), 'CENTER'),
-        
-        # Label column styling
-        ('ALIGN', (0, 1), (0, -1), 'RIGHT'),
-        ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
-        ('RIGHTPADDING', (0, 1), (0, -1), 12),
-        
-        # Cell styling
+        ('BACKGROUND', (0, 0), (0, -1), colors.black),
+        ('TEXTCOLOR', (0, 0), (0, -1), accent_color),
+        ('ALIGN', (0, 0), (0, -1), 'RIGHT'),
+        ('FONTNAME', (0, 0), (0, -1), 'Helvetica-Bold'),
+        ('FONTSIZE', (0, 0), (0, -1), 10),
+        ('BOTTOMPADDING', (0, 0), (-1, -1), 6),
         ('BACKGROUND', (0, 0), (-1, -1), background_color),
-        ('TEXTCOLOR', (1, 1), (1, -1), text_color),
-        
-        # Borders
-        ('GRID', (0, 1), (1, -1), 0.5, secondary_color),
-        ('BOX', (0, 1), (1, -1), 1, accent_color),
     ]))
     
     elems.append(patient_table)
-    elems.append(Spacer(1, 0.4*inch))
     
-    # --- TABLE 2: Medical Information (All in one table) ---
-    # Collect all medical data
-    medical_sections = [
-        ("Chief Complaint", data.get('chief_complaint')),
-        ("History of Present Illness", data.get('history_of_present_illness')),
-        ("Past Medical History", data.get('past_medical_history')),
-        ("Medications", data.get('medications')),
-        ("Allergies", data.get('allergies')),
-        ("Examination Findings", data.get('examination')),
-        ("Diagnosis", data.get('diagnosis')),
-        ("Recommendations", data.get('recommendations')),
-        ("Reasoning", data.get('reasoning')),
-        ("Sources", data.get('sources'))
-    ]
-    
-    # Create table data
-    elems.append(Paragraph('<font color="#BA55D3"><b>Medical Information</b></font>', styles['SectionHeading']))
-    elems.append(Spacer(1, 0.1*inch))
-    
-    # Create medical info rows
-    for title, content in medical_sections:
-        if not content or str(content).strip() == '':
-            content = '–'
+    # Chief complaint section
+    if data.get("chief_complaint"):
+        elems.append(Spacer(1, 0.3*inch))
+        cc_title = Paragraph('Chief Complaint', styles['SectionHeading'])
+        elems.append(cc_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        # Format content as paragraphs
-        if isinstance(content, list):
-            content = '\n'.join(map(str, content))
-        elif content is not None and not isinstance(content, str):
-            content = str(content)
+        cc_text = Paragraph(data["chief_complaint"], styles['NormalText'])
+        elems.append(cc_text)
+    
+    # History of present illness
+    if data.get("history_of_present_illness"):
+        elems.append(Spacer(1, 0.3*inch))
+        hpi_title = Paragraph('History of Present Illness', styles['SectionHeading'])
+        elems.append(hpi_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        # Create styled paragraph for content with explicit white text color
-        styled_content = Paragraph(content, styles['NormalText'])
+        hpi_text = Paragraph(data["history_of_present_illness"], styles['NormalText'])
+        elems.append(hpi_text)
+    
+    # Past medical history
+    if data.get("past_medical_history"):
+        elems.append(Spacer(1, 0.3*inch))
+        pmh_title = Paragraph('Past Medical History', styles['SectionHeading'])
+        elems.append(pmh_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        # Add section
-        section_data = [
-            [Paragraph(f'<b>{title}</b>', styles['NormalText']), styled_content]
-        ]
+        pmh_text = Paragraph(data["past_medical_history"], styles['NormalText'])
+        elems.append(pmh_text)
+    
+    # Medications
+    if data.get("medications"):
+        elems.append(Spacer(1, 0.3*inch))
+        med_title = Paragraph('Medications', styles['SectionHeading'])
+        elems.append(med_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        section_table = Table(
-            section_data,
-            colWidths=[doc.width * 0.25, doc.width * 0.75],
-            rowHeights=None  # Auto height
-        )
+        med_text = Paragraph(data["medications"], styles['NormalText'])
+        elems.append(med_text)
+    
+    # Allergies
+    if data.get("allergies"):
+        elems.append(Spacer(1, 0.3*inch))
+        allergy_title = Paragraph('Allergies', styles['SectionHeading'])
+        elems.append(allergy_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        section_table.setStyle(TableStyle([
-            # Cell styling
-            ('VALIGN', (0, 0), (0, 0), 'TOP'),
-            ('ALIGN', (0, 0), (0, 0), 'RIGHT'),
-            ('RIGHTPADDING', (0, 0), (0, 0), 12),
-            ('TOPPADDING', (0, 0), (1, 0), 8),
-            ('BOTTOMPADDING', (0, 0), (1, 0), 8),
-            
-            # Background
-            ('BACKGROUND', (0, 0), (-1, -1), background_color),
-            
-            # Bottom border only
-            ('LINEBELOW', (0, 0), (1, 0), 0.5, secondary_color),
+        allergy_text = Paragraph(data["allergies"], styles['NormalText'])
+        elems.append(allergy_text)
+    
+    # Examination
+    if data.get("examination"):
+        elems.append(Spacer(1, 0.3*inch))
+        exam_title = Paragraph('Examination', styles['SectionHeading'])
+        elems.append(exam_title)
+        elems.append(Spacer(1, 0.1*inch))
+        
+        exam_text = Paragraph(data["examination"], styles['NormalText'])
+        elems.append(exam_text)
+    
+    # Diagnosis (highlighted)
+    if data.get("diagnosis"):
+        elems.append(Spacer(1, 0.3*inch))
+        diag_title = Paragraph('Diagnosis', styles['SectionHeading'])
+        elems.append(diag_title)
+        elems.append(Spacer(1, 0.1*inch))
+        
+        # Create a table for the diagnosis with a subtle highlight
+        diag_table = Table([[Paragraph(data["diagnosis"], styles['NormalText'])]], 
+                         colWidths=[doc.width * 0.9])
+        diag_table.setStyle(TableStyle([
+            ('BACKGROUND', (0, 0), (-1, -1), colors.darkslateblue),
+            ('TEXTCOLOR', (0, 0), (-1, -1), colors.white),
+            ('ALIGN', (0, 0), (-1, -1), 'LEFT'),
+            ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+            ('PADDING', (0, 0), (-1, -1), 8),
+            ('BOTTOMPADDING', (0, 0), (-1, -1), 12),
+            ('TOPPADDING', (0, 0), (-1, -1), 12),
         ]))
+        elems.append(diag_table)
+    
+    # Recommendations
+    if data.get("recommendations"):
+        elems.append(Spacer(1, 0.3*inch))
+        rec_title = Paragraph('Recommendations', styles['SectionHeading'])
+        elems.append(rec_title)
+        elems.append(Spacer(1, 0.1*inch))
         
-        elems.append(section_table)
-    
+        rec_text = Paragraph(data["recommendations"], styles['NormalText'])
+        elems.append(rec_text)
+    
+    # Sources (if provided)
+    if data.get("sources") and len(data["sources"]) > 5:  # Simple check to avoid empty sources
+        elems.append(Spacer(1, 0.3*inch))
+        sources_title = Paragraph('Medical References', styles['SectionHeading'])
+        elems.append(sources_title)
+        elems.append(Spacer(1, 0.1*inch))
+        
+        sources_text = Paragraph(data["sources"], styles['NormalText'])
+        elems.append(sources_text)
+
     # Add AI signature section
     elems.append(Spacer(1, 0.4*inch))
     
@@ -429,6 +411,7 @@ def generate_and_download_report():
     """
     Generate a medical report from the conversation history.
     Shows a form for entering patient info and then allows downloading the report.
+    This function is only called when explicitly requested via the Generate Report button.
     """
     # Step 1: Collect patient info
     if st.session_state.report_step == 1: