Update pages/02_Workflow_UI.py

pages/02_Workflow_UI.py

@@ -30,6 +30,7 @@ from src.explainability import text_hash, normalize_text, is_stale
 from src.guideline_annotator import generate_guideline_rationale
 from src.ai_core import generate_soap_draft
 from src.model_loader import active_model_status
+from datetime import datetime
 
 
 # --------------------------- Page Setup ---------------------------------
@@ -132,44 +133,64 @@ def _latest_export(case_id: str, pattern_suffix: str) -> Optional[Path]:
     matches = sorted(exp.glob(f"EC-{case_id}_*{pattern_suffix}"), key=lambda p: p.stat().st_mtime)
     return matches[-1] if matches else None
 
-def _note_markdown(case: Dict[str, Any], summary: str, soap: Dict[str, str], guideline_points: List[str], endnotes: List[Dict[str, Any]]) -> str:
+
+def _note_markdown(case: Dict[str, Any], summary: str, soap: Dict[str, str],
+                   guideline_points: List[str], endnotes: List[Dict[str, Any]]) -> str:
+    """Generate formatted EHR-style consultation report (matches sample format)."""
     p = case.get("patient", {}) or {}
+    c = case.get("consult", {}) or {}
+    consult_id = case.get("case_id", "")
+    today = datetime.utcnow().strftime("%B %d, %Y")
+
+    patient_line = f"**Patient:** {p.get('name','Unknown')} ({p.get('sex','')}, {p.get('age','')})"
+    specialty = c.get("specialty") or "Cardiology"
+    question = c.get("question") or ""
+    referring = c.get("referrer") or "Referring provider not specified"
+
     header = (
-        f"# Consultation Report — {case.get('case_id','')}\n\n"
-        f"**Patient:** {p.get('name','')} ({p.get('age','')}/{p.get('sex','')})\n"
+        f"# {specialty} E-Consult Report\n\n"
+        f"{patient_line}  \n"
+        f"**Consult ID:** {consult_id}  \n"
+        f"**Date:** {today}  \n"
+        f"**Specialty:** {specialty}  \n"
+        f"**Referring Provider:** {referring}\n\n"
+        "---\n\n"
     )
