From 5140552ff6e93b4e445b3fd6e641aead560de899 Mon Sep 17 00:00:00 2001
From: iven <iven_h@qq.com>
Date: Mon, 4 May 2026 00:03:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(health):=20=E8=B5=B0=E6=9F=A5=E6=AD=A2?=
 =?UTF-8?q?=E8=A1=80=20=E2=80=94=20=E6=82=A3=E8=80=85=E5=90=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E5=A4=8D=20+=20=E6=9E=9A=E4=B8=BE=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8=20+=20=E5=8C=BB=E6=8A=A4=E7=BB=9F=E8=AE=A1=20+=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后端:
- alert_service: list_alerts 批量查询 patient_name 填充 AlertResponse
- consultation_service: list_sessions 批量查询 patient_name/doctor_name
- erp-ai handler: list_analysis 通过 raw SQL 查询 patient_name

前端:
- AlertList/AlertDashboard: 使用后端返回的 patient_name 替代 ID 截断
- ConsultationDetail: 使用 patient_name/doctor_name 替代 ID 截断
- AiAnalysisList: 使用 patient_name 替代 ID 截断
- constants/health: SEVERITY 补 high/medium, STATUS 补 active
- AdminDashboard: 医护人数改为 API 查询（useStatsData 新增 doctorCount）
- DeviceManage: 患者 ID 输入改为 PatientSelect 搜索选择器
---
 apps/web/src/api/ai/analysis.ts               |  1 +
 apps/web/src/api/health/alerts.ts             |  1 +
 apps/web/src/constants/health.ts              |  9 +++++
 apps/web/src/pages/health/AiAnalysisList.tsx  |  7 ++--
 apps/web/src/pages/health/AlertDashboard.tsx  |  2 +-
 apps/web/src/pages/health/AlertList.tsx       |  9 ++---
 .../src/pages/health/ConsultationDetail.tsx   |  5 ++-
 apps/web/src/pages/health/DeviceManage.tsx    | 15 +++----
 .../StatisticsDashboard/AdminDashboard.tsx    |  6 +--
 .../StatisticsDashboard/useStatsData.ts       | 12 +++++-
 crates/erp-ai/src/handler/mod.rs              | 40 ++++++++++++++++++-
 crates/erp-health/src/dto/alert_dto.rs        |  1 +
 .../erp-health/src/service/alert_service.rs   | 39 ++++++++++++++++--
 .../src/service/consultation_service.rs       | 37 ++++++++++++++++-
 14 files changed, 155 insertions(+), 29 deletions(-)

