diff --git a/admin/src/views/consumer/assistant/index.vue b/admin/src/views/consumer/assistant/index.vue
index d4c72f30..185c6024 100644
--- a/admin/src/views/consumer/assistant/index.vue
+++ b/admin/src/views/consumer/assistant/index.vue
@@ -99,11 +99,13 @@ import EditPopup from './edit.vue'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 
-// 表单数据 - 固定role_id=1查询医助
+// 表单数据 - 固定role_id=2查询医助
 const formData = reactive({
     account: '',
     name: '',
-    role_id: 2  // 固定为医助角色
+    role_id: 2,  // 固定为医助角色
+    // 启用数据范围隔离：上级管理员只看到自己可见的医助；root/全部范围不受影响
+    apply_data_scope: 1
 })
 
 const showEdit = ref(false)
diff --git a/admin/src/views/permission/role/edit.vue b/admin/src/views/permission/role/edit.vue
index 7a2d35be..c87114fe 100644
--- a/admin/src/views/permission/role/edit.vue
+++ b/admin/src/views/permission/role/edit.vue
@@ -36,6 +36,18 @@
                 <el-form-item label="排序" prop="sort">
                     <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                 </el-form-item>
+                <el-form-item label="数据范围" prop="data_scope">
+                    <el-select
+                        v-model="formData.data_scope"
+                        placeholder="请选择数据范围"
+                        class="ls-input"
+                    >
+                        <el-option :value="1" label="全部数据（免隔离）" />
+                        <el-option :value="2" label="本部门及下级部门" />
+                        <el-option :value="3" label="仅本部门" />
+                        <el-option :value="4" label="仅本人" />
+                    </el-select>
+                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -58,6 +70,7 @@ const formData = reactive({
     name: '',
     desc: '',
     sort: 0,
+    data_scope: 1,
     menu_id: []
 })
 
diff --git a/admin/src/views/permission/role/index.vue b/admin/src/views/permission/role/index.vue
index 026c5aaa..ac06c78c 100644
--- a/admin/src/views/permission/role/index.vue
+++ b/admin/src/views/permission/role/index.vue
@@ -21,6 +21,11 @@
                             show-overflow-tooltip
                         />
                         <el-table-column prop="sort" label="排序" min-width="100" />
+                        <el-table-column label="数据范围" min-width="140">
+                            <template #default="{ row }">
+                                {{ dataScopeLabel(row.data_scope) }}
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="num" label="管理员人数" min-width="100" />
                         <el-table-column prop="create_time" label="创建时间" min-width="180" />
                         <el-table-column label="操作" width="200" fixed="right">
@@ -98,6 +103,18 @@ const handleAuth = async (data: any) => {
     authRef.value?.setFormData(data)
 }
 
+const dataScopeLabel = (scope: number | string | null | undefined) => {
+    const s = Number(scope) || 1
+    return (
+        ({
+            1: '全部数据（免隔离）',
+            2: '本部门及下级部门',
+            3: '仅本部门',
+            4: '仅本人'
+        } as Record<number, string>)[s] || '全部数据（免隔离）'
+    )
+}
+
 // 删除角色
 const handleDelete = async (id: number) => {
     await feedback.confirm('确定要删除？')
diff --git a/admin/src/views/tcm/diagnosis/index_h5.vue b/admin/src/views/tcm/diagnosis/index_h5.vue
index 76b20a6d..ad860cfd 100644
--- a/admin/src/views/tcm/diagnosis/index_h5.vue
+++ b/admin/src/views/tcm/diagnosis/index_h5.vue
@@ -1,137 +1,488 @@
 <template>
-    <div class="diagnosis-h5">
-        <!-- 顶部搜索 -->
-        <div class="h5-header">
-            <div class="h5-search">
+    <div class="dh5">
+        <!-- 顶部：搜索 + 日期/状态 chip 横滚 -->
+        <header class="dh5-topbar">
+            <div class="dh5-search">
                 <el-input
-                    v-model="keyword"
-                    placeholder="搜索患者姓名"
+                    v-model="formData.keyword"
+                    placeholder="患者姓名 / 手机号"
                     clearable
-                    prefix-icon="Search"
-                    @keyup.enter="handleSearch"
-                    @clear="handleSearch"
+                    :prefix-icon="Search"
+                    @keyup.enter="doSearch"
+                    @clear="doSearch"
                 />
+                <el-button class="dh5-search-btn" type="primary" @click="doSearch">查询</el-button>
             </div>
-            <div class="h5-filter-row">
-                <el-select v-model="formData.diagnosis_type" placeholder="诊断类型" clearable size="small" @change="handleSearch">
-                    <el-option
-                        v-for="item in diagnosisTypeOptions"
-                        :key="item.value"
-                        :label="item.name"
-                        :value="item.value"
-                    />
-                </el-select>
-                <el-select v-model="formData.syndrome_type" placeholder="证型" clearable size="small" @change="handleSearch">
-                    <el-option
-                        v-for="item in syndromeTypeOptions"
-                        :key="item.value"
-                        :label="item.name"
-                        :value="item.value"
-                    />
-                </el-select>
-                <el-select v-model="formData.assistant_id" placeholder="医助" clearable size="small" filterable @change="handleSearch">
-                    <el-option
-                        v-for="item in assistantOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="Number(item.id)"
-                    />
-                </el-select>
+
+            <div class="dh5-chips dh5-chips--scroll">
+                <span
+                    v-for="tab in dateTabs"
+                    :key="tab.value || 'all'"
+                    :class="[
+                        'dh5-chip',
+                        {
+                            active:
+                                formData.pending_assign !== '1' &&
+                                formData.pending_booking !== '1' &&
+                                formData.completed_appointment !== '1' &&
+                                formData.appointment_date === tab.value
+                        }
+                    ]"
+                    @click="handleDateTabClick(tab.value)"
+                >
+                    {{ tab.label }}
+                    <em v-if="dateCounts[tab.value] !== undefined">{{ dateCounts[tab.value] }}</em>
+                </span>
+                <span
+                    :class="['dh5-chip', 'dh5-chip--booking', { active: formData.pending_booking === '1' }]"
+                    @click="handlePendingBookingTabClick"
+                >
+                    待预约
+                    <em v-if="pendingBookingCount !== undefined">{{ pendingBookingCount }}</em>
+                </span>
+                <span
+                    :class="['dh5-chip', 'dh5-chip--done', { active: formData.completed_appointment === '1' }]"
+                    @click="handleCompletedVisitTabClick"
+                >
+                    已完成
+                    <em v-if="completedVisitCount !== undefined">{{ completedVisitCount }}</em>
+                </span>
+                <span
+                    v-if="hasPermission(['tcm.diagnosis/assign'])"
+                    :class="['dh5-chip', 'dh5-chip--pending', { active: formData.pending_assign === '1' }]"
+                    @click="handlePendingAssignTabClick"
+                >
+                    待分配医助
+                    <em v-if="pendingAssignCount !== undefined">{{ pendingAssignCount }}</em>
+                </span>
             </div>
-        </div>
+
+            <div class="dh5-quick">
+                <div class="dh5-quick-group">
+                    <span class="dh5-quick-label">挂号</span>
+                    <span
+                        v-for="opt in hasAptOptions"
+                        :key="'a' + opt.value"
+                        :class="['dh5-pill', { active: formData.has_appointment === opt.value }]"
+                        @click="setHasAppointment(opt.value)"
+                    >
+                        {{ opt.label }}
+                    </span>
+                </div>
+                <div class="dh5-quick-group">
+                    <span class="dh5-quick-label">确认</span>
+                    <span
+                        v-for="opt in confirmedOptions"
+                        :key="'c' + opt.value"
+                        :class="['dh5-pill', { active: formData.diagnosis_confirmed === opt.value }]"
+                        @click="setConfirmed(opt.value)"
+                    >
+                        {{ opt.label }}
+                    </span>
+                </div>
+                <el-button
+                    link
+                    type="primary"
+                    size="small"
+                    class="dh5-more-toggle"
+                    @click="showMoreFilter = !showMoreFilter"
+                >
+                    {{ showMoreFilter ? '收起' : '更多' }}
+                    <el-icon :class="{ 'rotate-180': showMoreFilter }"><ArrowDown /></el-icon>
+                </el-button>
+            </div>
+
+            <div v-show="showMoreFilter" class="dh5-more-filter">
+                <el-select v-model="formData.diagnosis_type" placeholder="诊断类型" clearable size="small" @change="doSearch">
+                    <el-option v-for="item in diagnosisTypeOptions" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+                <el-select v-model="formData.syndrome_type" placeholder="证型" clearable size="small" @change="doSearch">
+                    <el-option v-for="item in syndromeTypeOptions" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+                <el-select v-model="formData.assistant_id" placeholder="医助" clearable filterable size="small" @change="doSearch">
+                    <el-option v-for="item in assistantOptions" :key="item.id" :label="item.name" :value="Number(item.id)" />
+                </el-select>
+                <el-button size="small" @click="handleReset">重置</el-button>
+            </div>
+        </header>
 
         <!-- 卡片列表 -->
-        <div class="h5-list" v-loading="listLoading">
-            <div v-if="dataList.length === 0 && !listLoading" class="h5-empty">
-                <el-empty description="暂无诊单数据" />
+        <main class="dh5-list" v-loading="pager.loading">
+            <div v-if="pager.lists.length === 0 && !pager.loading" class="dh5-empty">
+                <el-empty description="暂无诊单" :image-size="120" />
             </div>
 
-            <div v-for="item in dataList" :key="item.id" class="h5-card">
-                <div class="h5-card-header">
-                    <div class="h5-card-name">
-                        <span class="name">{{ item.patient_name }}</span>
-                        <el-tag size="small" :type="item.gender === 1 ? 'primary' : 'danger'" effect="plain">
-                            {{ item.gender_desc }}
-                        </el-tag>
-                        <span v-if="item.age" class="age">{{ item.age }}岁</span>
+            <article
+                v-for="row in pager.lists"
+                :key="row.id"
+                :class="['dh5-card', getCardClass(row)]"
+            >
+                <!-- 卡片头：姓名 / 性别年龄 / 主状态 -->
+                <header class="dh5-card-head" @click="handleDetail(row.id)">
+                    <div class="dh5-card-avatar">
+                        {{ (row.patient_name || '患').charAt(0) }}
                     </div>
-                    <el-tag size="small" :type="item.status == 1 ? 'success' : 'danger'">
-                        {{ item.status == 1 ? '启用' : '禁用' }}
-                    </el-tag>
+                    <div class="dh5-card-id-name">
+                        <div class="dh5-card-name">
+                            {{ row.patient_name || '-' }}
+                            <span v-if="row.gender_desc" class="dh5-meta-gender">{{ row.gender_desc }}</span>
+                            <span v-if="row.age != null" class="dh5-meta-age">{{ row.age }}岁</span>
+                        </div>
+                        <div class="dh5-card-sub">
+                            #{{ row.id }} · {{ row.diagnosis_date_text || formatDateTime(row.create_time) }}
+                        </div>
+                    </div>
+                    <div class="dh5-card-tags">
+                        <span v-if="isDiagnosisConfirmed(row)" class="dh5-tag dh5-tag--ok">已确认</span>
+                        <span v-else class="dh5-tag dh5-tag--warn">未确认</span>
+                        <span v-if="row.has_prescription" class="dh5-tag dh5-tag--info">已开方</span>
+                    </div>
+                </header>
+
+                <!-- 卡片体：挂号 / 复诊 / 助理 / 类型 -->
+                <section class="dh5-card-body" @click="handleDetail(row.id)">
+                    <!-- 挂号块 -->
+                    <div :class="['dh5-row', 'dh5-row--apt', appointmentRowClass(row)]">
+                        <span class="dh5-row-key">挂号</span>
+                        <div class="dh5-row-val">
+                            <template v-if="row.has_appointment">
+                                <template v-if="appointmentRows(row).length">
+                                    <div
+                                        v-for="apt in appointmentRows(row)"
+                                        :key="apt.id || `${apt.doctor_id}-${apt.time_text}`"
+                                        :class="['dh5-apt-item', appointmentItemClass(apt)]"
+                                    >
+                                        <span class="dh5-apt-status">{{ appointmentStatusLabelByStatus(apt.status) }}</span>
+                                        <span class="dh5-apt-doctor">{{ apt.doctor_name || '-' }}</span>
+                                        <span class="dh5-apt-time">{{ apt.time_text || '-' }}</span>
+                                    </div>
+                                </template>
+                                <template v-else>
+                                    <span class="dh5-apt-status">{{ appointmentStatusLabel(row) }}</span>
+                                    <span class="dh5-apt-doctor">{{ row.appointment_doctor_name || '-' }}</span>
+                                    <span class="dh5-apt-time">{{ row.appointment_time_text || '-' }}</span>
+                                </template>
+                            </template>
+                            <span v-else class="dh5-apt-none">未挂号</span>
+                        </div>
+                    </div>
+
+                    <!-- 复诊块（仅已开方时显示） -->
+                    <div v-if="row.has_prescription" class="dh5-row dh5-row--followup">
+                        <span class="dh5-row-key">复诊</span>
+                        <div class="dh5-row-val">
+                            <span>{{ row.followup_time_text || '—' }}</span>
+                            <span class="dh5-meta-doctor">{{ row.followup_doctor_name || '—' }}</span>
+                            <span v-if="row.followup_rx_voided" class="dh5-tag dh5-tag--gray">处方作废</span>
+                        </div>
+                    </div>
+
+                    <!-- 助理 / 类型 -->
+                    <div class="dh5-row">
+                        <span class="dh5-row-key">助理</span>
+                        <span class="dh5-row-val">{{ getAssistantName(row.assistant_id || row.assistant) }}</span>
+                    </div>
+                    <div v-if="row.diagnosis_type" class="dh5-row">
+                        <span class="dh5-row-key">诊断</span>
+                        <span class="dh5-row-val">
+                            {{ getDictLabel(diagnosisTypeOptions, row.diagnosis_type) }}
+                            <span v-if="row.syndrome_type" class="dh5-meta-mute">·</span>
+                            <span v-if="row.syndrome_type">{{ getDictLabel(syndromeTypeOptions, row.syndrome_type) }}</span>
+                        </span>
+                    </div>
+                </section>
+
+                <!-- 视频旁观（受限角色 / 状态时只读说明） -->
+                <div v-if="watchCallVisibleForRow(row)" class="dh5-card-watch">
+                    <template v-if="canWatchCallEntry(row) && watchCallShowEnterButton(row)">
+                        <el-button type="primary" size="small" :icon="VideoCamera" @click="onWatchCallEntryClick(row)">
+                            进入旁观
+                        </el-button>
+                        <span class="dh5-watch-tip">{{ watchCallEnterTooltip(row) }}</span>
+                    </template>
+                    <template v-else>
+                        <span class="dh5-watch-mute">{{ canWatchCallEntry(row) ? watchCallAssistantIdleText(row) : watchCallPublicStatus(row) }}</span>
+                    </template>
                 </div>
 