-    body = (
-        f"\n## Referral Summary\n{summary.strip()}\n"
-        f"\n## Subjective\n{(soap.get('subjective') or '').strip()}\n"
-        f"\n## Objective\n{(soap.get('objective') or '').strip()}\n"
-        f"\n## Assessment\n{(soap.get('assessment') or '').strip()}\n"
-        f"\n## Plan\n{(soap.get('plan') or '').strip()}\n"
+
+    referral_section = ""
+    if question:
+        referral_section += f"### Referral Question\n> {question.strip()}\n\n"
+    if summary.strip():
+        referral_section += f"### Clinical Summary\n{summary.strip()}\n\n---\n\n"
+
+    soap_section = (
+        f"### Subjective\n{(soap.get('subjective') or '').strip()}\n\n"
+        f"### Objective\n{(soap.get('objective') or '').strip()}\n\n"
+        f"### Assessment\n{(soap.get('assessment') or '').strip()}\n\n"
+        f"### Plan\n{(soap.get('plan') or '').strip()}\n\n---\n\n"
     )
-    gr = ""
+
+    guideline_section = ""
     if guideline_points:
         bullets = "\n".join([f"- {pt}" for pt in guideline_points])
-        gr = "\n## Guideline Rationale\n" + bullets + "\n"
-    cites = ""
+        guideline_section = f"### Guideline Alignment\n{bullets}\n\n---\n\n"
+
+    endnote_section = ""
     if endnotes:
-        cites = "\n## Guideline Citations\n" + "\n".join(
-            [f"- [{e.get('n', i+1)}] {e.get('doc','Guideline')}" + (f" p.{e.get('page','')}" if e.get('page') else "") for i, e in enumerate(endnotes)]
+        cites = "\n".join(
+            [f"- [{e.get('n', i+1)}] {e.get('doc','Guideline')}"
+             + (f" p.{e.get('page','')}" if e.get('page') else "") for i, e in enumerate(endnotes)]
         )
-    return header + body + gr + cites + "\n"
+        endnote_section = f"### References\n{cites}\n\n---\n\n"
 
-def _seed_once() -> None:
-    if not st.session_state.get("_seeded", False):
-        store.seed_cases(reset=True)
-        st.session_state["_seeded"] = True
+    attestation = (
+        "### Consulting Clinician Attestation\n"
+        "I personally reviewed the provided information, generated this report, "
+        "and confirm that I spent the documented time reviewing and documenting this e-consult.\n"
+    )
 
-def _case_options() -> List[Dict[str, Any]]:
-    items = store.list_cases()
-    if not items:
-        _seed_once()
-        items = store.list_cases()
-    return items
+    return header + referral_section + soap_section + guideline_section + endnote_section + attestation
 
-def _get_case(case_id: str) -> Dict[str, Any]:
-    return store.read_case(case_id) or {}
 
 
 # --------------------------- Global callouts --------------------------------
@@ -502,9 +523,9 @@ with tab_bill:
     st.subheader("EHR Consultation Note")
     note_path = _latest_export(selected, "Sample Consultation Report.md")
     if note_path and note_path.exists():
-        with st.expander("📄 View EHR Consultation Note (Markdown)", expanded=True):
+        with st.expander("📄 View EHR Consultation Note", expanded=True):
             md = note_path.read_text(encoding="utf-8")
-            st.code(md, language="markdown")
+            st.markdown(md)  # render formatted markdown, not raw text
         st.caption(f"File: {note_path.name}")
     else:
         st.warning("No consultation note found for this case. Finalize the consult to generate one.")
@@ -527,6 +548,33 @@ with tab_bill:
             st.write(f"{icon} **{s.code}** — {s.descriptor} — ${s.rate:.2f}")
             st.caption(s.why)
 
+    # --- ICD-10 diagnosis suggestions (new) ---
+    from src.billing import autosuggest_icd  # top of file already imports billing; safe to import here too
+    
+    soap_now = case.get("soap_draft", {}) or {}
+    icd_suggestions = autosuggest_icd(
+        assessment_text=soap_now.get("assessment", ""),
+        plan_text=soap_now.get("plan", "")
+    )
+    st.markdown("**ICD-10 Diagnosis Suggestions**")
+    if icd_suggestions:
+        for s in icd_suggestions:
+            st.write(f"✅ **{s.code}** — {s.description}  (confidence {int(s.confidence*100)}%)")
+            st.caption(s.why)
+        # Allow user to choose 1–3 codes
+        icd_options = [f"{s.code} — {s.description}" for s in icd_suggestions]
+        picked_icd = st.multiselect(
+            "Select diagnosis code(s) to include on the claim",
+            options=icd_options,
+            default=icd_options[:1],
+            key=f"icd_sel_{selected}"
+        )
+        picked_icd_codes = [o.split(" — ")[0] for o in picked_icd]
+    else:
+        st.info("No ICD-10 suggestions available for this case.")
+        picked_icd_codes = []
+
+    
     chosen_default = b.get("cpt_code") or (elig_codes[0] if elig_codes else None)
     if elig_codes:
         chosen = st.selectbox("Choose CPT (eligible)", options=elig_codes, index=elig_codes.index(chosen_default) if (chosen_default in elig_codes) else 0, key=f"cpt_{selected}")
@@ -539,16 +587,29 @@ with tab_bill:
     submit_claim = st.button("Submit Claim", type="primary", disabled=not (chosen and att_claim), key=f"submit_claim_{selected}")
 
     if submit_claim and chosen:
-        # Persist chosen code
-        store.update_case(selected, {"billing": {"cpt_code": chosen}})
-
-        # Build and save 837 JSON
+        # Persist chosen code + ICD selections
+        store.update_case(selected, {
+            "billing": {
+                "cpt_code": chosen,
+                "icd_codes": picked_icd_codes,   # NEW: persist ICDs in case JSON
+            }
+        })
+        
+        # Build and save 837 JSON (includes ICD codes)
         pick = next((s for s in suggestions if s.code == chosen), None)
         rate = float(getattr(pick, "rate", 0.0)) if pick else 0.0
-        claim = billing.build_837_claim(case, code=str(chosen), rate=rate, minutes=minutes, spoke=bool(spoke), attested=True)
+        claim = billing.build_837_claim(
+            case,
+            code=str(chosen),
+            rate=rate,
+            minutes=minutes,
+            spoke=bool(spoke),
+            attested=True,
+            icd_codes=picked_icd_codes,          # NEW: include ICD list in claim
+        )
         claim_path = config.make_export_path(selected, "Sample 837 Json.json")
         Path(claim_path).write_text(json.dumps(claim, ensure_ascii=False, indent=2), encoding="utf-8")
-
+        
         st.success("Claim submitted. 837 JSON generated (see preview below).")
         st.caption(f"Claim: {claim_path.name}")