feat(web): questionnaires, diary and medication module in the patient app
- Focus screen renders versioned questionnaire items (iq: buttons): section chip, position (adaptive forms without "of N"), recall date, pause / help-now actions, optional skip, sleep-hours input, 0-10 scale anchors, RUS-AUDIT item 2 standard-drink table. - Paused / held-for-review questionnaires get their own screen. - Today: intake and diary tasks, review notice, therapy-day card on days 1/7/14. - Drug card /meds/:ref from data/meds/meds_reference.json (draft built from the Minzdrav guidelines: depression 2024, PTSD 2023) — expected effect, course, side effects, red flags; no doses shown. "Report a side effect" always available (med:side_effects:<ref>). - API: /instruments/catalog, /meds/reference; today gains questionnaire state, reference id, indication and therapy day; demo persona seeds the dashboard dose history. - INTAKE_DEMO=1 (demo clock only) opens the questionnaires on synthetic data without touching the clinical release gate in config/intake_runtime.yaml. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+82
-11
@@ -1,4 +1,5 @@
|
||||
"""Patient web app: sign-in and public reference data (`/api/v1/auth/*`, `/api/v1/crisis/resources`).
|
||||
"""Patient web app: sign-in, the patient's own plan and public reference data (`/api/v1/auth/*`, `/me/*`,
|
||||
`/crisis/resources`, `/instruments/catalog`, `/meds/reference`).
|
||||
|
||||
The web app is one more channel of the same dialog engine: after sign-in it talks to `/dialog/{token}/...`
|
||||
exactly like the web console, and consent, onboarding, scales and check-ins come from the engine.
|
||||
@@ -18,7 +19,8 @@ import logging
|
||||
import secrets
|
||||
from collections import defaultdict
|
||||
from datetime import date, datetime, time, timedelta
|
||||
from typing import Literal
|
||||
from typing import Any, Literal
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
from fastapi import APIRouter, HTTPException
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
@@ -26,10 +28,14 @@ from sqlalchemy import select
|
||||
|
||||
from app.api import fixtures
|
||||
from app.core import clock
|
||||
from app.core.instrument_catalog import Catalog, catalog
|
||||
from app.core.intake_runtime import intake_enabled, load_runtime
|
||||
from app.core.meds_reference import find_drug, indication_for, load_reference
|
||||
from app.core.safety import CrisisResource, crisis_reply
|
||||
from app.db import repo
|
||||
from app.db.clinical import DailyCheckin, Dose, Prescription
|
||||
from app.db.identity import TOKEN_LEN
|
||||
from app.db.intake import QuestionnaireRecord
|
||||
from app.db.session import get_clinical_session
|
||||
from app.integrations.emias_mock import CODE_MAX_LEN, EmiasMock
|
||||
|
||||
@@ -80,15 +86,21 @@ async def _seed_demo_persona(token: str) -> None:
|
||||
token=token,
|
||||
doctor_id=fixtures.DOCTOR_ID,
|
||||
modules=list(item.modules),
|
||||
therapy_start=today,
|
||||
therapy_start=min((p.start_date for p in card.prescriptions if p.start_date), default=today),
|
||||
next_visit=today + timedelta(days=15),
|
||||
)
|
||||
if await s.scalar(select(Prescription.id).where(Prescription.token == token)) is not None:
|
||||
return
|
||||
for p in card.prescriptions:
|
||||
rx = Prescription(token=token, drug=p.drug, dose=p.dose, schedule=p.schedule, start_date=today)
|
||||
rx = Prescription(
|
||||
token=token, drug=p.drug, dose=p.dose, schedule=p.schedule, start_date=p.start_date or today
|
||||
)
|
||||
s.add(rx)
|
||||
await s.flush()
|
||||
# The dose history of the dashboard story (days before today), so the week marks match the doctor's card.
|
||||
for d in card.doses:
|
||||
if d.drug == p.drug and d.planned_at.astimezone(now.tzinfo).date() < today:
|
||||
s.add(Dose(token=token, prescription_id=rx.id, planned_at=d.planned_at, status=d.status))
|
||||
for t in p.schedule.get("times", []):
|
||||
hh, mm = (int(x) for x in t.split(":"))
|
||||
s.add(
|
||||
@@ -147,6 +159,18 @@ class PrescriptionItem(BaseModel):
|
||||
dose: str
|
||||
times: list[str]
|
||||
week: list[WeekDay] # Mon..Sun of the current week
|
||||
ref_id: str | None = None # entry of /meds/reference, if the drug is covered
|
||||
indication: Literal["depression", "ptsd"] | None = None
|
||||
start_date: date | None = None
|
||||
therapy_day: int | None = None # 1 on the start date (spec: M5, «ожидаемый эффект» cards on days 1/7/14)
|
||||
|
||||
|
||||
class Questionnaires(BaseModel):
|
||||
"""Questionnaire state for the home screen. Answers and scores are not exposed here."""
|
||||
|
||||
enabled: bool
|
||||
intake: Literal["none", "active", "paused", "complete", "review"]
|
||||
diary_done: bool
|
||||
|
||||
|
||||
class TodayOut(BaseModel):
|
||||
@@ -157,6 +181,19 @@ class TodayOut(BaseModel):
|
||||
next_visit: date | None
|
||||
doses: list[DoseItem]
|
||||
prescriptions: list[PrescriptionItem]
|
||||
questionnaires: Questionnaires
|
||||
|
||||
|
||||
def _intake_state(records: list[QuestionnaireRecord]) -> Literal["none", "active", "paused", "complete", "review"]:
|
||||
intake = [r for r in records if r.kind == "intake"]
|
||||
if any(r.status == "complete" for r in intake):
|
||||
return "complete"
|
||||
if not intake:
|
||||
return "none"
|
||||
last = max(intake, key=lambda r: r.started_at).status
|
||||
if last in ("active", "paused"):
|
||||
return last
|
||||
return "review" if last in ("review_required", "interrupted") else "none"
|
||||
|
||||
|
||||
def _day_status(statuses: list[str]) -> Literal["taken", "missed", "pending", "none"]:
|
||||
@@ -187,6 +224,7 @@ async def my_today(token: str) -> TodayOut:
|
||||
)
|
||||
).all()
|
||||
checkin = await s.scalar(select(DailyCheckin).where(DailyCheckin.token == token, DailyCheckin.day == today))
|
||||
records = list((await s.scalars(select(QuestionnaireRecord).where(QuestionnaireRecord.token == token))).all())
|
||||
|
||||
by_rx: dict[int, Prescription] = {p.id: p for p in prescriptions}
|
||||
today_doses: list[DoseItem] = []
|
||||
@@ -200,23 +238,40 @@ async def my_today(token: str) -> TodayOut:
|
||||
DoseItem(id=d.id, drug=rx.drug, dose=rx.dose, time=local.strftime("%H:%M"), status=d.status)
|
||||
)
|
||||
week = [week_start + timedelta(days=i) for i in range(7)]
|
||||
modules = list(profile.modules or []) if profile else []
|
||||
diary_day = now.astimezone(ZoneInfo(load_runtime().timezone)).date()
|
||||
diary_done = any(r.kind == "diary" and r.day == diary_day and r.status == "complete" for r in records)
|
||||
|
||||
def item(p: Prescription) -> PrescriptionItem:
|
||||
ref = find_drug(p.drug)
|
||||
return PrescriptionItem(
|
||||
drug=p.drug,
|
||||
dose=p.dose,
|
||||
times=list((p.schedule or {}).get("times", [])),
|
||||
week=[WeekDay(day=d, status=_day_status(marks[(p.id, d)])) for d in week],
|
||||
ref_id=ref["id"] if ref else None,
|
||||
indication=indication_for(modules, ref) if ref else None,
|
||||
start_date=p.start_date,
|
||||
therapy_day=(today - p.start_date).days + 1 if p.start_date else None,
|
||||
)
|
||||
|
||||
return TodayOut(
|
||||
today=today,
|
||||
now=now.strftime("%H:%M"),
|
||||
has_doctor=profile is not None,
|
||||
checkin_done=checkin is not None and checkin.mood is not None,
|
||||
checkin_done=(checkin is not None and checkin.mood is not None) or diary_done,
|
||||
next_visit=profile.next_visit if profile else None,
|
||||
doses=today_doses,
|
||||
prescriptions=[
|
||||
PrescriptionItem(
|
||||
drug=p.drug,
|
||||
dose=p.dose,
|
||||
times=list((p.schedule or {}).get("times", [])),
|
||||
week=[WeekDay(day=d, status=_day_status(marks[(p.id, d)])) for d in week],
|
||||
)
|
||||
item(p)
|
||||
for p in prescriptions
|
||||
if (p.end_date is None or p.end_date >= today) and (p.start_date is None or p.start_date <= today)
|
||||
],
|
||||
questionnaires=Questionnaires(
|
||||
enabled=intake_enabled() and profile is not None,
|
||||
intake=_intake_state(records),
|
||||
diary_done=diary_done,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -224,3 +279,19 @@ async def my_today(token: str) -> TodayOut:
|
||||
async def crisis_resources() -> list[CrisisResource]:
|
||||
"""Help lines for the always-visible «help now» button — the same list as the fixed crisis script."""
|
||||
return crisis_reply([], "patient").resources
|
||||
|
||||
|
||||
@router.get("/instruments/catalog", response_model=Catalog)
|
||||
async def instruments_catalog() -> Catalog:
|
||||
"""Form, position and recall period of every questionnaire item, for the question screen header."""
|
||||
return catalog()
|
||||
|
||||
|
||||
@router.get("/meds/reference")
|
||||
async def meds_reference() -> dict[str, Any]:
|
||||
"""Patient drug reference (draft from the Minzdrav guidelines): expected effect, course, side effects, red flags.
|
||||
|
||||
The internal rule parameters stay on the server.
|
||||
"""
|
||||
ref = load_reference()
|
||||
return {k: v for k, v in ref.items() if k != "rules"}
|
||||
|
||||
Reference in New Issue
Block a user