diff --git a/apps/web/src/api/ai/analysis.ts b/apps/web/src/api/ai/analysis.ts
index 1c4822d..5c7e238 100644
--- a/apps/web/src/api/ai/analysis.ts
+++ b/apps/web/src/api/ai/analysis.ts
@@ -4,6 +4,7 @@ import type { PaginatedResponse } from '../types';
 export interface AnalysisItem {
   id: string;
   patient_id: string;
+  patient_name?: string;
   analysis_type: string;
   source_ref: string;
   model_used: string;
diff --git a/apps/web/src/api/health/alerts.ts b/apps/web/src/api/health/alerts.ts
index bc8feb7..7c00b2d 100644
--- a/apps/web/src/api/health/alerts.ts
+++ b/apps/web/src/api/health/alerts.ts
@@ -5,6 +5,7 @@ import type { PaginatedResponse } from '../types';
 export interface Alert {
   id: string;
   patient_id: string;
+  patient_name?: string;
   rule_id: string;
   severity: string;
   title: string;
diff --git a/apps/web/src/constants/health.ts b/apps/web/src/constants/health.ts
index 6b017d2..80543ea 100644
--- a/apps/web/src/constants/health.ts
+++ b/apps/web/src/constants/health.ts
@@ -40,6 +40,8 @@ export const SEVERITY_COLOR: Record<string, string> = {
   warning: 'orange',
   critical: 'red',
   urgent: 'magenta',
+  high: 'red',
+  medium: 'orange',
 };
 
 export const SEVERITY_LABEL: Record<string, string> = {
@@ -47,18 +49,23 @@ export const SEVERITY_LABEL: Record<string, string> = {
   warning: '警告',
   critical: '严重',
   urgent: '紧急',
+  high: '严重',
+  medium: '中等',
 };
 
 export const SEVERITY_OPTIONS = [
   { value: 'info', label: '提示' },
   { value: 'warning', label: '警告' },
+  { value: 'medium', label: '中等' },
   { value: 'critical', label: '严重' },
+  { value: 'high', label: '严重' },
   { value: 'urgent', label: '紧急' },
 ];
 
 // --- 告警状态（统一 3 处: AlertDashboard, AlertList） ---
 export const ALERT_STATUS_COLOR: Record<string, string> = {
   pending: 'orange',
+  active: 'gold',
   acknowledged: 'blue',
   resolved: 'green',
   dismissed: 'default',
@@ -66,6 +73,7 @@ export const ALERT_STATUS_COLOR: Record<string, string> = {
 
 export const ALERT_STATUS_LABEL: Record<string, string> = {
   pending: '待处理',
+  active: '活跃',
   acknowledged: '已确认',
   resolved: '已恢复',
   dismissed: '已忽略',
@@ -73,6 +81,7 @@ export const ALERT_STATUS_LABEL: Record<string, string> = {
 
 export const ALERT_STATUS_OPTIONS = [
   { value: '', label: '全部状态' },
+  { value: 'active', label: '活跃' },
   { value: 'pending', label: '待处理' },
   { value: 'acknowledged', label: '已确认' },
   { value: 'resolved', label: '已恢复' },
diff --git a/apps/web/src/pages/health/AiAnalysisList.tsx b/apps/web/src/pages/health/AiAnalysisList.tsx
index 12be95e..d93861c 100644
--- a/apps/web/src/pages/health/AiAnalysisList.tsx
+++ b/apps/web/src/pages/health/AiAnalysisList.tsx
@@ -11,6 +11,7 @@ import {
 import { useThemeMode } from '../../hooks/useThemeMode';
 import { analysisApi, type AnalysisItem } from '../../api/ai/analysis';
 import { suggestionApi, type SuggestionItem } from '../../api/ai/suggestions';
+import { EntityName } from '../../components/EntityName';
 
 const { Text } = Typography;
 
@@ -321,9 +322,9 @@ export default function AiAnalysisList() {
       dataIndex: 'patient_id',
       key: 'patient_id',
       width: 140,
-      render: (v: string) => (
-        <Link to={`/health/patients/${v}`} style={{ fontFamily: 'monospace', fontSize: 12 }}>
-          {v.slice(0, 8)}
+      render: (_: unknown, record: AnalysisItem) => (
+        <Link to={`/health/patients/${record.patient_id}`}>
+          <EntityName name={record.patient_name} id={record.patient_id} />
         </Link>
       ),
     },
diff --git a/apps/web/src/pages/health/AlertDashboard.tsx b/apps/web/src/pages/health/AlertDashboard.tsx
index 4e78338..330a8ac 100644
--- a/apps/web/src/pages/health/AlertDashboard.tsx
+++ b/apps/web/src/pages/health/AlertDashboard.tsx
@@ -245,7 +245,7 @@ export default function AlertDashboard() {
                         }
                         description={
                           <Typography.Text type="secondary" style={{ fontSize: 12 }}>
-                            患者: <EntityName id={alert.patient_id} />
+                            患者: <EntityName name={alert.patient_name} id={alert.patient_id} />
                             {' · '}
                             {new Date(alert.created_at).toLocaleString('zh-CN')}
                           </Typography.Text>
diff --git a/apps/web/src/pages/health/AlertList.tsx b/apps/web/src/pages/health/AlertList.tsx
index af6c447..5882c1a 100644
--- a/apps/web/src/pages/health/AlertList.tsx
+++ b/apps/web/src/pages/health/AlertList.tsx
@@ -137,12 +137,11 @@ export default function AlertList() {
       dataIndex: 'patient_id',
       key: 'patient_id',
       width: 140,
-      render: (id: string) => (
-        <Link to={`/health/patients/${id}`}>
+      render: (_: unknown, record: Alert) => (
+        <Link to={`/health/patients/${record.patient_id}`}>
           <EntityName
-            name={undefined}
-            id={id}
-            fallbackLabel={id.length > 8 ? id.slice(0, 8) + '...' : id}
+            name={record.patient_name}
+            id={record.patient_id}
           />
         </Link>
       ),
diff --git a/apps/web/src/pages/health/ConsultationDetail.tsx b/apps/web/src/pages/health/ConsultationDetail.tsx
index 2bb73a4..059f71a 100644
--- a/apps/web/src/pages/health/ConsultationDetail.tsx
+++ b/apps/web/src/pages/health/ConsultationDetail.tsx
@@ -7,6 +7,7 @@ import { StatusTag } from './components/StatusTag';
 import { ImagePreview } from './components/ImagePreview';
 import { useThemeMode } from '../../hooks/useThemeMode';
 import { AuthButton } from '../../components/AuthButton';
+import { EntityName } from '../../components/EntityName';
 
 const PAGE_SIZE = 30;
 const POLL_INTERVAL = 10_000;
@@ -297,10 +298,10 @@ export default function ConsultationDetail() {
         {session && (
           <>
             <Typography.Text type="secondary" style={{ fontSize: 13 }}>
-              患者: {session.patient_id.slice(0, 8)}
+              患者: <EntityName name={session.patient_name} id={session.patient_id} />
             </Typography.Text>
             <Typography.Text type="secondary" style={{ fontSize: 13 }}>
-              医护: {session.doctor_id ? session.doctor_id.slice(0, 8) : '-'}
+              医护: <EntityName name={session.doctor_name} id={session.doctor_id} fallbackLabel="未分配" />
             </Typography.Text>
             <StatusTag status={session.status} />
           </>
diff --git a/apps/web/src/pages/health/DeviceManage.tsx b/apps/web/src/pages/health/DeviceManage.tsx
index 7ba0fa8..041b59c 100644
--- a/apps/web/src/pages/health/DeviceManage.tsx
+++ b/apps/web/src/pages/health/DeviceManage.tsx
@@ -5,6 +5,7 @@ import dayjs from 'dayjs';
 
 import { deviceApi, type DeviceItem } from '../../api/health/devices';
 import { DEVICE_TYPE_OPTIONS, DEVICE_TYPE_COLOR } from '../../constants/health';
+import { PatientSelect } from './components/PatientSelect';
 
 function formatTime(val?: string | null): string {
   if (!val) return '-';
@@ -109,13 +110,13 @@ export default function DeviceManage() {
       <h2 style={{ marginBottom: 16 }}>设备管理</h2>
 
       <Space style={{ marginBottom: 16 }} wrap>
-        <Input
-          placeholder="患者 ID"
-          value={filterPatientId}
-          onChange={(e) => setFilterPatientId(e.target.value)}
-          style={{ width: 200 }}
-          allowClear
-        />
+        <div style={{ width: 240 }}>
+          <PatientSelect
+            value={filterPatientId || undefined}
+            onChange={(val) => setFilterPatientId(val || '')}
+            placeholder="搜索患者"
+          />
+        </div>
         <Select
           placeholder="设备类型"
           value={filterDeviceType}
diff --git a/apps/web/src/pages/health/StatisticsDashboard/AdminDashboard.tsx b/apps/web/src/pages/health/StatisticsDashboard/AdminDashboard.tsx
index 95a9b0b..5222802 100644
--- a/apps/web/src/pages/health/StatisticsDashboard/AdminDashboard.tsx
+++ b/apps/web/src/pages/health/StatisticsDashboard/AdminDashboard.tsx
@@ -11,10 +11,10 @@ import { useCountUp } from '../../../hooks/useCountUp';
 import HealthDataCenter from './HealthDataCenter';
 
 export function AdminDashboard() {
-  const { patientStats, followUpStats, healthDataStats, dialysisStats, loading } = useStatsData();
+  const { patientStats, followUpStats, healthDataStats, dialysisStats, doctorCount, loading } = useStatsData();
   const patientCount = useCountUp(patientStats?.total_patients ?? 0);
   const appointmentCount = useCountUp(healthDataStats?.appointments?.this_month ?? 0);
-  const doctorCount = useCountUp(0);
+  const doctorCountDisplay = useCountUp(doctorCount);
 
   if (loading && !patientStats) return <Spin size="large" style={{ display: 'block', margin: '80px auto' }} />;
 
@@ -62,7 +62,7 @@ export function AdminDashboard() {
         </Col>
         <Col xs={12} sm={8} lg={4}>
           <Card size="small">
-            <Statistic title="医护人数" value={doctorCount} prefix={<UserOutlined />} />
+            <Statistic title="医护人数" value={doctorCountDisplay} prefix={<UserOutlined />} />
           </Card>
         </Col>
       </Row>
diff --git a/apps/web/src/pages/health/StatisticsDashboard/useStatsData.ts b/apps/web/src/pages/health/StatisticsDashboard/useStatsData.ts
index b33d7a5..db3b491 100644
--- a/apps/web/src/pages/health/StatisticsDashboard/useStatsData.ts
+++ b/apps/web/src/pages/health/StatisticsDashboard/useStatsData.ts
@@ -8,6 +8,7 @@ import {
   type HealthDataStats,
   type DialysisStatistics,
 } from '../../../api/health/points';
+import { doctorApi } from '../../../api/health/doctors';
 
 export interface StatsData {
   patientStats: PatientStatistics | null;
@@ -16,6 +17,7 @@ export interface StatsData {
   pointsStats: PointsStatistics | null;
   healthDataStats: HealthDataStats | null;
   dialysisStats: DialysisStatistics | null;
+  doctorCount: number;
   loading: boolean;
   error: string | null;
   refresh: () => void;
@@ -31,6 +33,7 @@ export function useStatsData(): StatsData {
   const [pointsStats, setPointsStats] = useState<PointsStatistics | null>(null);
   const [healthDataStats, setHealthDataStats] = useState<HealthDataStats | null>(null);
   const [dialysisStats, setDialysisStats] = useState<DialysisStatistics | null>(null);
+  const [doctorCount, setDoctorCount] = useState(0);
 
   const fetchAllStats = useCallback(async () => {
     setLoading(true);
@@ -56,9 +59,14 @@ export function useStatsData(): StatsData {
       tryFetch(pointsApi.getStatistics, setPointsStats, '积分'),
       tryFetch(pointsApi.getHealthDataStats, setHealthDataStats, '健康数据'),
       tryFetch(pointsApi.getDialysisStats, setDialysisStats, '透析'),
+      tryFetch(
+        async () => { const r = await doctorApi.list({ page: 1, page_size: 1 }); return r.total; },
+        setDoctorCount,
+        '医护',
+      ),
     ]);
 
-    if (hasAnyError && errors.length === 6) {
+    if (hasAnyError && errors.length === 7) {
       setError('加载统计数据失败');
     }
 
@@ -70,7 +78,7 @@ export function useStatsData(): StatsData {
   }, [fetchAllStats]);
 
   return {
-    patientStats, consultationStats, followUpStats, pointsStats, healthDataStats, dialysisStats,
+    patientStats, consultationStats, followUpStats, pointsStats, healthDataStats, dialysisStats, doctorCount,
     loading, error, refresh: fetchAllStats,
   };
 }
diff --git a/crates/erp-ai/src/handler/mod.rs b/crates/erp-ai/src/handler/mod.rs
index b85bb0b..87e758f 100644
--- a/crates/erp-ai/src/handler/mod.rs
+++ b/crates/erp-ai/src/handler/mod.rs
@@ -291,8 +291,46 @@ where
         .analysis
         .list_analysis(ctx.tenant_id, params.patient_id, params.analysis_type, &pagination)
         .await?;
+
+    // 批量查询 patient_name（通过 raw SQL 避免跨 crate 依赖 erp-health）
+    let patient_ids: std::collections::HashSet<uuid::Uuid> = items
+        .iter()
+        .filter(|a| a.patient_id != uuid::Uuid::nil())
+        .map(|a| a.patient_id)
+        .collect();
+
+    let patient_names: std::collections::HashMap<uuid::Uuid, String> = if !patient_ids.is_empty() {
+        #[derive(sea_orm::FromQueryResult)]
+        struct PatientName { id: uuid::Uuid, name: String }
+        let ids: Vec<uuid::Uuid> = patient_ids.into_iter().collect();
+        use sea_orm::FromQueryResult;
+        PatientName::find_by_statement(sea_orm::Statement::from_sql_and_values(
+            sea_orm::DatabaseBackend::Postgres,
+            "SELECT id, name FROM patient WHERE id = ANY($1) AND tenant_id = $2 AND deleted_at IS NULL",
+            [ids.into(), ctx.tenant_id.into()],
+        ))
+        .all(&state.db)
+        .await
+        .unwrap_or_default()
+        .into_iter()
+        .map(|p| (p.id, p.name))
+        .collect()
+    } else {
+        std::collections::HashMap::new()
+    };
+
+    let data: Vec<serde_json::Value> = items.into_iter().map(|a| {
+        let mut val = serde_json::to_value(&a).unwrap_or_default();
+        if let Some(obj) = val.as_object_mut() {
+            obj.insert("patient_name".to_string(), serde_json::json!(
+                patient_names.get(&a.patient_id).cloned()
+            ));
+        }
+        val
+    }).collect();
+
     Ok(Json(ApiResponse::ok(serde_json::json!({
-        "data": items,
+        "data": data,
         "total": total,
         "page": pagination.page.unwrap_or(1),
         "page_size": pagination.limit(),
diff --git a/crates/erp-health/src/dto/alert_dto.rs b/crates/erp-health/src/dto/alert_dto.rs
index 25be4f5..56c6cff 100644
--- a/crates/erp-health/src/dto/alert_dto.rs
+++ b/crates/erp-health/src/dto/alert_dto.rs
@@ -74,6 +74,7 @@ pub struct AcknowledgeAlertRequest {
 pub struct AlertResponse {
     pub id: Uuid,
     pub patient_id: Uuid,
+    pub patient_name: Option<String>,
     pub rule_id: Uuid,
     pub severity: String,
     pub title: String,
diff --git a/crates/erp-health/src/service/alert_service.rs b/crates/erp-health/src/service/alert_service.rs
index cedf0c9..f915f41 100644
--- a/crates/erp-health/src/service/alert_service.rs
+++ b/crates/erp-health/src/service/alert_service.rs
@@ -6,8 +6,9 @@ use uuid::Uuid;
 
 use erp_core::error::check_version;
 
+use crate::dto::alert_dto::AlertResponse;
 use crate::entity::alerts;
-use crate::entity::patient_doctor_relation;
+use crate::entity::{patient, patient_doctor_relation};
 use crate::error::{HealthError, HealthResult};
 use crate::service::validation;
 use crate::state::HealthState;
@@ -20,7 +21,7 @@ pub async fn list_alerts(
     status: Option<&str>,
     page: u64,
     page_size: u64,
-) -> HealthResult<(Vec<alerts::Model>, u64)> {
+) -> HealthResult<(Vec<AlertResponse>, u64)> {
     let limit = page_size.min(100);
     let offset = page.saturating_sub(1) * limit;
 
@@ -32,7 +33,6 @@ pub async fn list_alerts(
     if let Some(did) = doctor_id {
         let patient_ids = get_patient_ids_for_doctor(&state.db, tenant_id, did).await?;
         if patient_ids.is_empty() {
-            // 没有管床患者 → 直接返回空结果
             return Ok((vec![], 0));
         }
         query = query.filter(alerts::Column::PatientId.is_in(patient_ids));
@@ -47,13 +47,44 @@ pub async fn list_alerts(
     }
 
     let total = query.clone().count(&state.db).await?;
-    let items = query
+    let models = query
         .order_by_desc(alerts::Column::CreatedAt)
         .limit(limit)
         .offset(offset)
         .all(&state.db)
         .await?;
 
+    // 批量查询 patient_name
+    let patient_ids: std::collections::HashSet<Uuid> = models.iter().map(|m| m.patient_id).collect();
+    let patient_names: std::collections::HashMap<Uuid, String> = if !patient_ids.is_empty() {
+        patient::Entity::find()
+            .filter(patient::Column::Id.is_in(patient_ids))
+            .filter(patient::Column::TenantId.eq(tenant_id))
+            .all(&state.db)
+            .await?
+            .into_iter()
+            .map(|p| (p.id, p.name))
+            .collect()
+    } else {
+        std::collections::HashMap::new()
+    };
+
+    let items = models.into_iter().map(|m| AlertResponse {
+        id: m.id,
+        patient_id: m.patient_id,
+        patient_name: patient_names.get(&m.patient_id).cloned(),
+        rule_id: m.rule_id,
+        severity: m.severity,
+        title: m.title,
+        detail: m.detail,
+        status: m.status,
+        acknowledged_by: m.acknowledged_by,
+        acknowledged_at: m.acknowledged_at,
+        resolved_at: m.resolved_at,
+        created_at: m.created_at,
+        version: m.version,
+    }).collect();
+
     Ok((items, total))
 }
 
diff --git a/crates/erp-health/src/service/consultation_service.rs b/crates/erp-health/src/service/consultation_service.rs
index 0e97224..b6c64d5 100644
--- a/crates/erp-health/src/service/consultation_service.rs
+++ b/crates/erp-health/src/service/consultation_service.rs
@@ -142,8 +142,43 @@ pub async fn list_sessions(
         .all(&state.db)
         .await?;
 
+    // 批量查询 patient_name 和 doctor_name
+    let patient_ids: std::collections::HashSet<Uuid> = models.iter().map(|m| m.patient_id).collect();
+    let doctor_ids: std::collections::HashSet<Uuid> = models.iter().filter_map(|m| m.doctor_id).collect();
+
+    let patient_names: std::collections::HashMap<Uuid, String> = if !patient_ids.is_empty() {
+        patient::Entity::find()
+            .filter(patient::Column::Id.is_in(patient_ids))
+            .filter(patient::Column::TenantId.eq(tenant_id))
+            .all(&state.db)
+            .await?
+            .into_iter()
+            .map(|p| (p.id, p.name))
+            .collect()
+    } else {
+        std::collections::HashMap::new()
+    };
+
+    let doctor_names: std::collections::HashMap<Uuid, String> = if !doctor_ids.is_empty() {
+        doctor_profile::Entity::find()
+            .filter(doctor_profile::Column::Id.is_in(doctor_ids))
+            .filter(doctor_profile::Column::TenantId.eq(tenant_id))
+            .all(&state.db)
+            .await?
+            .into_iter()
+            .map(|d| (d.id, d.name))
+            .collect()
+    } else {
+        std::collections::HashMap::new()
+    };
+
     let total_pages = total.div_ceil(limit.max(1));
-    let data = models.into_iter().map(model_to_session_resp).collect();
+    let data = models.into_iter().map(|m| {
+        let mut resp = model_to_session_resp(m.clone());
+        resp.patient_name = patient_names.get(&m.patient_id).cloned();
+        resp.doctor_name = m.doctor_id.and_then(|did| doctor_names.get(&did).cloned());
+        resp
+    }).collect();
 
     Ok(PaginatedResponse { data, total, page, page_size: limit, total_pages })
 }