-                <div class="h5-card-body" @click="handleDetail(item.id)">
-                    <div class="info-line">
-                        <span class="label">编号</span>
-                        <span class="value">{{ item.id }}</span>
-                    </div>
-                    <div class="info-line">
-                        <span class="label">诊断日期</span>
-                        <span class="value">{{ item.diagnosis_date_text || '-' }}</span>
-                    </div>
-                    <div class="info-line">
-                        <span class="label">诊断类型</span>
-                        <span class="value">{{ getDictLabel(diagnosisTypeOptions, item.diagnosis_type) }}</span>
-                    </div>
-                    <div class="info-line">
-                        <span class="label">证型</span>
-                        <span class="value">{{ getDictLabel(syndromeTypeOptions, item.syndrome_type) }}</span>
-                    </div>
-                    <div class="info-line">
-                        <span class="label">归属助理</span>
-                        <span class="value">{{ getAssistantName(item.assistant_id) }}</span>
-                    </div>
-                    <div class="info-line">
-                        <span class="label">创建时间</span>
-                        <span class="value">{{ formatDateTime(item.create_time) }}</span>
-                    </div>
-                </div>
+                <!-- 卡片操作：3 个常用 + 更多 -->
+                <footer class="dh5-card-foot">
+                    <el-button
+                        v-if="hasPermission(['tcm.diagnosis/edit'])"
+                        type="primary"
+                        size="small"
+                        plain
+                        @click="handleEdit(row.id)"
+                    >
+                        诊单
+                    </el-button>
+                    <el-button
+                        v-if="hasPermission(['tcm.diagnosis/kaifang'])"
+                        :type="prescriptionActionLabel(row) === '查看' ? 'success' : 'primary'"
+                        size="small"
+                        @click="handlePrescription(row)"
+                    >
+                        {{ prescriptionActionLabel(row) }}
+                    </el-button>
+                    <el-button
+                        v-if="hasPermission(['tcm.diagnosis/guahao'])"
+                        type="success"
+                        size="small"
+                        plain
+                        @click="handleAppointment(row)"
+                    >
+                        预约
+                    </el-button>
+                    <el-button
+                        size="small"
+                        class="dh5-more-btn"
+                        @click="openMoreSheet(row)"
+                    >
+                        更多<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+                    </el-button>
+                </footer>
+            </article>
 
-                <div class="h5-card-footer">
-                    <div class="action-scroll">
-                        <el-button type="primary" text size="small" @click="handleDetail(item.id)">查看</el-button>
-                        <el-button type="primary" text size="small" @click="handleEdit(item.id)">诊单</el-button>
-                        <el-button type="success" text size="small" @click="handleSingleAssign(item)">指派</el-button>
-                        <el-button type="success" text size="small" @click="handleAppointment(item)">预约</el-button>
-                        <el-button type="warning" text size="small" @click="handleMiniProgramQRCode(item)">二维码</el-button>
-                        <el-button type="primary" text size="small" @click="handleWechatRecords(item)">企微</el-button>
-                        <el-button type="danger" text size="small" @click="handleDelete(item.id)">删除</el-button>
-                    </div>
-                </div>
+            <div v-if="hasMore" class="dh5-load-more" @click="loadMore">
+                {{ pager.loading ? '加载中…' : '加载更多' }}
             </div>
+            <div v-if="!hasMore && pager.lists.length > 0" class="dh5-no-more">— 没有更多了 —</div>
+        </main>
 
-            <div v-if="hasMore" class="h5-load-more" @click="loadMore">
-                <span v-if="!moreLoading">加载更多</span>
-                <span v-else>加载中...</span>
-            </div>
-            <div v-if="!hasMore && dataList.length > 0" class="h5-no-more">没有更多了</div>
-        </div>
+        <!-- 悬浮新增 -->
+        <button
+            v-if="hasPermission(['tcm.diagnosis/add'])"
+            class="dh5-fab"
+            type="button"
+            aria-label="新增诊单"
+            @click="handleAdd"
+        >
+            <el-icon :size="22"><Plus /></el-icon>
+        </button>
 
-        <!-- 悬浮新增按钮 -->
-        <div class="h5-fab" @click="handleAdd">
-            <el-icon :size="24"><Plus /></el-icon>
-        </div>
-
-        <!-- 复用 edit / detail / appointment 弹窗组件 -->
-        <edit-popup ref="editRef" @success="handleSearch" />
+        <!-- 复用业务弹窗 -->
+        <edit-popup ref="editRef" @success="refreshListAfterPopupSave" />
         <detail-popup ref="detailRef" />
-        <appointment-popup ref="appointmentRef" @success="handleSearch" />
+        <tcm-prescription ref="prescriptionRef" @success="onPrescriptionSuccess" />
+        <appointment-popup ref="appointmentRef" @success="refreshListAfterPopupSave" />
+        <assistant-watch-call-dialog
+            v-model="watchCallDialogVisible"
+            :diagnosis-id="watchCallDiagnosisId"
+            @closed="getLists"
+        />
 
-        <!-- 小程序二维码弹窗 -->
-        <el-dialog v-model="qrcodeDialogVisible" title="小程序二维码" width="90%" :close-on-click-modal="false">
-            <div class="flex flex-col items-center justify-center py-4">
-                <div v-if="qrcodeLoading" class="text-center">
-                    <el-icon class="is-loading" :size="40"><Loading /></el-icon>
-                    <div class="mt-4 text-gray-500">生成中...</div>
+        <!-- 行操作 Action Sheet -->
+        <el-drawer
+            v-model="moreSheetVisible"
+            :title="moreSheetRow ? `${moreSheetRow.patient_name || '诊单'} · 更多操作` : '更多操作'"
+            direction="btt"
+            size="auto"
+            :with-header="true"
+            :destroy-on-close="true"
+        >
+            <div class="dh5-actions" v-if="moreSheetRow">
+                <button
+                    v-if="hasPermission(['tcm.diagnosis/assign'])"
+                    class="dh5-action"
+                    @click="runAction('assign')"
+                >
+                    <el-icon><User /></el-icon>
+                    <span>指派医助</span>
+                </button>
+                <button
+                    v-if="isAppointmentActiveForVideo(moreSheetRow) && hasPermission(['tcm.diagnosis/videoQr'])"
+                    class="dh5-action"
+                    @click="runAction('videoQr')"
+                >
+                    <el-icon><Picture /></el-icon>
+                    <span>视频二维码</span>
+                </button>
+                <button
+                    v-if="isAppointmentActiveForVideo(moreSheetRow) && hasPermission(['tcm.diagnosis/guahao'])"
+                    class="dh5-action"
+                    @click="runAction('confirmQr')"
+                >
+                    <el-icon><Picture /></el-icon>
+                    <span>诊单二维码</span>
+                </button>
+                <button
+                    v-if="canCancelAppointmentRow(moreSheetRow) && hasPermission(['tcm.diagnosis/guahao'])"
+                    class="dh5-action"
+                    @click="runAction('cancelApt')"
+                >
+                    <el-icon><CircleClose /></el-icon>
+                    <span>取消挂号</span>
+                </button>
+                <button
+                    v-if="hasPermission(['tcm.diagnosis/edit'])"
+                    class="dh5-action"
+                    @click="runAction('fillIdCard')"
+                >
+                    <el-icon><Postcard /></el-icon>
+                    <span>补全身份证</span>
+                </button>
+                <button
+                    v-if="hasPermission(['tcm.diagnosis/order'])"
+                    class="dh5-action"
+                    @click="runAction('order')"
+                >
+                    <el-icon><Document /></el-icon>
+                    <span>创建订单</span>
+                </button>
+                <button class="dh5-action" @click="runAction('wechat')">
+                    <el-icon><ChatDotRound /></el-icon>
+                    <span>企微记录</span>
+                </button>
+                <button
+                    v-if="hasPermission(['tcm.diagnosis/delete'])"
+                    class="dh5-action dh5-action--danger"
+                    @click="runAction('delete')"
+                >
+                    <el-icon><Delete /></el-icon>
+                    <span>删除诊单</span>
+                </button>
+            </div>
+        </el-drawer>
+
+        <!-- 指派医助 Drawer -->
+        <el-drawer v-model="assignDialogVisible" title="指派医助" direction="btt" size="46%">
+            <el-form :model="assignForm" label-position="top" class="dh5-form">
+                <el-form-item label="选择医助" required>
+                    <el-select
+                        v-model="assignForm.assistant_id"
+                        placeholder="请选择医助"
+                        class="!w-full"
+                        filterable
+                        clearable
+                    >
+                        <el-option
+                            v-for="item in assistantOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="Number(item.id)"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="诊单信息">
+                    <div class="dh5-form-tip">
+                        <div>患者：{{ currentRow?.patient_name }}</div>
+                        <div>诊断日期：{{ currentRow?.diagnosis_date_text || '—' }}</div>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button class="dh5-flex1" @click="assignDialogVisible = false">取消</el-button>
+                <el-button class="dh5-flex1" type="primary" :loading="assignLoading" @click="handleConfirmAssign">
+                    确定指派
+                </el-button>
+            </template>
+        </el-drawer>
+
+        <!-- 创建订单 Drawer -->
+        <el-drawer v-model="createOrderVisible" title="创建订单" direction="btt" size="64%" @close="resetOrderForm">
+            <el-form
+                ref="orderFormRef"
+                :model="orderForm"
+                :rules="orderRules"
+                label-position="top"
+                class="dh5-form"
+            >
+                <el-form-item label="患者">
+                    <span>{{ orderForm.patient_name }} ({{ maskPhone(orderForm.phone) }})</span>
+                </el-form-item>
+                <el-form-item label="订单类型" prop="order_type">
+                    <el-select v-model="orderForm.order_type" placeholder="请选择" class="!w-full">
+                        <el-option label="挂号费" :value="1" />
+                        <el-option label="问诊费" :value="2" />
+                        <el-option label="药品费用" :value="3" />
+                        <el-option label="首付费用" :value="4" />
+                        <el-option label="尾款费用" :value="5" />
+                        <el-option label="其他费用" :value="6" />
+                        <el-option label="全部费用" :value="7" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单金额" prop="amount">
+                    <el-input-number
+                        v-model="orderForm.amount"
+                        :min="0"
+                        :step="0.01"
+                        :precision="2"
+                        placeholder="请输入金额"
+                        class="!w-full"
+                    />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input
+                        v-model="orderForm.remark"
+                        type="textarea"
+                        :rows="3"
+                        placeholder="请输入备注（可选）"
+                    />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button class="dh5-flex1" @click="createOrderVisible = false">取消</el-button>
+                <el-button class="dh5-flex1" type="primary" :loading="orderLoading" @click="submitOrder">
+                    创建订单
+                </el-button>
+            </template>
+        </el-drawer>
+
+        <!-- 补全身份证 Dialog -->
+        <el-dialog
+            v-model="fillIdCardVisible"
+            title="补全身份证号"
+            :close-on-click-modal="false"
+            @close="fillIdCardForm.id_card = ''"
+        >
+            <el-form
+                ref="fillIdCardFormRef"
+                :model="fillIdCardForm"
+                :rules="fillIdCardRules"
+                label-position="top"
+                class="dh5-form"
+            >
+                <el-form-item label="患者">
+                    <span class="font-medium">{{ fillIdCardForm.patient_name }}</span>
+                </el-form-item>
+                <el-form-item label="身份证号" prop="id_card">
+                    <el-input
+                        v-model="fillIdCardForm.id_card"
+                        placeholder="请输入15或18位身份证号"
+                        maxlength="18"
+                        show-word-limit
+                        clearable
+                    />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="fillIdCardVisible = false">取消</el-button>
+                <el-button type="primary" :loading="fillIdCardLoading" @click="submitFillIdCard">
+                    提交
+                </el-button>
+            </template>
+        </el-dialog>
+
+        <!-- 二维码 Dialog -->
+        <el-dialog
+            v-model="qrcodeDialogVisible"
+            :title="qrcodeDialogTitle"
+            :close-on-click-modal="false"
+        >
+            <div class="dh5-qr">
+                <div v-if="qrcodeLoading" class="dh5-qr-loading">
+                    <el-icon class="is-loading" :size="36"><Loading /></el-icon>
+                    <div class="dh5-qr-tip">生成中...</div>
                 </div>
-                <div v-else-if="qrcodeUrl" class="text-center">
-                    <img :src="qrcodeUrl" alt="小程序二维码" class="w-48 h-48 border border-gray-200 rounded" />
-                    <div class="mt-4 text-sm text-gray-600">
+                <div v-else-if="qrcodeUrl">
+                    <img :src="qrcodeUrl" alt="小程序二维码" class="dh5-qr-img" />
+                    <div class="dh5-qr-meta">
                         <div>患者：{{ currentQRCodePatient?.patient_name }}</div>
-                        <div class="mt-2">请使用微信扫描二维码</div>
+                        <div>挂号时间：{{ qrcodeAppointmentTimeText }}</div>
+                        <div class="dh5-qr-hint">请使用企业微信扫描二维码，然后转发给患者</div>
                     </div>
                 </div>
-                <div v-else class="text-center text-gray-500">生成失败，请重试</div>
+                <div v-else class="dh5-qr-fail">生成失败，请重试</div>
             </div>
             <template #footer>
                 <el-button @click="qrcodeDialogVisible = false">关闭</el-button>
@@ -139,33 +490,7 @@
             </template>
         </el-dialog>
 
-        <!-- 指派医助弹窗 -->
-        <el-drawer
-            v-model="assignDialogVisible"
-            :title="'指派医助'"
-            direction="btt"
-            size="40%"
-        >
-            <el-form :model="assignForm" label-position="top" class="h5-form">
-                <el-form-item label="选择医助" required>
-                    <el-select v-model="assignForm.assistant_id" placeholder="请选择医助" class="!w-full" filterable clearable>
-                        <el-option v-for="item in assistantOptions" :key="item.id" :label="item.name" :value="Number(item.id)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="诊单信息">
-                    <div class="text-gray-500 text-sm">
-                        <div>患者：{{ currentRow?.patient_name }}</div>
-                        <div>诊断日期：{{ currentRow?.diagnosis_date_text }}</div>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <el-button class="flex-1" @click="assignDialogVisible = false">取消</el-button>
-                <el-button class="flex-1" type="primary" @click="handleConfirmAssign" :loading="assignLoading">确定指派</el-button>
-            </template>
-        </el-drawer>
-
-        <!-- 企微聊天记录抽屉 -->
+        <!-- 企微记录 Drawer -->
         <el-drawer
             v-model="wechatDrawerVisible"
             :title="`企微记录 - ${wechatCurrentPatient?.patient_name || ''}`"
@@ -173,64 +498,138 @@
             size="100%"
             :destroy-on-close="true"
         >
-            <!-- 添加记录 -->
-            <div class="mb-3">
-                <div class="flex gap-2">
-                    <el-input v-model="wechatNewNote" type="textarea" :rows="2" placeholder="添加沟通记录..." class="flex-1" />
-                    <el-button type="primary" @click="handleAddRecord" :loading="wechatAddLoading" class="self-end" size="small">添加</el-button>
+            <div v-if="wechatContactInfo" class="dh5-wx-contact">
+                <div class="dh5-wx-contact-row">
+                    <span class="dh5-wx-key">手机号</span>
+                    <span class="dh5-wx-val">{{ maskPhone(wechatContactInfo.phone) || '-' }}</span>
+                </div>
+                <div class="dh5-wx-contact-row">
+                    <span class="dh5-wx-key">企微 ID</span>
+                    <span class="dh5-wx-val">
+                        <span v-if="wechatContactInfo.external_userid">{{ wechatContactInfo.external_userid }}</span>
+                        <el-tag v-else type="info" size="small">未关联</el-tag>
+                    </span>
+                </div>
+                <div class="dh5-wx-contact-row">
+                    <span class="dh5-wx-key">会话存档</span>
+                    <span class="dh5-wx-val">
+                        <el-tag v-if="wechatContactInfo.msgaudit_enabled" type="success" size="small">已开通</el-tag>
+                        <el-tag v-else type="info" size="small">未配置</el-tag>
+                    </span>
                 </div>
             </div>
 
-            <!-- 记录列表 -->
-            <div v-loading="wechatRecordsLoading">
-                <div v-if="wechatRecords.length === 0 && !wechatRecordsLoading" class="text-center text-gray-400 py-10">暂无聊天记录</div>
-                <div v-else class="record-list">
-                    <div v-for="record in wechatRecords" :key="record.id" class="record-item">
-                        <div class="record-header">
-                            <div class="flex items-center gap-1 flex-wrap">
+            <div class="dh5-wx-add">
+                <el-input
+                    v-model="wechatNewNote"
+                    type="textarea"
+                    :rows="2"
+                    placeholder="添加沟通记录..."
+                />
+                <el-button
+                    type="primary"
+                    :loading="wechatAddLoading"
+                    size="small"
+                    @click="handleAddRecord"
+                >
+                    添加
+                </el-button>
+            </div>
+
+            <div v-loading="wechatRecordsLoading" class="dh5-wx-list-wrap">
+                <div v-if="wechatRecords.length === 0 && !wechatRecordsLoading" class="dh5-wx-empty">
+                    暂无聊天记录
+                </div>
+                <div v-else class="dh5-wx-list">
+                    <div v-for="record in wechatRecords" :key="record.id" class="dh5-wx-item">
+                        <div class="dh5-wx-head">
+                            <div class="dh5-wx-head-left">
                                 <el-tag :type="record.direction === 0 ? 'primary' : 'success'" size="small">
                                     {{ record.direction === 0 ? '员工' : '客户' }}
                                 </el-tag>
-                                <span class="font-medium text-xs">
+                                <span class="dh5-wx-name">
                                     {{ record.direction === 0 ? record.staff_name : record.external_name || wechatCurrentPatient?.patient_name }}
                                 </span>
                                 <el-tag v-if="record.msg_type === 'note'" type="warning" size="small">备注</el-tag>
                             </div>
-                            <div class="flex items-center gap-1">
-                                <span class="text-xs text-gray-400">{{ formatTimestamp(record.chat_time) }}</span>
-                                <el-button type="danger" link size="small" @click="handleDeleteRecord(record.id)">删除</el-button>
+                            <div class="dh5-wx-head-right">
+                                <span class="dh5-wx-time">{{ formatTimestamp(record.chat_time) }}</span>
+                                <el-button type="danger" link size="small" @click="handleDeleteRecord(record.id)">
+                                    删除
+                                </el-button>
                             </div>
                         </div>
-                        <div class="record-content">{{ record.content }}</div>
-                        <div v-if="record.media_url" class="mt-1">
-                            <el-image :src="record.media_url" style="max-width: 180px" fit="contain" :preview-src-list="[record.media_url]" />
+                        <div class="dh5-wx-content">{{ record.content }}</div>
+                        <div v-if="record.media_url" class="dh5-wx-media">
+                            <el-image
+                                :src="record.media_url"
+                                style="max-width: 200px"
+                                fit="contain"
+                                :preview-src-list="[record.media_url]"
+                            />
                         </div>
                     </div>
                 </div>
-                <div v-if="wechatRecordTotal > wechatRecords.length" class="h5-load-more" @click="loadMoreRecords">加载更多</div>
+                <div v-if="wechatRecordTotal > wechatRecords.length" class="dh5-load-more" @click="loadMoreRecords">
+                    加载更多
+                </div>
             </div>
         </el-drawer>
     </div>
 </template>
 
 <script setup lang="ts" name="tcmDiagnosisH5">
-import { tcmDiagnosisLists, tcmDiagnosisDelete, tcmDiagnosisAssign, getAssistants, generateMiniProgramQrcode, getWechatChatRecords, addWechatChatRecord, deleteWechatChatRecord, getWechatExternalContact } from '@/api/tcm'
+import {
+    tcmDiagnosisLists,
+    tcmDiagnosisDelete,
+    tcmDiagnosisAssign,
+    getAssistants,
+    generateMiniProgramQrcode,
+    generateOrderQrcode,
+    getWechatChatRecords,
+    addWechatChatRecord,
+    deleteWechatChatRecord,
+    getWechatExternalContact,
+    fillIdCard
+} from '@/api/tcm'
+import { orderCreate } from '@/api/order'
+import { cancelAppointment } from '@/api/doctor'
 import { getDictData } from '@/api/app'
 import { getWeappConfig } from '@/api/channel/weapp'
+import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'
-import { Loading, Plus } from '@element-plus/icons-vue'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-import AppointmentPopup from './appointment.vue'
+import { hasPermission } from '@/utils/perm'
+import {
+    Loading,
+    Plus,
+    Search,
+    ArrowDown,
+    Picture,
+    User,
+    Document,
+    Delete,
+    CircleClose,
+    Postcard,
+    ChatDotRound,
+    VideoCamera
+} from '@element-plus/icons-vue'
 import useUserStore from '@/stores/modules/user'
+import { defineAsyncComponent, computed, reactive, ref, onMounted, onUnmounted } from 'vue'
 import dayjs from 'dayjs'
 
+const EditPopup = defineAsyncComponent(() => import('./edit.vue'))
+const DetailPopup = defineAsyncComponent(() => import('./detail.vue'))
+const TcmPrescription = defineAsyncComponent(() => import('@/components/tcm-prescription/index.vue'))
+const AppointmentPopup = defineAsyncComponent(() => import('./appointment.vue'))
+const AssistantWatchCallDialog = defineAsyncComponent(() => import('./components/AssistantWatchCallDialog.vue'))
+
 const userStore = useUserStore()
 
+// ========== 工具 ==========
 const formatDateTime = (timestamp: number | string) => {
     if (!timestamp) return '-'
     const ts = String(timestamp).length === 10 ? Number(timestamp) * 1000 : Number(timestamp)
-    return dayjs(ts).format('YYYY-MM-DD HH:mm:ss')
+    return dayjs(ts).format('YYYY-MM-DD HH:mm')
 }
 
 const formatTimestamp = (ts: number) => {
@@ -239,22 +638,216 @@ const formatTimestamp = (ts: number) => {
     return dayjs(t).format('YYYY-MM-DD HH:mm')
 }
 
-// ==================== 列表 ====================
-const keyword = ref('')
-const formData = ref({
-    patient_name: '',
+const maskPhone = (phone: string) => {
+    if (!phone || phone.length < 11) return phone
+    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+}
+
+const pad = (n: number) => String(n).padStart(2, '0')
+const yesterdayStr = computed(() => {
+    const t = new Date(); t.setDate(t.getDate() - 1)
+    return `${t.getFullYear()}-${pad(t.getMonth() + 1)}-${pad(t.getDate())}`
+})
+const dayBeforeStr = computed(() => {
+    const t = new Date(); t.setDate(t.getDate() - 2)
+    return `${t.getFullYear()}-${pad(t.getMonth() + 1)}-${pad(t.getDate())}`
+})
+const todayStr = computed(() => {
+    const t = new Date()
+    return `${t.getFullYear()}-${pad(t.getMonth() + 1)}-${pad(t.getDate())}`
+})
+const tomorrowStr = computed(() => {
+    const t = new Date(); t.setDate(t.getDate() + 1)
+    return `${t.getFullYear()}-${pad(t.getMonth() + 1)}-${pad(t.getDate())}`
+})
+const dayAfterStr = computed(() => {
+    const t = new Date(); t.setDate(t.getDate() + 2)
+    return `${t.getFullYear()}-${pad(t.getMonth() + 1)}-${pad(t.getDate())}`
+})
+
+// ========== 表单 / 列表 ==========
+const formData = reactive({
+    keyword: '',
     diagnosis_type: '',
     syndrome_type: '',
-    assistant_id: '' as string | number
+    assistant_id: '',
+    diagnosis_confirmed: '' as '' | '0' | '1',
+    appointment_date: '' as string,
+    has_appointment: '' as '' | '0' | '1',
+    pending_assign: '' as '' | '1',
+    pending_booking: '' as '' | '1',
+    completed_appointment: '' as '' | '1'
 })
-const dataList = ref<any[]>([])
-const listLoading = ref(false)
-const moreLoading = ref(false)
-const pageNo = ref(1)
-const pageSize = 15
-const total = ref(0)
-const hasMore = computed(() => dataList.value.length < total.value)
 
+const showMoreFilter = ref(false)
+const hasAptOptions = [
+    { label: '全部', value: '' },
+    { label: '已挂号', value: '1' },
+    { label: '未挂号', value: '0' }
+]
+const confirmedOptions = [
+    { label: '全部', value: '' },
+    { label: '已确认', value: '1' },
+    { label: '未确认', value: '0' }
+]
+
+const dateTabs = computed(() => [
+    { label: '昨天挂号', value: yesterdayStr.value },
+    { label: '前天挂号', value: dayBeforeStr.value },
+    { label: '当天挂号', value: todayStr.value },
+    { label: '明天挂号', value: tomorrowStr.value },
+    { label: '后天挂号', value: dayAfterStr.value },
+    { label: '全部', value: '' }
+])
+
+const dateCounts = ref<Record<string, number>>({})
+const pendingBookingCount = ref<number | undefined>(undefined)
+const completedVisitCount = ref<number | undefined>(undefined)
+const pendingAssignCount = ref<number | undefined>(undefined)
+
+const { pager, getLists } = usePaging({
+    fetchFun: tcmDiagnosisLists,
+    params: formData
+})
+
+const hasMore = computed(() => pager.lists.length < (pager.count || 0))
+
+const refreshListAfterPopupSave = () => getLists({ silent: true })
+
+const doSearch = () => {
+    pager.page = 1
+    getLists()
+    fetchDateCounts()
+}
+
+const handleReset = () => {
+    formData.keyword = ''
+    formData.diagnosis_type = ''
+    formData.syndrome_type = ''
+    formData.assistant_id = ''
+    formData.diagnosis_confirmed = ''
+    formData.appointment_date = todayStr.value
+    formData.has_appointment = ''
+    formData.pending_assign = ''
+    formData.pending_booking = ''
+    formData.completed_appointment = ''
+    pager.page = 1
+    getLists()
+    fetchDateCounts()
+}
+
+const setHasAppointment = (v: string) => {
+    formData.has_appointment = v as '' | '0' | '1'
+    formData.pending_booking = ''
+    formData.completed_appointment = ''
+    pager.page = 1
+    getLists()
+    fetchDateCounts()
+}
+
+const setConfirmed = (v: string) => {
+    formData.diagnosis_confirmed = v as '' | '0' | '1'
+    formData.pending_booking = ''
+    formData.completed_appointment = ''
+    pager.page = 1
+    getLists()
+    fetchDateCounts()
+}
+
+const handleDateTabClick = async (value: string) => {
+    formData.pending_assign = ''
+    formData.pending_booking = ''
+    formData.completed_appointment = ''
+    formData.has_appointment = ''
+    formData.appointment_date = value
+    pager.page = 1
+    await getLists()
+    fetchDateCounts()
+}
+
+const handlePendingBookingTabClick = async () => {
+    formData.pending_assign = ''
+    formData.pending_booking = '1'
+    formData.completed_appointment = ''
+    formData.appointment_date = ''
+    formData.has_appointment = '0'
+    pager.page = 1
+    await getLists()
+    fetchDateCounts()
+}
+
+const handleCompletedVisitTabClick = async () => {
+    formData.pending_assign = ''
+    formData.pending_booking = ''
+    formData.completed_appointment = '1'
+    formData.has_appointment = ''
+    formData.appointment_date = ''
+    pager.page = 1
+    await getLists()
+    fetchDateCounts()
+}
+
+const handlePendingAssignTabClick = async () => {
+    formData.pending_assign = '1'
+    formData.pending_booking = ''
+    formData.completed_appointment = ''
+    formData.has_appointment = ''
+    formData.appointment_date = ''
+    pager.page = 1
+    await getLists()
+    fetchDateCounts()
+}
+
+const fetchDateCounts = async () => {
+    try {
+        const [yesterday, dayBefore, today, tomorrow, dayAfter, all, noApt, doneVisit, pending] = await Promise.all([
+            tcmDiagnosisLists({ appointment_date: yesterdayStr.value, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ appointment_date: dayBeforeStr.value, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ appointment_date: todayStr.value, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ appointment_date: tomorrowStr.value, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ appointment_date: dayAfterStr.value, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ has_appointment: 0, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ completed_appointment: 1, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists({ pending_assign: 1, page_no: 1, page_size: 1 })
+        ])
+        dateCounts.value = {
+            [yesterdayStr.value]: yesterday?.count ?? 0,
+            [dayBeforeStr.value]: dayBefore?.count ?? 0,
+            [todayStr.value]: today?.count ?? 0,
+            [tomorrowStr.value]: tomorrow?.count ?? 0,
+            [dayAfterStr.value]: dayAfter?.count ?? 0,
+            '': all?.count ?? 0
+        }
+        pendingBookingCount.value = noApt?.count ?? 0
+        completedVisitCount.value = doneVisit?.count ?? 0
+        pendingAssignCount.value = pending?.count ?? 0
+    } catch (e) {
+        console.error('获取日期数量失败', e)
+    }
+}
+
+const loadMore = async () => {
+    if (pager.loading || !hasMore.value) return
+    const next = (pager.page || 1) + 1
+    pager.loading = true
+    try {
+        const res = await tcmDiagnosisLists({
+            page_no: next,
+            page_size: pager.size,
+            ...formData
+        })
+        pager.page = next
+        pager.lists.push(...(res?.lists || []))
+        pager.count = res?.count ?? pager.count
+    } catch (e) {
+        console.error('加载更多失败:', e)
+    } finally {
+        pager.loading = false
+    }
+}
+
+// ========== 字典 ==========
 const diagnosisTypeOptions = ref<any[]>([])
 const syndromeTypeOptions = ref<any[]>([])
 const assistantOptions = ref<any[]>([])
@@ -269,8 +862,8 @@ const getDictOptions = async () => {
         diagnosisTypeOptions.value = diagnosisType?.diagnosis_type || []
         syndromeTypeOptions.value = syndromeType?.syndrome_type || []
         assistantOptions.value = assistants || []
-    } catch (error) {
-        console.error('获取字典数据失败:', error)
+    } catch (e) {
+        console.error('获取字典数据失败:', e)
     }
 }
 
@@ -279,127 +872,468 @@ const getDictLabel = (options: any[], value: string) => {
     return item ? item.name : value || '-'
 }
 
-const getAssistantName = (assistantId: number | string) => {
+const getAssistantName = (assistantId: number | string | null | undefined) => {
     if (!assistantId && assistantId !== 0) return '-'
-    const id = typeof assistantId === 'string' ? parseInt(assistantId) : assistantId
+    const id = typeof assistantId === 'string' ? parseInt(assistantId) : (assistantId as number)
     if (assistantOptions.value.length === 0) return '...'
-    const assistant = assistantOptions.value.find(item => {
+    const a = assistantOptions.value.find(item => {
         const itemId = typeof item.id === 'string' ? parseInt(item.id) : item.id
         return itemId === id
     })
-    return assistant ? assistant.name : '-'
+    return a ? a.name : '-'
 }
 
-const loadList = async (isLoadMore = false) => {
-    if (isLoadMore) { moreLoading.value = true } else { listLoading.value = true }
-    try {
-        const params: any = {
-            page_no: pageNo.value,
-            page_size: pageSize,
-            ...formData.value
-        }
-        if (keyword.value) params.patient_name = keyword.value
-        const res = await tcmDiagnosisLists(params)
-        if (isLoadMore) {
-            dataList.value = [...dataList.value, ...(res.lists || [])]
-        } else {
-            dataList.value = res.lists || []
-        }
-        total.value = res.count || 0
-    } catch (error) {
-        console.error(error)
-    } finally {
-        listLoading.value = false
-        moreLoading.value = false
+// ========== 列卡片状态 ==========
+const isDiagnosisConfirmed = (row: any) => {
+    const records = row.DiagnosisViewRecord || []
+    return records.length > 0 && records.some((r: any) => r.is_confirmed == 1)
+}
+
+const getCardClass = (row: any) => {
+    if (!isDiagnosisConfirmed(row)) return 'dh5-card--unconfirmed'
+    if (!row.has_appointment) return 'dh5-card--noapt'
+    return ''
+}
+
+const appointmentStatusLabel = (row: any) => {
+    const s = Number(row.appointment_status)
+    if (s === 3) return '已完成'
+    if (s === 4) return '已过号'
+    return '已挂号'
+}
+
+const appointmentStatusLabelByStatus = (status: number | string) => {
+    const s = Number(status)
+    if (s === 3) return '已完成'
+    if (s === 4) return '已过号'
+    return '已挂号'
+}
+
+const appointmentRows = (row: any) => {
+    const list = Array.isArray(row.appointments) ? row.appointments : []
+    if (list.length > 0) return list
+    if (!row.has_appointment) return []
+    return [{
+        id: row.appointment_id,
+        status: row.appointment_status,
+        doctor_id: row.appointment_doctor_id,
+        doctor_name: row.appointment_doctor_name,
+        time_text: row.appointment_time_text
+    }]
+}
+
+const appointmentItemClass = (apt: any) => {
+    const s = Number(apt?.status)
+    return {
+        'dh5-apt-item--done': s === 3,
+        'dh5-apt-item--missed': s === 4,
+        'dh5-apt-item--active': s === 1
     }
 }
 
-const handleSearch = () => { pageNo.value = 1; loadList() }
-const loadMore = () => { if (moreLoading.value) return; pageNo.value++; loadList(true) }
+const appointmentRowClass = (row: any) => {
+    const s = Number(row.appointment_status)
+    return {
+        'has-apt': row.has_appointment,
+        'apt-row-done': row.has_appointment && s === 3,
+        'apt-row-missed': row.has_appointment && s === 4
+    }
+}
 
-// ==================== 新增 / 编辑 / 详情 ====================
+const isAppointmentActiveForVideo = (row: any) =>
+    row.has_appointment && Number(row.appointment_status) === 1
+
+const canCancelAppointmentRow = (row: any) => {
+    const s = Number(row.appointment_status)
+    return !!(row.has_appointment && row.appointment_id && (s === 1 || s === 4))
+}
+
+// 视频旁观（与 PC 端一致）
+type VideoCallHint = { state: string; label: string; start_time?: number; end_time?: number }
+const isAssignedAssistant = (row: any) => {
+    const aid = row.assistant_id ?? row.assistant
+    if (aid === null || aid === undefined || aid === '') return false
+    return Number(aid) === Number(userStore.userInfo?.id)
+}
+const canWatchCallEntry = (row: any) =>
+    isAssignedAssistant(row) && hasPermission(['tcm.diagnosis/watchCall'])
+const watchCallState = (row: any) => (row.video_call_hint?.state as string) || 'none'
+const watchCallShowEnterButton = (row: any) => {
+    const st = watchCallState(row)
+    return st === 'live' || st === 'pending_room'
+}
+const watchCallEnterTooltip = (row: any) => {
+    if (watchCallState(row) === 'pending_room') {
+        return '医生未接通或未同步房间'
+    }
+    return '点击进入实时房间'
+}
+const watchCallAssistantIdleText = (row: any) => {
+    const h = row.video_call_hint as VideoCallHint | undefined
+    if (h?.label) return h.label
+    return '暂无可旁观通话'
+}
+const watchCallPublicStatus = (row: any) => {
+    const st = watchCallState(row)
+    if (st === 'none') return ''
+    if (st === 'live') return '通话中'
+    if (st === 'pending_room') return '接通中'
+    const h = row.video_call_hint as VideoCallHint | undefined
+    return h?.label || ''
+}
+/** 是否需要在卡片显示视频旁观条 */
+const watchCallVisibleForRow = (row: any) => {
+    if (canWatchCallEntry(row)) return true
+    const st = watchCallState(row)
+    return st === 'live' || st === 'pending_room'
+}
+const watchCallDialogVisible = ref(false)
+const watchCallDiagnosisId = ref(0)
+const onWatchCallEntryClick = (row: any) => {
+    if (watchCallState(row) !== 'live') {
+        feedback.msgWarning('医生未接通或未同步房间号，请稍后再试')
+        return
+    }
+    watchCallDiagnosisId.value = Number(row.id) || 0
+    watchCallDialogVisible.value = true
+}
+
+// ========== 主操作 ==========
 const editRef = ref()
 const detailRef = ref()
+const prescriptionRef = ref()
 const appointmentRef = ref()
 
-const handleAdd = () => editRef.value.open('add')
-const handleEdit = (id: number) => editRef.value.open('edit', id)
-const handleDetail = (id: number) => detailRef.value.open(id)
+const handleAdd = () => editRef.value?.open('add')
+const handleEdit = (id: number) => editRef.value?.open('edit', id)
+const handleDetail = (id: number) => detailRef.value?.open(id)
 
-const handleDelete = async (id: number) => {
-    await feedback.confirm('确定要删除该诊单吗？')
-    await tcmDiagnosisDelete({ id })
-    handleSearch()
-}
-
-// ==================== 指派医助 ====================
-const assignDialogVisible = ref(false)
-const assignLoading = ref(false)
-const currentRow = ref<any>(null)
-const assignForm = ref({ assistant_id: null as number | null })
-
-const handleSingleAssign = (row: any) => {
-    currentRow.value = row
-    assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null
-    assignDialogVisible.value = true
-}
-
-const handleConfirmAssign = async () => {
-    if (!assignForm.value.assistant_id) { feedback.msgWarning('请选择医助'); return }
-    assignLoading.value = true
-    try {
-        await tcmDiagnosisAssign({ id: currentRow.value.id, assistant_id: assignForm.value.assistant_id })
-        assignDialogVisible.value = false
-        handleSearch()
-    } catch (error) {
-        console.error('指派失败:', error)
-    } finally {
-        assignLoading.value = false
+const prescriptionActionLabel = (row: any) => {
+    if (
+        row?.prescription_audit_status === 1 &&
+        Number(row?.prescription_void_status) !== 1
+    ) {
+        return '查看'
     }
+    return '开方'
+}
+
+const handlePrescription = (row: any) => {
+    if (!row?.id) {
+        feedback.msgWarning('诊单信息不完整')
+        return
+    }
+    prescriptionRef.value?.open({
+        ...row,
+        diagnosis_id: row.id,
+        id: row.appointment_id || 0
+    })
+}
+
+const onPrescriptionSuccess = () => {
+    getLists()
+    ;(editRef.value as { refreshCaseList?: () => void } | undefined)?.refreshCaseList?.()
 }
 
-// ==================== 预约医生 ====================
 const handleAppointment = (row: any) => {
     if (!row.patient_id) { feedback.msgWarning('患者信息不完整'); return }
     appointmentRef.value?.open(row)
 }
 
-// ==================== 小程序二维码 ====================
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除该诊单吗？')
+    await tcmDiagnosisDelete({ id })
+    getLists()
+}
+
+// ========== Action Sheet ==========
+const moreSheetVisible = ref(false)
+const moreSheetRow = ref<any>(null)
+const openMoreSheet = (row: any) => {
+    moreSheetRow.value = row
+    moreSheetVisible.value = true
+}
+const runAction = (cmd: string) => {
+    const row = moreSheetRow.value
+    moreSheetVisible.value = false
+    if (!row) return
+    switch (cmd) {
+        case 'assign': handleSingleAssign(row); break
+        case 'videoQr':
+            if (!isAppointmentActiveForVideo(row)) {
+                feedback.msgWarning('仅「已预约」状态可生成视频二维码')
+                return
+            }
+            handleVideoQRCode(row); break
+        case 'confirmQr': handleMiniProgramQRCode(row); break
+        case 'cancelApt': handleCancelAppointment(row); break
+        case 'fillIdCard': handleFillIdCard(row); break
+        case 'order': handleCreateOrder(row); break
+        case 'wechat': handleWechatRecords(row); break
+        case 'delete': handleDelete(row.id); break
+    }
+}
+
+// ========== 指派 ==========
+const assignDialogVisible = ref(false)
+const assignLoading = ref(false)
+const currentRow = ref<any>(null)
+const assignForm = ref({ assistant_id: null as number | null })
+const handleSingleAssign = (row: any) => {
+    currentRow.value = row
+    assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null
+    assignDialogVisible.value = true
+}
+const handleConfirmAssign = async () => {
+    if (!assignForm.value.assistant_id) { feedback.msgWarning('请选择医助'); return }
+    assignLoading.value = true
+    try {
+        await tcmDiagnosisAssign({
+            id: currentRow.value.id,
+            assistant_id: assignForm.value.assistant_id
+        })
+        assignDialogVisible.value = false
+        getLists()
+    } catch (e) {
+        console.error('指派失败:', e)
+    } finally {
+        assignLoading.value = false
+    }
+}
+
+// ========== 创建订单 ==========
+const createOrderVisible = ref(false)
+const orderFormRef = ref()
+const orderLoading = ref(false)
+const orderForm = reactive({
+    patient_id: '' as string | number,
+    patient_name: '',
+    phone: '',
+    order_type: '' as string | number,
+    amount: 0,
+    remark: '',
+    has_appointment: false,
+    appointment_time_text: ''
+})
+const orderRules = {
+    order_type: [{ required: true, message: '请选择订单类型', trigger: 'change' }],
+    amount: [{ required: true, message: '请输入订单金额', trigger: 'blur' }]
+}
+const handleCreateOrder = (row: any) => {
+    orderForm.patient_id = row.patient_id || row.id
+    orderForm.patient_name = row.patient_name
+    orderForm.phone = row.phone || ''
+    orderForm.order_type = ''
+    orderForm.amount = 0
+    orderForm.remark = ''
+    orderForm.has_appointment = !!row.has_appointment
+    orderForm.appointment_time_text = row.appointment_time_text || ''
+    orderFormRef.value?.clearValidate()
+    createOrderVisible.value = true
+}
+const resetOrderForm = () => {
+    orderForm.patient_id = ''
+    orderForm.patient_name = ''
+    orderForm.phone = ''
+    orderForm.order_type = ''
+    orderForm.amount = 0
+    orderForm.remark = ''
+    orderForm.has_appointment = false
+    orderForm.appointment_time_text = ''
+    orderFormRef.value?.clearValidate()
+}
+const submitOrder = async () => {
+    try {
+        await orderFormRef.value?.validate()
+        orderLoading.value = true
+        const res = await orderCreate({
+            patient_id: orderForm.patient_id,
+            order_type: orderForm.order_type,
+            amount: orderForm.amount,
+            remark: orderForm.remark
+        })
+        createOrderVisible.value = false
+        getLists()
+
+        const orderNo = res?.order_no
+        if (orderNo) {
+            qrcodeDialogVisible.value = true
+            qrcodeLoading.value = true
+            qrcodeUrl.value = ''
+            qrcodeDialogTitle.value = '收款二维码'
+            currentQRCodePatient.value = {
+                patient_name: orderForm.patient_name,
+                has_appointment: orderForm.has_appointment,
+                appointment_time_text: orderForm.appointment_time_text
+            }
+            try {
+                const qrRes = await generateOrderQrcode({ order_no: orderNo })
+                if (qrRes?.qrcode_url) qrcodeUrl.value = qrRes.qrcode_url
+                else feedback.msgError('二维码生成失败')
+            } catch (e: any) {
+                feedback.msgError(e?.msg || '生成二维码失败')
+            } finally {
+                qrcodeLoading.value = false
+            }
+        }
+    } catch (e) {
+        console.error('创建订单失败:', e)
+    } finally {
+        orderLoading.value = false
+    }
+}
+
+// ========== 补全身份证 ==========
+const fillIdCardVisible = ref(false)
+const fillIdCardLoading = ref(false)
+const fillIdCardFormRef = ref()
+const fillIdCardForm = reactive({ id: 0, patient_name: '', id_card: '' })
+const validateIdCard = (_rule: any, value: string, callback: (e?: Error) => void) => {
+    if (!value) { callback(new Error('请输入身份证号')); return }
+    const valid18 = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(value)
+    const valid15 = /^[1-9]\d{5}\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}$/.test(value)
+    if (valid18 || valid15) callback()
+    else callback(new Error('请输入15或18位有效身份证号'))
+}
+const fillIdCardRules = {
+    id_card: [{ required: true, validator: validateIdCard, trigger: 'blur' }]
+}
+const handleFillIdCard = (row: any) => {
+    fillIdCardForm.id = row.id
+    fillIdCardForm.patient_name = row.patient_name || '-'
+    fillIdCardForm.id_card = row.id_card || ''
+    fillIdCardVisible.value = true
+}
+const submitFillIdCard = async () => {
+    await fillIdCardFormRef.value?.validate()
+    fillIdCardLoading.value = true
+    try {
+        await fillIdCard({ id: fillIdCardForm.id, id_card: fillIdCardForm.id_card })
+        feedback.msgSuccess('补全成功，年龄已自动更新')
+        fillIdCardVisible.value = false
+        getLists()
+    } catch (e: any) {
+        feedback.msgError(e?.msg || '补全失败')
+    } finally {
+        fillIdCardLoading.value = false
+    }
+}
+
+// ========== 二维码 ==========
 const qrcodeDialogVisible = ref(false)
 const qrcodeLoading = ref(false)
 const qrcodeUrl = ref('')
 const currentQRCodePatient = ref<any>(null)
+const qrcodeDialogTitle = ref('小程序二维码')
+const lastQRCodeType = ref<'video' | 'confirm'>('confirm')
+const qrcodeAppointmentTimeText = computed(() => {
+    const p = currentQRCodePatient.value
+    if (!p) return '—'
+    if (!p.has_appointment) return '未挂号'
+    return p.appointment_time_text || '—'
+})
 
-const handleMiniProgramQRCode = async (row: any) => {
+const handleVideoQRCode = async (row: any) => {
+    if (!isAppointmentActiveForVideo(row)) {
+        feedback.msgWarning('仅「已预约」状态可生成视频二维码'); return
+    }
     if (!row.patient_id) { feedback.msgWarning('患者信息不完整'); return }
+    lastQRCodeType.value = 'video'
     currentQRCodePatient.value = row
     qrcodeDialogVisible.value = true
     qrcodeLoading.value = true
     qrcodeUrl.value = ''
+    qrcodeDialogTitle.value = '视频二维码'
     try {
         const config = await getWeappConfig()
-        if (!config?.app_id) { feedback.msgError('小程序未配置'); qrcodeDialogVisible.value = false; return }
+        if (!config?.app_id) {
+            feedback.msgError('小程序未配置')
+            qrcodeDialogVisible.value = false
+            return
+        }
         const result = await generateMiniProgramQrcode({
-            diagnosis_id: row.id, patient_id: row.patient_id, share_user_id: userStore.userInfo?.id || ''
+            doctor_id: row.appointment_doctor_id,
+            diagnosis_id: row.appointment_doctor_id,
+            patient_id: row.patient_id,
+            share_user_id: userStore.userInfo?.id || '',
+            mini_program_path: 'pages/login/login'
         })
-        if (result?.qrcode_url) { qrcodeUrl.value = result.qrcode_url } else { feedback.msgError('二维码生成失败') }
-    } catch (error: any) {
-        feedback.msgError(error?.msg || '生成二维码失败')
+        if (result?.qrcode_url) qrcodeUrl.value = result.qrcode_url
+        else feedback.msgError('二维码生成失败')
+    } catch (e: any) {
+        feedback.msgError(e?.msg || '生成二维码失败')
+    } finally {
+        qrcodeLoading.value = false
+    }
+}
+
+const handleMiniProgramQRCode = async (row: any) => {
+    if (!isAppointmentActiveForVideo(row)) {
+        feedback.msgWarning('仅「已预约」状态可使用诊单二维码'); return
+    }
+    if (!row.patient_id) { feedback.msgWarning('患者信息不完整'); return }
+    lastQRCodeType.value = 'confirm'
+    currentQRCodePatient.value = row
+    qrcodeDialogVisible.value = true
+    qrcodeLoading.value = true
+    qrcodeUrl.value = ''
+    qrcodeDialogTitle.value = '诊单二维码'
+    try {
+        const config = await getWeappConfig()
+        if (!config?.app_id) {
+            feedback.msgError('小程序未配置')
+            qrcodeDialogVisible.value = false
+            return
+        }
+        const result = await generateMiniProgramQrcode({
+            diagnosis_id: row.id,
+            doctor_id: row.appointment_doctor_id,
+            patient_id: row.patient_id,
+            share_user_id: userStore.userInfo?.id || ''
+        })
+        if (result?.qrcode_url) qrcodeUrl.value = result.qrcode_url
+        else feedback.msgError('二维码生成失败')
+    } catch (e: any) {
+        feedback.msgError(e?.msg || '生成二维码失败')
     } finally {
         qrcodeLoading.value = false
     }
 }
 
 const handleRegenerateQRCode = () => {
-    if (currentQRCodePatient.value) handleMiniProgramQRCode(currentQRCodePatient.value)
+    if (currentQRCodePatient.value) {
+        lastQRCodeType.value === 'video'
+            ? handleVideoQRCode(currentQRCodePatient.value)
+            : handleMiniProgramQRCode(currentQRCodePatient.value)
+    }
 }
 
-// ==================== 企业微信聊天记录 ====================
+// ========== 取消挂号 ==========
+const handleCancelAppointment = async (row: any) => {
+    if (!canCancelAppointmentRow(row)) {
+        const s = Number(row.appointment_status)
+        if (row.has_appointment && s === 3) feedback.msgWarning('已完成就诊，无法取消挂号')
+        else feedback.msgWarning('该诊单未挂号或挂号信息异常')
+        return
+    }
+    try {
+        await feedback.confirm(`确定要取消患者「${row.patient_name}」的挂号吗？`)
+        await cancelAppointment({ id: row.appointment_id })
+        feedback.msgSuccess('取消挂号成功')
+        getLists()
+        fetchDateCounts()
+    } catch (e: any) {
+        if (e !== 'cancel') feedback.msgError(e?.msg || '取消挂号失败')
+    }
+}
+
+// ========== 企业微信 ==========
 const wechatDrawerVisible = ref(false)
 const wechatCurrentPatient = ref<any>(null)
 const wechatRecords = ref<any[]>([])
 const wechatRecordTotal = ref(0)
 const wechatRecordsLoading = ref(false)
+const wechatContactInfo = ref<any>(null)
 const wechatNewNote = ref('')
 const wechatAddLoading = ref(false)
 const wechatPage = ref(1)
@@ -409,16 +1343,18 @@ const handleWechatRecords = async (row: any) => {
     wechatDrawerVisible.value = true
     wechatRecords.value = []
     wechatRecordTotal.value = 0
+    wechatContactInfo.value = null
     wechatNewNote.value = ''
     wechatPage.value = 1
     wechatRecordsLoading.value = true
     try {
-        const [recordsRes] = await Promise.all([
+        const [recordsRes, contactRes] = await Promise.all([
             getWechatChatRecords({ diagnosis_id: row.id, patient_id: row.patient_id, page_no: 1, page_size: 20 }),
             getWechatExternalContact({ patient_id: row.patient_id || row.id }).catch(() => null)
         ])
         wechatRecords.value = recordsRes?.lists || []
         wechatRecordTotal.value = recordsRes?.count || 0
+        wechatContactInfo.value = contactRes
     } catch (e) {
         console.error(e)
     } finally {
@@ -449,7 +1385,7 @@ const handleAddRecord = async () => {
             content: wechatNewNote.value.trim(),
             msg_type: 'note',
             staff_name: userStore.userInfo?.name || '',
-            external_name: wechatCurrentPatient.value.patient_name || '',
+            external_name: wechatCurrentPatient.value.patient_name || ''
         })
         wechatNewNote.value = ''
         handleWechatRecords(wechatCurrentPatient.value)
@@ -471,207 +1407,674 @@ const handleDeleteRecord = async (id: number) => {
     }
 }
 
+// ========== 生命周期 ==========
+const SILENT_LIST_POLL_MS = 15_000
+let silentListPollTimer: ReturnType<typeof setInterval> | null = null
+const silentRefresh = () => {
+    if (typeof document !== 'undefined' && document.hidden) return
+    void getLists({ silent: true }).catch(() => {})
+    void fetchDateCounts()
+}
+
 onMounted(async () => {
     document.body.classList.add('h5-mode')
-    await getDictOptions()
-    loadList()
+    formData.appointment_date = todayStr.value
+    getDictOptions()
+    getLists()
+    if (typeof requestIdleCallback === 'function') {
+        requestIdleCallback(() => fetchDateCounts(), { timeout: 2500 })
+    } else {
+        setTimeout(fetchDateCounts, 200)
+    }
+    silentListPollTimer = setInterval(silentRefresh, SILENT_LIST_POLL_MS)
 })
 
 onUnmounted(() => {
     document.body.classList.remove('h5-mode')
+    if (silentListPollTimer) {
+        clearInterval(silentListPollTimer)
+        silentListPollTimer = null
+    }
 })
 </script>
 
 <style lang="scss" scoped>
-.diagnosis-h5 {
-    max-width: 500px;
+/* ============= 设计变量（手机端紧凑） ============= */
+$dh5-primary: #2563eb;
+$dh5-primary-soft: #eff6ff;
+$dh5-success: #10b981;
+$dh5-warn: #f59e0b;
+$dh5-danger: #ef4444;
+$dh5-text: #0f172a;
+$dh5-text-mute: #475569;
+$dh5-line: #e2e8f0;
+$dh5-bg: #f4f6fb;
+$dh5-card-bg: #ffffff;
+
+.dh5 {
+    max-width: 560px;
     margin: 0 auto;
     min-height: 100vh;
-    background: #f5f6fa;
-    padding-bottom: 80px;
+    background: $dh5-bg;
+    padding-bottom: 88px;
+    color: $dh5-text;
+    -webkit-font-smoothing: antialiased;
 }
 
-.h5-header {
-    background: #fff;
-    padding: 12px 16px;
+/* ============= 顶部 ============= */
+.dh5-topbar {
+    background: $dh5-card-bg;
+    padding: 12px 14px 10px;
     position: sticky;
     top: 0;
-    z-index: 10;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
+    z-index: 20;
+    box-shadow: 0 1px 0 $dh5-line;
 }
 
-.h5-search {
-    margin-bottom: 8px;
+.dh5-search {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+
+    :deep(.el-input__wrapper) {
+        border-radius: 10px;
+        background: $dh5-bg;
+        box-shadow: none !important;
+        padding: 4px 10px;
+    }
+
+    .dh5-search-btn {
+        border-radius: 10px;
+        height: 36px;
+    }
 }
 
-.h5-filter-row {
+.dh5-chips {
     display: flex;
     gap: 6px;
-    align-items: center;
-
-    .el-select {
-        flex: 1;
-        min-width: 0;
-    }
+    margin-top: 10px;
 }
 
-.h5-list {
-    padding: 12px 16px;
+.dh5-chips--scroll {
+    overflow-x: auto;
+    flex-wrap: nowrap;
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar { display: none; }
 }
 
-.h5-card {
-    background: #fff;
-    border-radius: 12px;
-    margin-bottom: 12px;
-    overflow: hidden;
-    box-shadow: 0 1px 6px rgba(0, 0, 0, 0.05);
-}
+.dh5-chip {
+    flex: 0 0 auto;
+    padding: 6px 12px;
+    font-size: 13px;
+    font-weight: 500;
+    color: $dh5-text-mute;
+    background: $dh5-bg;
+    border-radius: 999px;
+    cursor: pointer;
+    transition: background-color 0.18s, color 0.18s;
+    user-select: none;
+    white-space: nowrap;
+    line-height: 1;
 
-.h5-card-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 14px 16px 0;
-}
-
-.h5-card-name {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    .name {
-        font-size: 16px;
-        font-weight: 600;
-        color: #303133;
-    }
-
-    .age {
+    em {
+        font-style: normal;
+        margin-left: 4px;
         font-size: 12px;
-        color: #909399;
+        opacity: 0.7;
+    }
+
+    &:active {
+        background: #e2e8f0;
+    }
+
+    &.active {
+        color: #fff;
+        background: $dh5-primary;
+
+        em { opacity: 0.85; }
     }
 }
 
-.h5-card-body {
-    padding: 10px 16px;
+.dh5-chip--booking.active { background: $dh5-warn; }
+.dh5-chip--done.active { background: $dh5-success; }
+.dh5-chip--pending.active { background: $dh5-danger; }
+
+.dh5-quick {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 8px 12px;
+    margin-top: 10px;
+}
+
+.dh5-quick-group {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
+
+.dh5-quick-label {
+    font-size: 12px;
+    color: $dh5-text-mute;
+}
+
+.dh5-pill {
+    padding: 4px 10px;
+    border-radius: 999px;
+    font-size: 12px;
+    color: $dh5-text-mute;
+    background: $dh5-bg;
+    cursor: pointer;
+    transition: background-color 0.18s, color 0.18s;
+    line-height: 1.4;
+
+    &:active { background: #e2e8f0; }
+
+    &.active {
+        color: $dh5-primary;
+        background: $dh5-primary-soft;
+        font-weight: 600;
+    }
+}
+
+.dh5-more-toggle {
+    margin-left: auto;
+    font-size: 12px !important;
+
+    .el-icon {
+        margin-left: 2px;
+        transition: transform 0.2s;
+    }
+
+    .rotate-180 { transform: rotate(180deg); }
+}
+
+.dh5-more-filter {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-top: 10px;
+    padding-top: 10px;
+    border-top: 1px dashed $dh5-line;
+
+    .el-select { flex: 1 1 calc(50% - 4px); min-width: 120px; }
+}
+
+/* ============= 列表 ============= */
+.dh5-list {
+    padding: 10px 12px;
+}
+
+.dh5-empty {
+    padding: 60px 0;
+}
+
+.dh5-card {
+    background: $dh5-card-bg;
+    border-radius: 14px;
+    margin-bottom: 10px;
+    overflow: hidden;
+    box-shadow: 0 1px 4px rgba(15, 23, 42, 0.04);
+    border: 1px solid transparent;
+    position: relative;
+
+    &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        width: 3px;
+        background: transparent;
+    }
+}
+
+.dh5-card--unconfirmed::before { background: $dh5-danger; }
+.dh5-card--noapt::before { background: $dh5-warn; }
+
+.dh5-card-head {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 12px 14px 8px;
     cursor: pointer;
 }
 
-.info-line {
-    display: flex;
-    font-size: 13px;
-    line-height: 2;
-
-    .label {
-        color: #909399;
-        width: 65px;
-        flex-shrink: 0;
-    }
-
-    .value {
-        color: #606266;
-        flex: 1;
-    }
-}
-
-.h5-card-footer {
-    padding: 8px 12px;
-    border-top: 1px solid #f2f3f5;
-    overflow-x: auto;
-}
-
-.action-scroll {
-    display: flex;
-    white-space: nowrap;
-    gap: 0;
-}
-
-.h5-fab {
-    position: fixed;
-    right: 20px;
-    bottom: 40px;
-    width: 50px;
-    height: 50px;
-    border-radius: 50%;
-    background: linear-gradient(135deg, #409eff 0%, #337ecc 100%);
+.dh5-card-avatar {
+    flex: 0 0 36px;
+    width: 36px;
+    height: 36px;
+    border-radius: 10px;
+    background: $dh5-primary-soft;
+    color: $dh5-primary;
+    font-size: 16px;
+    font-weight: 600;
     display: flex;
     align-items: center;
     justify-content: center;
-    color: #fff;
-    box-shadow: 0 4px 16px rgba(64, 158, 255, 0.4);
-    cursor: pointer;
-    z-index: 99;
-    transition: transform 0.2s;
+}
 
-    &:active {
-        transform: scale(0.9);
+.dh5-card-id-name {
+    flex: 1;
+    min-width: 0;
+}
+
+.dh5-card-name {
+    font-size: 16px;
+    font-weight: 600;
+    color: $dh5-text;
+    line-height: 1.2;
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+    flex-wrap: wrap;
+}
+
+.dh5-meta-gender,
+.dh5-meta-age {
+    font-size: 12px;
+    color: $dh5-text-mute;
+    font-weight: 400;
+}
+
+.dh5-card-sub {
+    font-size: 12px;
+    color: $dh5-text-mute;
+    margin-top: 4px;
+    line-height: 1.2;
+}
+
+.dh5-card-tags {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    align-items: flex-end;
+}
+
+.dh5-tag {
+    display: inline-flex;
+    align-items: center;
+    padding: 2px 8px;
+    font-size: 11px;
+    border-radius: 999px;
+    font-weight: 500;
+    line-height: 1.4;
+    white-space: nowrap;
+}
+
+.dh5-tag--ok { background: rgba(16, 185, 129, 0.10); color: #047857; }
+.dh5-tag--warn { background: rgba(239, 68, 68, 0.10); color: #b91c1c; }
+.dh5-tag--info { background: rgba(37, 99, 235, 0.10); color: #1d4ed8; }
+.dh5-tag--gray { background: #f1f5f9; color: #64748b; }
+
+.dh5-card-body {
+    padding: 4px 14px 12px;
+    cursor: pointer;
+}
+
+.dh5-row {
+    display: flex;
+    align-items: flex-start;
+    font-size: 13px;
+    line-height: 1.6;
+    gap: 8px;
+    padding: 4px 0;
+}
+
+.dh5-row-key {
+    flex: 0 0 44px;
+    color: $dh5-text-mute;
+    font-size: 12px;
+    padding-top: 1px;
+}
+
+.dh5-row-val {
+    flex: 1;
+    color: $dh5-text;
+    min-width: 0;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    align-items: center;
+}
+
+.dh5-meta-doctor,
+.dh5-meta-mute {
+    color: $dh5-text-mute;
+    font-size: 12px;
+}
+
+/* 挂号块 - 状态色 */
+.dh5-row--apt {
+    background: #fafbfc;
+    border-radius: 10px;
+    padding: 8px 10px;
+    margin-bottom: 6px;
+
+    .dh5-row-key { padding-top: 2px; }
+
+    &.apt-row-done {
+        background: rgba(16, 185, 129, 0.06);
+    }
+
+    &.apt-row-missed {
+        background: rgba(148, 163, 184, 0.10);
     }
 }
 
-.h5-load-more {
+.dh5-apt-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 4px 8px;
+    border-radius: 6px;
+    background: rgba(37, 99, 235, 0.06);
+    font-size: 12px;
+    width: 100%;
+}
+
+.dh5-apt-item--done { background: rgba(16, 185, 129, 0.10); }
+.dh5-apt-item--missed { background: rgba(148, 163, 184, 0.14); }
+.dh5-apt-item--active { background: rgba(37, 99, 235, 0.10); }
+
+.dh5-apt-status {
+    font-weight: 600;
+    font-size: 12px;
+}
+
+.dh5-apt-doctor {
+    color: $dh5-text;
+    font-weight: 500;
+}
+
+.dh5-apt-time {
+    color: $dh5-text-mute;
+    font-size: 12px;
+    margin-left: auto;
+}
+
+.dh5-apt-none {
+    color: $dh5-warn;
+    font-weight: 600;
+    font-size: 13px;
+}
+
+/* 视频旁观条 */
+.dh5-card-watch {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 8px 14px;
+    background: linear-gradient(90deg, rgba(37, 99, 235, 0.04), transparent);
+    border-top: 1px dashed $dh5-line;
+    font-size: 12px;
+}
+
+.dh5-watch-tip {
+    color: $dh5-text-mute;
+    font-size: 11px;
+    line-height: 1.3;
+    flex: 1;
+}
+
+.dh5-watch-mute {
+    color: $dh5-text-mute;
+    font-size: 12px;
+}
+
+/* 卡片底部按钮 */
+.dh5-card-foot {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 8px 12px;
+    border-top: 1px solid #f1f5f9;
+
+    .el-button {
+        flex: 1;
+        min-width: 0;
+        padding: 0;
+        height: 32px;
+        font-size: 13px;
+        border-radius: 8px;
+    }
+
+    .dh5-more-btn {
+        flex: 0 0 auto;
+        min-width: 64px;
+    }
+}
+
+/* ============= FAB ============= */
+.dh5-fab {
+    position: fixed;
+    right: 16px;
+    bottom: 28px;
+    width: 52px;
+    height: 52px;
+    border: none;
+    border-radius: 999px;
+    background: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);
+    color: #fff;
+    box-shadow: 0 8px 22px rgba(37, 99, 235, 0.32);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    z-index: 99;
+    transition: transform 0.18s ease;
+
+    &:active { transform: scale(0.94); }
+}
+
+/* ============= Load more / empty ============= */
+.dh5-load-more {
     text-align: center;
     padding: 16px;
     font-size: 13px;
-    color: #409eff;
+    color: $dh5-primary;
     cursor: pointer;
 }
 
-.h5-no-more {
+.dh5-no-more {
     text-align: center;
     padding: 16px;
     font-size: 12px;
-    color: #c0c4cc;
+    color: #94a3b8;
 }
 
-.h5-empty {
-    padding: 40px 0;
+/* ============= Action Sheet ============= */
+.dh5-actions {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 12px 8px;
+    padding: 8px 4px 8px;
 }
 
-.h5-form {
-    :deep(.el-form-item__label) {
-        font-weight: 500;
+.dh5-action {
+    border: none;
+    background: transparent;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 6px;
+    padding: 10px 4px;
+    border-radius: 10px;
+    cursor: pointer;
+    color: $dh5-text;
+    font-size: 12px;
+    transition: background-color 0.18s;
+
+    .el-icon {
+        width: 36px;
+        height: 36px;
+        font-size: 18px;
+        background: $dh5-primary-soft;
+        color: $dh5-primary;
+        border-radius: 12px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    &:active { background: $dh5-bg; }
+
+    &--danger {
+        color: $dh5-danger;
+
+        .el-icon {
+            background: rgba(239, 68, 68, 0.10);
+            color: $dh5-danger;
+        }
     }
 }
 
-.record-list {
+/* ============= 通用 form / drawer ============= */
+.dh5-form {
+    :deep(.el-form-item__label) {
+        font-size: 13px !important;
+        color: $dh5-text-mute !important;
+        font-weight: 500 !important;
+    }
+}
+
+.dh5-form-tip {
+    font-size: 13px;
+    color: $dh5-text-mute;
+    line-height: 1.6;
+}
+
+.dh5-flex1 {
+    flex: 1;
+}
+
+/* ============= QR Dialog ============= */
+.dh5-qr {
+    padding: 16px 4px 8px;
+    text-align: center;
+}
+
+.dh5-qr-loading {
+    padding: 24px 0;
+    color: $dh5-text-mute;
+}
+
+.dh5-qr-tip {
+    margin-top: 10px;
+    font-size: 13px;
+}
+
+.dh5-qr-img {
+    width: 220px;
+    height: 220px;
+    border-radius: 12px;
+    border: 1px solid $dh5-line;
+}
+
+.dh5-qr-meta {
+    margin-top: 12px;
+    color: $dh5-text-mute;
+    font-size: 13px;
+    line-height: 1.7;
+
+    .dh5-qr-hint { color: $dh5-text-mute; opacity: 0.85; }
+}
+
+.dh5-qr-fail {
+    padding: 24px;
+    color: $dh5-danger;
+}
+
+/* ============= 企微 Drawer ============= */
+.dh5-wx-contact {
+    background: $dh5-bg;
+    border-radius: 10px;
+    padding: 10px 12px;
+    margin-bottom: 12px;
+}
+
+.dh5-wx-contact-row {
+    display: flex;
+    justify-content: space-between;
+    font-size: 13px;
+    line-height: 1.8;
+}
+
+.dh5-wx-key { color: $dh5-text-mute; }
+.dh5-wx-val { color: $dh5-text; }
+
+.dh5-wx-add {
+    display: flex;
+    gap: 8px;
+    margin-bottom: 12px;
+
+    .el-textarea { flex: 1; }
+    .el-button { align-self: flex-end; }
+}
+
+.dh5-wx-empty {
+    text-align: center;
+    color: #94a3b8;
+    padding: 32px 0;
+}
+
+.dh5-wx-list {
     display: flex;
     flex-direction: column;
     gap: 10px;
 }
 
-.record-item {
-    background: #f9fafb;
-    border-radius: 8px;
+.dh5-wx-item {
+    background: #fff;
+    border: 1px solid $dh5-line;
+    border-radius: 10px;
     padding: 10px;
-    border: 1px solid #f0f0f0;
 }
 
-.record-header {
+.dh5-wx-head {
     display: flex;
     justify-content: space-between;
-    align-items: flex-start;
+    align-items: center;
+    gap: 6px;
     margin-bottom: 6px;
-    gap: 4px;
+    flex-wrap: wrap;
 }
 
-.record-content {
+.dh5-wx-head-left,
+.dh5-wx-head-right {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex-wrap: wrap;
+}
+
+.dh5-wx-name { font-size: 13px; font-weight: 500; }
+.dh5-wx-time { font-size: 11px; color: #94a3b8; }
+
+.dh5-wx-content {
     font-size: 13px;
+    color: $dh5-text;
     line-height: 1.6;
-    color: #333;
     white-space: pre-wrap;
     word-break: break-all;
 }
 
+.dh5-wx-media {
+    margin-top: 8px;
+}
+
 :deep(.el-drawer__footer) {
     display: flex;
     gap: 12px;
     padding: 12px 16px;
-    border-top: 1px solid #f2f3f5;
+    border-top: 1px solid $dh5-line;
 }
 </style>
 
 <style lang="scss">
+/* 仅 H5 模式下的全局微调（沿用旧代码的 body.h5-mode 上下文） */
 body.h5-mode {
-    // ========== Drawer 全屏 + 内容不被 footer 遮挡 ==========
     .el-drawer {
         width: 100% !important;
         max-width: 100vw !important;
@@ -701,7 +2104,6 @@ body.h5-mode {
         background: #fff;
     }
 
-    // ========== Dialog ==========
     .el-overlay-dialog .el-dialog,
     .el-dialog {
         width: 92% !important;
@@ -728,7 +2130,7 @@ body.h5-mode {
         }
     }
 
-    // ========== 编辑诊单 ==========
+    /* 编辑诊单 / 处方 等老抽屉的兼容样式（保留） */
     .edit-drawer {
         .el-row {
             display: block !important;
@@ -746,14 +2148,11 @@ body.h5-mode {
     }
 
     .diagnosis-drawer {
-        .el-drawer__body {
-            padding-bottom: 60px !important;
-        }
+        .el-drawer__body { padding-bottom: 60px !important; }
 
         .el-form {
             padding-bottom: 10px;
 
-            // 表单项：标签在上、控件在下
             .el-form-item {
                 flex-direction: column !important;
                 align-items: flex-start !important;
@@ -766,13 +2165,12 @@ body.h5-mode {
                     min-width: 0 !important;
                     text-align: left !important;
                     padding: 0 0 3px 0 !important;
-                    font-size: 16px !important;
+                    font-size: 14px !important;
                     font-weight: 500;
-                    color: #8c8c8c;
+                    color: #475569;
                     line-height: 1.4 !important;
                     height: auto !important;
                     justify-content: flex-start !important;
-                    margin:8px;
                 }
 
                 .el-form-item__content {
@@ -781,7 +2179,6 @@ body.h5-mode {
                 }
             }
 
-            // 输入控件满宽
             .el-input,
             .el-input-number,
             .el-select,
@@ -790,9 +2187,7 @@ body.h5-mode {
                 width: 100% !important;
             }
 
-            .el-input-number .el-input__wrapper {
-                width: 100% !important;
-            }
+            .el-input-number .el-input__wrapper { width: 100% !important; }
 
             .el-input__wrapper,
             .el-textarea__inner {
@@ -806,7 +2201,6 @@ body.h5-mode {
             }
         }
 
-        // 分割线变为卡片 section 标题
         .el-divider {
             margin: 14px 0 8px !important;
             border-top: none !important;
@@ -819,12 +2213,9 @@ body.h5-mode {
                 padding-left: 0 !important;
             }
 
-            &::before {
-                width: 0 !important;
-            }
+            &::before { width: 0 !important; }
         }
 
-        // 复选/单选按钮组 — 标签式
         .checkbox-form-item,
         .compact-form-item {
             .el-checkbox-group,
@@ -851,8 +2242,8 @@ body.h5-mode {
                     .el-checkbox-button__inner,
                     .el-radio-button__inner {
                         background: #ecf5ff !important;
-                        border-color: #409eff !important;
-                        color: #409eff !important;
+                        border-color: #2563eb !important;
+                        color: #2563eb !important;
                     }
                 }
             }
@@ -886,18 +2277,12 @@ body.h5-mode {
             padding-top: 2px;
         }
 
-        .el-tabs__nav-wrap::after {
-            height: 1px !important;
-        }
-
-        .el-tabs__item {
-            font-size: 14px !important;
-        }
+        .el-tabs__nav-wrap::after { height: 1px !important; }
+        .el-tabs__item { font-size: 14px !important; }
     }
 
-    // ========== 预约问诊 ==========
+    /* 预约时间网格（保留） */
     .appointment-form {
-        // 标签在上、内容在下
         .el-form-item {
             flex-direction: column !important;
             align-items: flex-start !important;
@@ -928,20 +2313,13 @@ body.h5-mode {
             gap: 8px !important;
         }
 
-        .el-radio {
-            margin-right: 0 !important;
-        }
+        .el-radio { margin-right: 0 !important; }
 
-        .el-textarea__inner {
-            border-radius: 8px !important;
-        }
+        .el-textarea__inner { border-radius: 8px !important; }
     }
 
-    .appointment-time-container {
-        width: 100% !important;
-    }
+    .appointment-time-container { width: 100% !important; }
 
-    // 日期按钮：每行两个
     .date-selector {
         display: grid !important;
         grid-template-columns: repeat(3, 1fr) !important;
@@ -956,7 +2334,7 @@ body.h5-mode {
             padding: 0 4px !important;
             border-radius: 10px !important;
             box-sizing: border-box !important;
-            margin-left: 0px;
+            margin-left: 0 !important;
         }
     }
 
@@ -966,15 +2344,6 @@ body.h5-mode {
         background-color: #f7f8fa !important;
     }
 
-    .time-slots-header {
-        margin-bottom: 10px !important;
-
-        .header-title {
-            font-size: 14px !important;
-            font-weight: 600 !important;
-        }
-    }
-
     .time-slots-grid {
         grid-template-columns: repeat(3, 1fr) !important;
         gap: 8px !important;
@@ -985,31 +2354,16 @@ body.h5-mode {
             padding: 6px 4px !important;
             border-radius: 10px !important;
             border-width: 1.5px !important;
-
-            .slot-time {
-                font-size: 14px !important;
-                margin-bottom: 2px !important;
-            }
-
-            .slot-status {
-                font-size: 13px !important;
-                padding: 1px 8px !important;
-            }
         }
     }
 
-    .drawer-footer {
-        padding: 0 !important;
-    }
+    .drawer-footer { padding: 0 !important; }
 
-    // ========== 详情弹窗 ==========
     .detail-popup {
         .el-descriptions__body .el-descriptions__table {
             display: block !important;
 
-            tbody {
-                display: block !important;
-            }
+            tbody { display: block !important; }
 
             .el-descriptions-row {
                 display: block !important;
diff --git a/server/app/adminapi/controller/order/OrderController.php b/server/app/adminapi/controller/order/OrderController.php
index acf56de0..72a223e2 100644
--- a/server/app/adminapi/controller/order/OrderController.php
+++ b/server/app/adminapi/controller/order/OrderController.php
@@ -130,7 +130,7 @@ class OrderController extends BaseAdminController
     public function orderStats()
     {
         $params = $this->request->get();
-        $result = OrderLogic::orderStats($params);
+        $result = OrderLogic::orderStats($params, (int) $this->adminId, $this->adminInfo);
         return $this->data($result);
     }
 
diff --git a/server/app/adminapi/controller/tcm/DiagnosisController.php b/server/app/adminapi/controller/tcm/DiagnosisController.php
index fcb8cf92..4640e9f1 100644
--- a/server/app/adminapi/controller/tcm/DiagnosisController.php
+++ b/server/app/adminapi/controller/tcm/DiagnosisController.php
@@ -59,7 +59,7 @@ class DiagnosisController extends BaseAdminController
     public function assistantDiagnosisStats()
     {
         $params = $this->request->get();
-        $result = DiagnosisLogic::assistantDiagnosisStats($params);
+        $result = DiagnosisLogic::assistantDiagnosisStats($params, (int) $this->adminId, $this->adminInfo);
         return $this->data($result);
     }
 
@@ -449,7 +449,7 @@ class DiagnosisController extends BaseAdminController
      */
     public function getAssistants()
     {
-        $result = DiagnosisLogic::getAssistants();
+        $result = DiagnosisLogic::getAssistants((int) $this->adminId, $this->adminInfo);
         return $this->data($result);
     }
     
diff --git a/server/app/adminapi/lists/auth/AdminLists.php b/server/app/adminapi/lists/auth/AdminLists.php
index 4b0d38e3..7b09f018 100644
--- a/server/app/adminapi/lists/auth/AdminLists.php
+++ b/server/app/adminapi/lists/auth/AdminLists.php
@@ -19,11 +19,15 @@ use app\common\lists\ListsExcelInterface;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
 use app\common\lists\ListsSortInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\common\model\auth\Admin;
 use app\common\model\auth\AdminRole;
 use app\common\model\auth\SystemRole;
 use app\common\model\dept\Dept;
 use app\common\model\dept\Jobs;
+use app\common\model\doctor\Appointment;
+use app\common\model\tcm\Diagnosis;
+use think\facade\Db;
 
 /**
  * 管理员列表
@@ -32,6 +36,7 @@ use app\common\model\dept\Jobs;
  */
 class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, ListsSearchInterface, ListsSortInterface,ListsExcelInterface
 {
+    use HasDataScopeFilter;
     /**
      * @notes 设置导出字段
      * @return string[]
@@ -116,9 +121,37 @@ class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, Lis
 
         if ($progressBoard) {
             // 面诊进度：固定只拉「医生」角色且未禁用，忽略客户端篡改的 role_id
-            $adminIds = AdminRole::where('role_id', 1)->column('admin_id');
+            $adminIds = array_map('intval', AdminRole::where('role_id', 1)->column('admin_id'));
+
+            // 数据范围：医生与业务/医助通常不在同一部门，按 admin id 直接取交集会全空。
+            // 这里改为「按当前账号可见的挂号反查涉及的医生」，与 AppointmentLists 的可见性一致：
+            //   可见挂号 = a.doctor_id ∈ visible OR diagnosis.assistant_id ∈ visible
+            $visibleIds = $this->getDataScopeVisibleAdminIds();
+            if ($visibleIds !== null) {
+                if ($visibleIds === [] || $adminIds === []) {
+                    $adminIds = [];
+                } else {
+                    $aTbl = (new Appointment())->getTable();
+                    $dTbl = (new Diagnosis())->getTable();
+                    $inList = implode(',', array_map('intval', $visibleIds));
+                    $rows = Db::query(
+                        "SELECT DISTINCT a.doctor_id FROM `{$aTbl}` a "
+                        . "LEFT JOIN `{$dTbl}` u ON a.patient_id = u.id "
+                        . "WHERE (a.doctor_id IN ({$inList}) "
+                        . "       OR (u.id IS NOT NULL AND u.delete_time IS NULL AND u.assistant_id IN ({$inList})))"
+                    );
+                    $apptDoctorIds = array_filter(array_map(static function ($r): int {
+                        return (int) ($r['doctor_id'] ?? 0);
+                    }, $rows ?: []));
+                    $adminIds = array_values(array_intersect($adminIds, $apptDoctorIds));
+                }
+            }
+
             if (!empty($adminIds)) {
                 $where[] = ['id', 'in', $adminIds];
+            } else {
+                // 数据范围下没有可见医生：强制空集
+                $where[] = ['id', '=', 0];
             }
             $where[] = ['disable', '=', 0];
         } else {
@@ -134,6 +167,19 @@ class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, Lis
             }
         }
 
+        // 数据范围：仅当调用方主动传 apply_data_scope=1 时启用
+        // （管理员表被多场景共用：医生/医助选择器、看板、组织架构等；不主动启用避免误伤）
+        if ((int) ($this->params['apply_data_scope'] ?? 0) === 1) {
+            $visibleIds = $this->getDataScopeVisibleAdminIds();
+            if ($visibleIds !== null) {
+                if ($visibleIds === []) {
+                    $where[] = ['id', '=', 0]; // 强制空
+                } else {
+                    $where[] = ['id', 'in', $visibleIds];
+                }
+            }
+        }
+
         return $where;
     }
 
diff --git a/server/app/adminapi/lists/auth/RoleLists.php b/server/app/adminapi/lists/auth/RoleLists.php
index 4b47d3f8..a4546e9c 100644
--- a/server/app/adminapi/lists/auth/RoleLists.php
+++ b/server/app/adminapi/lists/auth/RoleLists.php
@@ -63,7 +63,7 @@ class RoleLists extends BaseAdminDataLists
     public function lists(): array
     {
         $lists = SystemRole::with(['role_menu_index'])
-            ->field('id,name,desc,sort,create_time')
+            ->field('id,name,desc,sort,data_scope,create_time')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['sort' => 'desc', 'id' => 'desc'])
             ->select()
diff --git a/server/app/adminapi/lists/doctor/AppointmentLists.php b/server/app/adminapi/lists/doctor/AppointmentLists.php
index d125e64f..8b60afca 100644
--- a/server/app/adminapi/lists/doctor/AppointmentLists.php
+++ b/server/app/adminapi/lists/doctor/AppointmentLists.php
@@ -9,6 +9,7 @@ use app\common\model\tcm\Prescription;
 use app\common\model\auth\AdminRole;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 
 /**
  * 医生预约列表
@@ -17,6 +18,31 @@ use app\common\lists\ListsSearchInterface;
  */
 class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExtendInterface
 {
+    use HasDataScopeFilter;
+
+    /**
+     * 数据隔离：医生或医助（u.assistant_id = diag.assistant_id）命中可见集合；progress_board 场景放开（看板跨医生查看）
+     */
+    private function applyDataScopeForAppointment($query, bool $progressBoard): void
+    {
+        if ($progressBoard) {
+            return;
+        }
+        if (!$this->dataScopeShouldApply()) {
+            return;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return;
+        }
+        $inList = implode(',', $ids);
+        $query->whereRaw("(a.doctor_id IN ({$inList}) OR u.assistant_id IN ({$inList}))");
+    }
     /**
      * @notes 设置搜索条件
      * @return array
@@ -114,6 +140,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             }
         }
 
+        $this->applyDataScopeForAppointment($query, $progressBoard);
+
         // 诊单软删除后不再展示对应挂号（leftJoin 时无诊单或诊单未删）
         $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
         
@@ -269,6 +297,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             }
         }
 
+        $this->applyDataScopeForAppointment($query, $progressBoard);
+
         $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
     }
 
diff --git a/server/app/adminapi/lists/order/OrderLists.php b/server/app/adminapi/lists/order/OrderLists.php
index 4dd1a8bb..df585640 100644
--- a/server/app/adminapi/lists/order/OrderLists.php
+++ b/server/app/adminapi/lists/order/OrderLists.php
@@ -6,6 +6,7 @@ namespace app\adminapi\lists\order;
 
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\common\model\Order;
 use app\common\model\auth\AdminRole;
 
@@ -16,6 +17,7 @@ use app\common\model\auth\AdminRole;
  */
 class OrderLists extends BaseAdminDataLists implements ListsSearchInterface
 {
+    use HasDataScopeFilter;
     /**
      * 将列表「创建时间」参数规范为可解析的日期时间（datetimerange 已是 Y-m-d H:i:s，不能再去拼接 00:00:00，否则会变成非法字符串）
      */
@@ -214,7 +216,9 @@ class OrderLists extends BaseAdminDataLists implements ListsSearchInterface
 
         $this->appendCreateTimeWhere($where);
 
-        return Order::where($where)
+        $query = Order::where($where);
+        $this->applyDataScopeByOwner($query, 'creator_id');
+        return $query
             ->with(['patient', 'creator'])
             ->order(['create_time' => 'desc'])
             ->limit($this->limitOffset, $this->pageSize)
@@ -251,6 +255,8 @@ class OrderLists extends BaseAdminDataLists implements ListsSearchInterface
 
         $this->appendCreateTimeWhere($where);
 
-        return Order::where($where)->count();
+        $query = Order::where($where);
+        $this->applyDataScopeByOwner($query, 'creator_id');
+        return $query->count();
     }
 }
diff --git a/server/app/adminapi/lists/tcm/DiagnosisLists.php b/server/app/adminapi/lists/tcm/DiagnosisLists.php
index 02f82f1b..559c86a6 100644
--- a/server/app/adminapi/lists/tcm/DiagnosisLists.php
+++ b/server/app/adminapi/lists/tcm/DiagnosisLists.php
@@ -25,6 +25,7 @@ use app\common\model\auth\Admin;
 use app\common\model\auth\AdminDept;
 use app\common\model\auth\AdminRole;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 
 /**
  * 中医辨房病因诊单列表
@@ -33,6 +34,7 @@ use app\common\lists\ListsSearchInterface;
  */
 class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
 {
+    use HasDataScopeFilter;
     /**
      * @notes 设置搜索条件
      * @return array
@@ -70,6 +72,10 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->where('assistant_id', $this->adminId);
         }
 
+        if (!$pendingAssign) {
+            $this->applyDataScopeByOwner($query, 'assistant_id');
+        }
+
         // 关键字搜索：支持患者姓名或手机号（模糊匹配）
         if (isset($this->params['keyword']) && trim((string) $this->params['keyword']) !== '') {
             $keyword = trim((string) $this->params['keyword']);
@@ -459,6 +465,10 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->where('assistant_id', $this->adminId);
         }
 
+        if (!$pendingAssign) {
+            $this->applyDataScopeByOwner($query, 'assistant_id');
+        }
+
         // 关键字搜索：支持患者姓名或手机号（模糊匹配）
         if (isset($this->params['keyword']) && trim((string) $this->params['keyword']) !== '') {
             $keyword = trim((string) $this->params['keyword']);
diff --git a/server/app/adminapi/lists/tcm/PrescriptionLists.php b/server/app/adminapi/lists/tcm/PrescriptionLists.php
index 2d5f4ea9..e80498c3 100644
--- a/server/app/adminapi/lists/tcm/PrescriptionLists.php
+++ b/server/app/adminapi/lists/tcm/PrescriptionLists.php
@@ -6,6 +6,7 @@ namespace app\adminapi\lists\tcm;
 
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\adminapi\logic\tcm\PrescriptionLogic;
 use app\common\model\tcm\Prescription;
 use app\common\model\tcm\PrescriptionOrder;
@@ -15,6 +16,7 @@ use app\common\model\tcm\PrescriptionOrder;
  */
 class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterface
 {
+    use HasDataScopeFilter;
     /**
      * @notes 搜索条件
      */
@@ -138,6 +140,7 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
         $this->applySourceFilter($query);
         $this->applyVisibilityScope($query);
         $this->applyCreatorIdsFilter($query);
+        $this->applyDataScopeByOwnerColumns($query, ['creator_id', 'assistant_id']);
 
         $lists = $query
             ->whereNull('delete_time')
@@ -231,6 +234,7 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
         $this->applySourceFilter($query);
         $this->applyVisibilityScope($query);
         $this->applyCreatorIdsFilter($query);
+        $this->applyDataScopeByOwnerColumns($query, ['creator_id', 'assistant_id']);
 
         return $query->whereNull('delete_time')->count();
     }
diff --git a/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php b/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php
index 0df9c5f3..60db5c7c 100644
--- a/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php
+++ b/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php
@@ -9,6 +9,7 @@ use app\adminapi\logic\dept\DeptLogic;
 use app\adminapi\logic\tcm\PrescriptionOrderLogic;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\common\model\Order;
 use app\common\model\tcm\Diagnosis;
 use app\common\model\auth\AdminDept;
@@ -21,6 +22,8 @@ use think\db\Query;
 
 class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExtendInterface
 {
+    use HasDataScopeFilter;
+
     public function setSearch(): array
     {
         return [
@@ -76,6 +79,36 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                 }
             });
         }
+        $this->applyDataScopeForPrescriptionOrder($query);
+    }
+
+    /**
+     * 数据隔离：创建者 ∈ 可见 admin，或 关联诊单医助 ∈ 可见 admin
+     */
+    private function applyDataScopeForPrescriptionOrder($query): void
+    {
+        if (!$this->dataScopeShouldApply()) {
+            return;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return;
+        }
+        $poTbl = (new PrescriptionOrder())->getTable();
+        $diagTbl = (new Diagnosis())->getTable();
+        $inList = implode(',', $ids);
+        $query->where(function ($q) use ($poTbl, $diagTbl, $inList) {
+            $q->whereIn('creator_id', explode(',', $inList));
+            $q->whereOrRaw(
+                "EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$poTbl}`.`diagnosis_id` "
+                . "AND dg.`delete_time` IS NULL AND dg.`assistant_id` IN ({$inList}))"
+            );
+        });
     }
 
     /**
@@ -100,12 +133,14 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         $this->applyDoctorAssistantFilters($query);
         $this->applyPatientKeywordFilter($query);
         if (PrescriptionOrderLogic::canViewOrderListStatsAllScope($this->adminInfo)) {
+            $this->applyDataScopeForPrescriptionOrder($query);
             return $query;
         }
         $assistantRid = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);
         $myRoles      = array_map('intval', $this->adminInfo['role_id'] ?? []);
         if ($assistantRid > 0 && in_array($assistantRid, $myRoles, true)) {
             $this->applyAssistantDiagnosisOnlyFilter($query);
+            $this->applyDataScopeForPrescriptionOrder($query);
 
             return $query;
         }
@@ -118,6 +153,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                 }
             });
         }
+        $this->applyDataScopeForPrescriptionOrder($query);
 
         return $query;
     }
diff --git a/server/app/adminapi/logic/auth/RoleLogic.php b/server/app/adminapi/logic/auth/RoleLogic.php
index e2f33e59..ccaa0556 100644
--- a/server/app/adminapi/logic/auth/RoleLogic.php
+++ b/server/app/adminapi/logic/auth/RoleLogic.php
@@ -48,6 +48,7 @@ class RoleLogic extends BaseLogic
                 'name' => $params['name'],
                 'desc' => $params['desc'] ?? '',
                 'sort' => $params['sort'] ?? 0,
+                'data_scope' => self::normalizeDataScope($params['data_scope'] ?? null),
             ]);
 
             $data = [];
@@ -90,6 +91,7 @@ class RoleLogic extends BaseLogic
                 'name' => $params['name'],
                 'desc' => $params['desc'] ?? '',
                 'sort' => $params['sort'] ?? 0,
+                'data_scope' => self::normalizeDataScope($params['data_scope'] ?? null),
             ]);
 
             if (!empty($menuId)) {
@@ -142,13 +144,26 @@ class RoleLogic extends BaseLogic
      */
     public static function detail(int $id): array
     {
-        $detail = SystemRole::field('id,name,desc,sort')->find($id);
+        $detail = SystemRole::field('id,name,desc,sort,data_scope')->find($id);
         $authList = $detail->roleMenuIndex()->select()->toArray();
         $menuId = array_column($authList, 'menu_id');
         $detail['menu_id'] = $menuId;
         return $detail->toArray();
     }
 
+    /**
+     * 规范化 data_scope：合法值 1-4，非法或缺省统一回退为 1（全部），保持与历史默认一致不增加风险。
+     */
+    private static function normalizeDataScope($value): int
+    {
+        $v = (int) $value;
+        if ($v >= 1 && $v <= 4) {
+            return $v;
+        }
+
+        return 1;
+    }
+
 
     /**
      * @notes 角色数据
diff --git a/server/app/adminapi/logic/order/OrderLogic.php b/server/app/adminapi/logic/order/OrderLogic.php
index 5eab48f5..b24c66b0 100644
--- a/server/app/adminapi/logic/order/OrderLogic.php
+++ b/server/app/adminapi/logic/order/OrderLogic.php
@@ -730,7 +730,7 @@ class OrderLogic
      * @param array $params order_type(-1全部已支付类型合计,0退款,1挂号费,2问诊费,3药品费用,4首付,5尾款,6其他), days(0今天,7,30)
      * @return array
      */
-    public static function orderStats(array $params = [])
+    public static function orderStats(array $params = [], int $adminId = 0, ?array $adminInfo = null)
     {
         $allPaidOrderTypes = [1, 2, 3, 4, 5, 6];
         $orderType = array_key_exists('order_type', $params) ? (int) $params['order_type'] : 1;
@@ -740,6 +740,11 @@ class OrderLogic
         $orderTypeName = $orderType === -1 ? '全部（已支付）' : self::$orderTypeNames[$orderType];
         $days = isset($params['days']) ? (int)$params['days'] : 7;
 
+        // 数据范围：当前用户可见 admin id 集合；null 表示全部
+        $visibleAdminIds = ($adminInfo !== null && $adminId > 0)
+            ? \app\common\service\DataScope\DataScopeService::getVisibleAdminIds($adminId, $adminInfo)
+            : null;
+
         $endTime = !empty($params['end_time']) ? strtotime($params['end_time']) : time();
         if ($days === 0) {
             $startTime = strtotime(date('Y-m-d'));
@@ -764,6 +769,13 @@ class OrderLogic
         } else {
             $query->where('order_type', $orderType)->where('status', 2);
         }
+        if ($visibleAdminIds !== null) {
+            if ($visibleAdminIds === []) {
+                $query->whereRaw('0 = 1');
+            } else {
+                $query->whereIn('creator_id', $visibleAdminIds);
+            }
+        }
         $orderRows = $query
             ->field('creator_id, count(*) as cnt, sum(amount) as total_amount')
             ->group('creator_id')
@@ -822,6 +834,13 @@ class OrderLogic
         } else {
             $todayQuery->where('order_type', $orderType)->where('status', 2);
         }
+        if ($visibleAdminIds !== null) {
+            if ($visibleAdminIds === []) {
+                $todayQuery->whereRaw('0 = 1');
+            } else {
+                $todayQuery->whereIn('creator_id', $visibleAdminIds);
+            }
+        }
         $todayRows = $todayQuery
             ->field('creator_id, count(*) as cnt, sum(amount) as total_amount')
             ->group('creator_id')
@@ -850,6 +869,9 @@ class OrderLogic
         }
         usort($todayRanking, fn($a, $b) => $b['count'] <=> $a['count']);
 
+        // 数据范围启用时（非 root/全部范围），无可见成员的部门不渲染
+        $hideEmptyDept = $visibleAdminIds !== null;
+
         $deptData = [];
         $assignedIds = [];
         foreach ($depts as $deptId => $deptName) {
@@ -866,6 +888,9 @@ class OrderLogic
                     'amount' => number_format((float)($amounts[$adminId] ?? 0), 2, '.', ''),
                 ];
             }
+            if ($hideEmptyDept && $members === []) {
+                continue;
+            }
             $deptTotal = array_sum(array_column($members, 'count'));
             $deptAmount = array_sum(array_map(fn($m) => (float)$m['amount'], $members));
             $deptData[] = [
diff --git a/server/app/adminapi/logic/tcm/DiagnosisLogic.php b/server/app/adminapi/logic/tcm/DiagnosisLogic.php
index f21333bd..47395d6a 100644
--- a/server/app/adminapi/logic/tcm/DiagnosisLogic.php
+++ b/server/app/adminapi/logic/tcm/DiagnosisLogic.php
@@ -2115,19 +2115,34 @@ class DiagnosisLogic extends BaseLogic
     
     /**
      * @notes 获取医助列表
+     * @param int        $adminId   当前管理员 id（用于数据范围；0 表示不过滤）
+     * @param array|null $adminInfo 当前管理员信息（用于数据范围；null 表示不过滤）
      * @return array
      */
-    public static function getAssistants()
+    public static function getAssistants(int $adminId = 0, ?array $adminInfo = null)
     {
         try {
             // 这里不要用 Admin 模型查询，否则会触发其 append(role_id/dept_id/jobs_id)
             // 每行再发多次查询，形成严重 N+1，统计页会被拖慢到十几秒。
-            $assistants = \think\facade\Db::name('admin')
+            $query = \think\facade\Db::name('admin')
                 ->alias('a')
                 ->join('admin_role ar', 'a.id = ar.admin_id')
                 ->where('ar.role_id', 2)
                 ->where('a.disable', 0)
-                ->whereNull('a.delete_time')
+                ->whereNull('a.delete_time');
+
+            // 数据范围：仅展示当前管理员可见的医助；null = 全部不过滤
+            if ($adminInfo !== null && $adminId > 0) {
+                $visibleIds = \app\common\service\DataScope\DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
+                if ($visibleIds !== null) {
+                    if ($visibleIds === []) {
+                        return [];
+                    }
+                    $query->whereIn('a.id', $visibleIds);
+                }
+            }
+
+            $assistants = $query
                 ->field(['a.id', 'a.name', 'a.account'])
                 ->order('a.id', 'asc')
                 ->distinct(true)
@@ -3105,10 +3120,15 @@ class DiagnosisLogic extends BaseLogic
      * @param array $params start_time, end_time, days(可选，默认7)
      * @return array
      */
-    public static function assistantDiagnosisStats(array $params = [])
+    public static function assistantDiagnosisStats(array $params = [], int $adminId = 0, ?array $adminInfo = null)
     {
         $days = isset($params['days']) ? (int)$params['days'] : 7;
 
+        // 数据范围：当前用户可见 admin id 集合；null 表示全部
+        $visibleAdminIds = ($adminInfo !== null && $adminId > 0)
+            ? \app\common\service\DataScope\DataScopeService::getVisibleAdminIds($adminId, $adminInfo)
+            : null;
+
         $endTime = !empty($params['end_time']) ? strtotime($params['end_time']) : time();
         if ($days === 0) {
             $startTime = strtotime(date('Y-m-d'));
@@ -3127,6 +3147,13 @@ class DiagnosisLogic extends BaseLogic
 
         $assistantIds = \app\common\model\auth\AdminRole::where('role_id', 2)
             ->column('admin_id');
+        // 数据范围交集：仅展示「医助 ∩ 当前用户可见」
+        if ($visibleAdminIds !== null) {
+            $assistantIds = array_values(array_intersect(
+                array_map('intval', $assistantIds),
+                array_map('intval', $visibleAdminIds)
+            ));
+        }
         if (empty($assistantIds)) {
             return [
                 'date_range' => [date('Y-m-d', $startTime), date('Y-m-d', $endTime)],
@@ -3192,6 +3219,9 @@ class DiagnosisLogic extends BaseLogic
         usort($todayRanking, fn($a, $b) => $b['count'] <=> $a['count']);
         $todayRanking = array_values(array_filter($todayRanking, fn($a) => $a['count'] > 0));
 
+        // 数据范围启用时（非 root/全部范围），无可见成员的部门不渲染
+        $hideEmptyDept = $visibleAdminIds !== null;
+
         $deptData = [];
         $assignedAdminIds = [];
         foreach ($depts as $deptId => $deptName) {
@@ -3208,6 +3238,9 @@ class DiagnosisLogic extends BaseLogic
                     'count' => $cnt,
                 ];
             }
+            if ($hideEmptyDept && $assistants === []) {
+                continue;
+            }
             $deptData[] = [
                 'dept_id' => (int)$deptId,
                 'dept_name' => $deptName,
diff --git a/server/app/adminapi/validate/auth/RoleValidate.php b/server/app/adminapi/validate/auth/RoleValidate.php
index 9f2f32d6..48066957 100644
--- a/server/app/adminapi/validate/auth/RoleValidate.php
+++ b/server/app/adminapi/validate/auth/RoleValidate.php
@@ -29,6 +29,7 @@ class RoleValidate extends BaseValidate
         'id' => 'require|checkRole',
         'name' => 'require|max:64|unique:' . SystemRole::class . ',name',
         'menu_id' => 'array',
+        'data_scope' => 'in:1,2,3,4',
     ];
 
     protected $message = [
@@ -36,7 +37,8 @@ class RoleValidate extends BaseValidate
         'name.require' => '请输入角色名称',
         'name.max' => '角色名称最长为16个字符',
         'name.unique' => '角色名称已存在',
-        'menu_id.array' => '权限格式错误'
+        'menu_id.array' => '权限格式错误',
+        'data_scope.in' => '数据范围取值不合法',
     ];
 
     /**
@@ -47,7 +49,7 @@ class RoleValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['name', 'menu_id']);
+        return $this->only(['name', 'menu_id', 'data_scope']);
     }
 
     /**
diff --git a/server/app/common/lists/Traits/HasDataScopeFilter.php b/server/app/common/lists/Traits/HasDataScopeFilter.php
new file mode 100644
index 00000000..45e6425c
--- /dev/null
+++ b/server/app/common/lists/Traits/HasDataScopeFilter.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\common\lists\Traits;
+
+use app\common\service\DataScope\DataScopeService;
+use think\db\Query;
+
+/**
+ * 列表按「数据范围」过滤。
+ *
+ * 使用前置条件：宿主类须通过 BaseAdminDataLists 获得 $this->adminId 与 $this->adminInfo。
+ *
+ * 三种用法：
+ *  - applyDataScopeByOwner($q, 'creator_id')                       直接按某列 IN
+ *  - applyDataScopeByOwnerColumns($q, ['creator_id', 'doctor_id']) 多列 OR
+ *  - applyDataScopeByExists($q, $sqlTemplate, 'owner_expr')        通过 exists 子查询（跨表）
+ */
+trait HasDataScopeFilter
+{
+    /**
+     * 单列过滤。null 表示豁免（ALL）。
+     */
+    protected function applyDataScopeByOwner($query, string $ownerField): bool
+    {
+        if (!$this->dataScopeShouldApply()) {
+            return false;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return false;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return true;
+        }
+        $query->whereIn($ownerField, $ids);
+
+        return true;
+    }
+
+    /**
+     * 多列 OR 过滤（任意属主列命中即可）。
+     *
+     * @param string[] $ownerFields
+     */
+    protected function applyDataScopeByOwnerColumns($query, array $ownerFields): bool
+    {
+        if (!$this->dataScopeShouldApply()) {
+            return false;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return false;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return true;
+        }
+        $query->where(function ($q) use ($ownerFields, $ids) {
+            $first = true;
+            foreach ($ownerFields as $f) {
+                if ($first) {
+                    $q->whereIn($f, $ids);
+                    $first = false;
+                } else {
+                    $q->whereOr(function ($qq) use ($f, $ids) {
+                        $qq->whereIn($f, $ids);
+                    });
+                }
+            }
+        });
+
+        return true;
+    }
+
+    /**
+     * exists 子查询方式。
+     * $subSqlTemplate 内部可使用占位符 `__OWNER_IDS__`，将被替换成逗号分隔的整数列表。
+     */
+    protected function applyDataScopeByExistsSql($query, string $subSqlTemplate): bool
+    {
+        if (!$this->dataScopeShouldApply()) {
+            return false;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return false;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return true;
+        }
+        $inList = implode(',', $ids);
+        $sql    = str_replace('__OWNER_IDS__', $inList, $subSqlTemplate);
+        $query->whereExists($sql);
+
+        return true;
+    }
+
+    /**
+     * 可见 admin id；null = 全部。
+     *
+     * @return array<int>|null
+     */
+    protected function getDataScopeVisibleAdminIds(): ?array
+    {
+        $adminId   = property_exists($this, 'adminId') ? (int) $this->adminId : 0;
+        $adminInfo = property_exists($this, 'adminInfo') && is_array($this->adminInfo) ? $this->adminInfo : [];
+
+        return DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
+    }
+
+    protected function dataScopeShouldApply(): bool
+    {
+        return DataScopeService::isEnabled();
+    }
+}
diff --git a/server/app/common/service/DataScope/DataScopeService.php b/server/app/common/service/DataScope/DataScopeService.php
new file mode 100644
index 00000000..2802422b
--- /dev/null
+++ b/server/app/common/service/DataScope/DataScopeService.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\common\service\DataScope;
+
+use app\adminapi\logic\dept\DeptLogic;
+use app\common\model\auth\AdminDept;
+use app\common\model\auth\AdminRole;
+use app\common\model\auth\SystemRole;
+use think\facade\Config;
+
+/**
+ * 数据范围（数据隔离）工具服务。
+ *
+ * 设计约定：
+ *  - ALL (1)            = 全部数据，不附加过滤
+ *  - DEPT_AND_CHILD (2) = 本部门及所有子部门（取 admin 全部部门的并集）
+ *  - DEPT (3)           = 仅本部门（取 admin 全部部门的并集，不含子孙）
+ *  - SELF (4)           = 仅本人
+ *
+ * 多角色时取「范围最大」= data_scope 最小值。
+ * root 管理员固定为 ALL。未挂任何部门时，范围退化为 SELF（可由 config 关闭）。
+ *
+ * 关键返回：`getVisibleAdminIds` 返回 int[]（可见 admin_id 集合）或 null（ALL = 不过滤）。
+ */
+class DataScopeService
+{
+    public const SCOPE_ALL            = 1;
+    public const SCOPE_DEPT_AND_CHILD = 2;
+    public const SCOPE_DEPT           = 3;
+    public const SCOPE_SELF           = 4;
+
+    /**
+     * 计算当前 admin 的有效数据范围。
+     */
+    public static function getEffectiveScope(array $adminInfo): int
+    {
+        if (!self::isEnabled()) {
+            return self::SCOPE_ALL;
+        }
+        if ((int) ($adminInfo['root'] ?? 0) === 1) {
+            return self::SCOPE_ALL;
+        }
+        $roleIds = array_values(array_filter(array_map(
+            'intval',
+            is_array($adminInfo['role_id'] ?? null) ? $adminInfo['role_id'] : []
+        )));
+        $exempt = array_map('intval', Config::get('project.data_scope.exempt_roles', []) ?: []);
+        if ($roleIds !== [] && array_intersect($roleIds, $exempt) !== []) {
+            return self::SCOPE_ALL;
+        }
+        if ($roleIds === []) {
+            return self::SCOPE_SELF;
+        }
+        $scopes = SystemRole::whereIn('id', $roleIds)
+            ->whereNull('delete_time')
+            ->column('data_scope');
+        $scopes = array_values(array_filter(array_map('intval', $scopes), static function (int $v): bool {
+            return $v >= self::SCOPE_ALL && $v <= self::SCOPE_SELF;
+        }));
+        if ($scopes === []) {
+            return self::SCOPE_ALL;
+        }
+
+        return (int) min($scopes);
+    }
+
+    /**
+     * 可见 admin id 集合；null = 不过滤（ALL）
+     *
+     * @return array<int>|null
+     */
+    public static function getVisibleAdminIds(int $adminId, array $adminInfo): ?array
+    {
+        $scope = self::getEffectiveScope($adminInfo);
+        if ($scope === self::SCOPE_ALL) {
+            return null;
+        }
+
+        if ($scope === self::SCOPE_SELF) {
+            return $adminId > 0 ? [$adminId] : [];
+        }
+
+        $myDeptIds = AdminDept::where('admin_id', $adminId)->column('dept_id');
+        $myDeptIds = array_values(array_filter(array_map('intval', $myDeptIds), static function (int $v): bool {
+            return $v > 0;
+        }));
+
+        if ($myDeptIds === []) {
+            $fallback = (bool) Config::get('project.data_scope.no_dept_fallback_self', true);
+
+            return $fallback ? [$adminId] : [];
+        }
+
+        $targetDeptIds = [];
+        if ($scope === self::SCOPE_DEPT) {
+            $targetDeptIds = $myDeptIds;
+        } else {
+            foreach ($myDeptIds as $did) {
+                foreach (DeptLogic::getSelfAndDescendantIds($did) as $id) {
+                    $id = (int) $id;
+                    if ($id > 0) {
+                        $targetDeptIds[$id] = true;
+                    }
+                }
+            }
+            $targetDeptIds = array_keys($targetDeptIds);
+        }
+
+        if ($targetDeptIds === []) {
+            return $adminId > 0 ? [$adminId] : [];
+        }
+
+        $ids = AdminDept::whereIn('dept_id', $targetDeptIds)->column('admin_id');
+        $ids = array_values(array_unique(array_filter(array_map('intval', $ids), static function (int $v): bool {
+            return $v > 0;
+        })));
+        if ($adminId > 0 && !in_array($adminId, $ids, true)) {
+            $ids[] = $adminId;
+        }
+
+        return $ids;
+    }
+
+    public static function isEnabled(): bool
+    {
+        return (bool) Config::get('project.data_scope.enabled', true);
+    }
+
+    public static function isAll(array $adminInfo): bool
+    {
+        return self::getEffectiveScope($adminInfo) === self::SCOPE_ALL;
+    }
+
+    /**
+     * 文字描述（日志 / 接口返回可选使用）
+     */
+    public static function scopeLabel(int $scope): string
+    {
+        return [
+            self::SCOPE_ALL            => '全部',
+            self::SCOPE_DEPT_AND_CHILD => '本部门及下级',
+            self::SCOPE_DEPT           => '仅本部门',
+            self::SCOPE_SELF           => '仅本人',
+        ][$scope] ?? '全部';
+    }
+}
diff --git a/server/config/project.php b/server/config/project.php
index f5239fdb..99287eda 100644
--- a/server/config/project.php
+++ b/server/config/project.php
@@ -123,6 +123,20 @@ return [
     // 业务订单列表金额统计：医助角色 ID；非支付审核白名单的医助仅统计其诊单 assistant_id=本人 的业绩
     'prescription_order_stats_assistant_role_id' => 2,
 
+    /*
+     * 数据隔离（按部门）：全局可用，角色上的 data_scope 控制范围
+     * 1=全部 2=本部门及下级 3=仅本部门 4=仅本人
+     * root 管理员永远视为「全部」；多角色取最大范围（数值最小）
+     */
+    'data_scope' => [
+        // 顶层总开关：false 时所有列表不应用按部门的数据隔离（仍保留老的白名单规则）
+        'enabled' => true,
+        // 兜底：当用户未挂任何部门、且角色非「全部」时，只能看到自己（true=只看自己；false=返回空）
+        'no_dept_fallback_self' => true,
+        // 跳过 DataScope 的豁免角色 ID（冗余开关；一般优先用角色 data_scope=1 表达）
+        'exempt_roles' => [],
+    ],
+
     // 腾讯云实时音视频(TRTC)配置
     'trtc' => [
         'sdkAppId' => (int)env('trtc.sdk_app_id', 1600127710),
diff --git a/server/database/migrations/2026_04_24_system_role_data_scope.sql b/server/database/migrations/2026_04_24_system_role_data_scope.sql
new file mode 100644
index 00000000..948b2ebb
--- /dev/null
+++ b/server/database/migrations/2026_04_24_system_role_data_scope.sql
@@ -0,0 +1,9 @@
+-- 角色表新增数据范围（数据隔离）字段
+-- 1=全部数据（免隔离，root 默认全部）
+-- 2=本部门及子部门（按 admin_dept 关联 + dept 树的后代汇总可见 admin_id）
+-- 3=仅本部门
+-- 4=仅本人
+-- 迁移后保持旧行为：所有现有角色默认 1（全部），需要管理员按需逐角色改为 2/3/4 激活隔离
+ALTER TABLE `zyt_system_role`
+    ADD COLUMN `data_scope` tinyint(1) NOT NULL DEFAULT 1
+        COMMENT '数据范围：1全部 2本部门及下级 3仅本部门 4仅本人' AFTER `sort`;