From 9cba8fea1242372dd2f837462087f1f336afdb54 Mon Sep 17 00:00:00 2001
From: sindir <sindirhuang@gmail.com>
Date: Mon, 19 Jan 2026 15:43:34 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=AD=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20###=20=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=201.=20=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BBDoctorPhrase=EF=BC=9A=E5=AD=97=E6=AE=B5/?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E8=B0=83=E6=95=B4=202.=20=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9A=E6=96=B0=E5=A2=9EDoctorPhraseAppTyp?=
 =?UTF-8?q?eEnum/DoctorPhraseBizTypeEnum=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=88=86=E7=B1=BB=203.=20=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=B1=BB=EF=BC=9A=E4=BF=AE=E6=AD=A3=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D=E6=8B=BC=E5=86=99=EF=BC=88DoctorPhraesAppS=20?=
 =?UTF-8?q?=E2=86=92=20DoctorPhraseAppServiceImpl=20###=20=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9=201.=20=E5=B8=B8=E7=94=A8=E8=AF=AD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=88doctorphrase/index?=
 =?UTF-8?q?.vue=EF=BC=89=EF=BC=9A=20=20=20=20=E4=B8=9A=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=A1=AC=E7=BC=96=E7=A0=81=E6=9B=BF=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=EF=BC=88=E4=B8=BB=E8=AF=89/=E7=8E=B0?=
 =?UTF-8?q?=E7=97=85=E5=8F=B2/=E6=9C=AF=E5=89=8D/=E6=9C=AF=E5=90=8E/?=
 =?UTF-8?q?=E6=97=A2=E5=BE=80=E5=8F=B2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...l.java => DoctorPhraseAppServiceImpl.java} |   2 +-
 .../openhis/template/domain/DoctorPhrase.java |   7 +
 .../enums/DoctorPhraseBizTypeEnum.java        |  40 ++
 .../doctorstation/doctorphrase/index.vue      | 398 ++++++++----------
 4 files changed, 228 insertions(+), 219 deletions(-)
 rename openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/{DoctorPhraesAppServiceImpl.java => DoctorPhraseAppServiceImpl.java} (97%)
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
index 0f7e7dd6..a3113190 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
@@ -13,7 +13,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class DoctorPhraesAppServiceImpl implements IDoctorPhraseAppService {
+public class DoctorPhraseAppServiceImpl implements IDoctorPhraseAppService {
 
     @Resource
     private IDoctorPhraseService doctorPhraseService;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
index df260baa..0a15e4fe 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
@@ -1,12 +1,14 @@
 package com.openhis.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 
 @Data
@@ -28,8 +30,13 @@ public class DoctorPhrase {
     private Integer phraseType;
 
     /** 业务分类（主诉/现病史等） */
+    @NotBlank(message = "业务分类不能为空")
     private String phraseCategory;
 
+    // 非数据库字段，用于前端展示名称
+    @TableField(exist = false)
+    private String businessTypeName;
+
     /** 模板内容 */
     private String phraseContent;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java
new file mode 100644
index 00000000..71808efa
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java
@@ -0,0 +1,40 @@
+package com.openhis.template.enums;
+
+// 枚举类不需要任何Lombok注解（@Data/@AllArgsConstructor/@NoArgsConstructor都删掉）
+public enum DoctorPhraseBizTypeEnum {
+    // 1. 枚举项：直接传值（不用code:xxx，直接写字符串）
+    MAIN_COMPLAINT("MAIN_COMPLAINT", "主诉"),
+    PRESENT_HISTORY("PRESENT_HISTORY", "现病史"),
+    PRE_OPERATION("PRE_OPERATION", "术前"),
+    POST_OPERATION("POST_OPERATION", "术后"),
+    PAST_HISTORY("PAST_HISTORY", "既往史");
+
+    // 2. 定义枚举的成员变量（private final 保证不可变）
+    private final String code;   // 数据库存储的编码
+    private final String name;   // 前端展示的名称
+
+    // 3. 手动写私有构造器（枚举构造器必须私有，且要给变量赋值）
+    DoctorPhraseBizTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    // 4. 提供getter方法（枚举没有setter，因为枚举项是常量，不能改）
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    // 【可选】添加工具方法：根据code找对应的枚举（前端传code时，后端快速匹配）
+    public static DoctorPhraseBizTypeEnum getByCode(String code) {
+        for (DoctorPhraseBizTypeEnum enumObj : values()) {
+            if (enumObj.getCode().equals(code)) {
+                return enumObj;
+            }
+        }
+        return null; // 或抛异常：throw new IllegalArgumentException("无效的业务分类编码：" + code);
+    }
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
index 41fb025d..cea611dd 100644
--- a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
@@ -7,65 +7,46 @@
         <el-option label="科室" :value="2"></el-option>
         <el-option label="全院" :value="3"></el-option>
       </el-select>
-      <el-input
-        v-model="searchKeyword" 
-        placeholder="请输入名称"
-        style="width: 240px; margin-left: 10px;"
-        @keyup.enter="handleSearch"
-      ></el-input>
-      <el-button style="margin-left: 10px;" @click="handleSearch"><el-icon><Search /></el-icon> 查询</el-button>
-      <el-button style="margin-left: 10px;" @click="handleReset"><el-icon><Refresh /></el-icon> 重置</el-button>
-      <el-button type="primary" style="margin-left: 10px;" @click="showAddDialog"><el-icon><Plus /></el-icon> 增加</el-button>
+      <el-input v-model="searchKeyword" placeholder="请输入名称" style="width: 240px; margin-left: 10px;"
+        @keyup.enter="handleSearch"></el-input>
+      <el-button style="margin-left: 10px;" @click="handleSearch"><el-icon>
+          <Search />
+        </el-icon> 查询</el-button>
+      <el-button style="margin-left: 10px;" @click="handleReset"><el-icon>
+          <Refresh />
+        </el-icon> 重置</el-button>
+      <el-button type="primary" style="margin-left: 10px;" @click="showAddDialog"><el-icon>
+          <Plus />
+        </el-icon> 增加</el-button>
     </div>
 
     <!-- 表格 -->
     <el-table :data="tableData" style="width: 100%; margin-top: 20px;">
       <el-table-column prop="sortNo" label="排序号" width="200">
         <template #default="scope">
-          <el-input-number
-            v-if="editingId === scope.row.id"
-            v-model="editForm.sortNo"
-            :min="1"
-            :step="1"
-            style="width: 100%"
-          />
+          <el-input-number v-if="editingId === scope.row.id" v-model="editForm.sortNo" :min="1" :step="1"
+            style="width: 100%" />
           <span v-else>{{ scope.row.sortNo }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="phraseName" label="名称" width="250">
         <template #default="scope">
-          <el-input
-            v-if="editingId === scope.row.id"
-            v-model="editForm.phraseName"
-            placeholder="请输入名称(不超过50字)"
-            maxlength="50"
-            show-word-limit
-            style="width: 100%"
-          />
+          <el-input v-if="editingId === scope.row.id" v-model="editForm.phraseName" placeholder="请输入名称(不超过50字)"
+            maxlength="50" show-word-limit style="width: 100%" />
           <span v-else>{{ scope.row.phraseName }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="phraseContent" label="内容">
         <template #default="scope">
-          <el-input
-            v-if="editingId === scope.row.id"
-            v-model="editForm.phraseContent"
-            placeholder="请输入内容"
-            type="textarea"
-            :rows="3"
-            style="width: 100%"
-          />
+          <el-input v-if="editingId === scope.row.id" v-model="editForm.phraseContent" placeholder="请输入内容"
+            type="textarea" :rows="3" style="width: 100%;" />
           <span v-else>{{ scope.row.phraseContent }}</span>
         </template>
       </el-table-column>
       <el-table-column label="范围" width="250">
         <template #default="scope">
-          <el-select
-            v-if="editingId === scope.row.id"
-            v-model="editForm.phraseType"
-            placeholder="请选择范围"
-            style="width: 100%"
-          >
+          <el-select v-if="editingId === scope.row.id" v-model="editForm.phraseType" placeholder="请选择范围"
+            style="width: 100%">
             <el-option label="个人" :value="1"></el-option>
             <el-option label="科室" :value="2"></el-option>
             <el-option label="全院" :value="3"></el-option>
@@ -73,21 +54,13 @@
           <span v-else>{{ getScopeName(scope.row.phraseType) }}</span>
         </template>
       </el-table-column>
+      <!-- 【修改1】业务分类列：删除硬编码的“病愈”选项，统一用枚举 -->
       <el-table-column label="业务分类" width="200">
         <template #default="scope">
-          <el-select
-            v-if="editingId === scope.row.id"
-            v-model="editForm.phraseCategory"
-            placeholder="请选择业务分类"
-            style="width: 100%"
-          >
-            <el-option label="病愈" value="12"></el-option>
-            <el-option
-              v-for="item in businessclassification"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-if="editingId === scope.row.id" v-model="editForm.phraseCategory" placeholder="请选择业务分类"
+            style="width: 100%">
+            <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
           <span v-else>{{ getBusinessTypeName(scope.row.phraseCategory) }}</span>
         </template>
@@ -96,37 +69,23 @@
         <template #default="scope">
           <!-- 编辑状态 -->
           <template v-if="editingId === scope.row.id">
-            <el-button
-              type="success"
-              size="small"
-              @click="handleSave"
-            >
-              <el-icon><Check /></el-icon> 保存
+            <el-button type="success" size="small" @click="handleSave">
+              <el-icon>
+                <Check />
+              </el-icon> 保存
             </el-button>
-            <el-button
-              type="warning"
-              size="small"
-              style="margin-left: 5px;"
-              @click="handleCancel"
-            >
-              <el-icon><Close /></el-icon> 取消
+            <el-button type="warning" size="small" style="margin-left: 5px;" @click="handleCancel">
+              <el-icon>
+                <Close />
+              </el-icon> 取消
             </el-button>
           </template>
           <!-- 非编辑状态 -->
           <template v-else>
-            <el-button
-              type="primary"
-              size="small"
-              @click="handleEdit(scope.row)"
-            >
+            <el-button type="primary" size="small" @click="handleEdit(scope.row)">
               编辑
             </el-button>
-            <el-button
-              type="danger"
-              size="small"
-              style="margin-left: 5px;"
-              @click="handleDelete(scope.row)"
-            >
+            <el-button type="danger" size="small" style="margin-left: 5px;" @click="handleDelete(scope.row)">
               删除
             </el-button>
           </template>
@@ -136,54 +95,34 @@
 
     <!-- 分页 -->
     <div class="pagination-container">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[15, 30, 50]"
-        :page-size="pageSize"
-        layout="total, prev, pager, next, jumper, sizes"
-        :total="total"
-      ></el-pagination>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[15, 30, 50]" :page-size="pageSize" layout="total, prev, pager, next, jumper, sizes"
+        :total="total"></el-pagination>
     </div>
 
     <!-- 新增模态框 -->
-    <el-dialog
-      v-model="addDialogVisible"
-      title="新增医生常用语"
-      width="600px"
-      center
-    >
-      <el-form ref="addFormRef" :model="addForm" :rules="rules" label-width="100px" class="add-form">
-        <el-form-item label="名称" prop="phraseName" required>
-          <el-input v-model="addForm.phraseName" placeholder="请输入常用语名称(不超过50字)" maxlength="50" show-word-limit style="width: 100%;"></el-input>
+    <el-dialog v-model="addDialogVisible" title="新增医生常用语" width="600px" center>
+      <!-- 【修改2】绑定编辑表单的ref和验证规则 -->
+      <el-form ref="addFormRef" :model="addForm" :rules="addRules" label-width="100px" class="add-form">
+        <el-form-item label="名称" prop="phraseName">
+          <el-input v-model="addForm.phraseName" placeholder="请输入常用语名称(不超过50字)" maxlength="50" show-word-limit
+            style="width: 100%;"></el-input>
         </el-form-item>
-        <el-form-item label="内容" prop="phraseContent" required>
-          <el-input
-            v-model="addForm.phraseContent"
-            placeholder="请输入常用语内容"
-            type="textarea"
-            :rows="4"
-            style="width: 100%;"
-          ></el-input>
+        <el-form-item label="内容" prop="phraseContent">
+          <el-input v-model="addForm.phraseContent" placeholder="请输入常用语内容" type="textarea" :rows="4"
+            style="width: 100%;"></el-input>
         </el-form-item>
         <el-form-item label="排序号">
           <el-input-number v-model="addForm.sortNo" :min="1" :step="1" style="width: 100%;"></el-input-number>
         </el-form-item>
-        <el-form-item label="业务分类">
+        <!-- 【修改3】新增表单业务分类：删除硬编码“病愈”，用枚举 -->
+        <el-form-item label="业务分类" prop="phraseCategory">
           <el-select v-model="addForm.phraseCategory" placeholder="请选择业务分类" style="width: 100%;">
-            <!-- 默认添加"病愈"选项 -->
-            <el-option label="病愈" value="12"></el-option>
-            <!-- 从数据字典获取其他选项 -->
-            <el-option
-              v-for="item in businessclassification"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+            <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="范围">
+        <el-form-item label="范围" prop="phraseType">
           <el-select v-model="addForm.phraseType" placeholder="请选择范围" style="width: 100%;">
             <el-option label="个人" :value="1"></el-option>
             <el-option label="科室" :value="2"></el-option>
@@ -202,8 +141,8 @@
 </template>
 
 <script setup>
-import {onMounted, ref} from 'vue'
-import {Check, Close, Plus, Refresh, Search} from '@element-plus/icons-vue'
+import { onMounted, ref } from 'vue'
+import { Check, Close, Plus, Refresh, Search } from '@element-plus/icons-vue'
 import {
   addDoctorPhrase,
   deleteDoctorPhrase,
@@ -211,12 +150,22 @@ import {
   searchDoctorPhraseList,
   updateDoctorPhrase
 } from './api'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useDict} from '@/utils/dict'
+import { ElMessage, ElMessageBox } from 'element-plus'
+// 【修改4】如果数据字典未对齐后端枚举，暂时注释useDict，改用固定枚举（后续可替换为dict）
+// import { useDict } from '@/utils/dict'
+
+// 【核心修改】定义和后端枚举对齐的业务分类选项（替换原businessclassification）
+const businessTypeOptions = ref([
+  { label: '主诉', value: 'MAIN_COMPLAINT' },
+  { label: '现病史', value: 'PRESENT_HISTORY' },
+  { label: '术前', value: 'PRE_OPERATION' },
+  { label: '术后', value: 'POST_OPERATION' },
+  { label: '既往史', value: 'PAST_HISTORY' }
+])
 
 // 搜索条件
- const searchScope = ref(null)  // null表示未选择，数字类型：1=个人，2=科室，3=全院
- const searchKeyword = ref('')
+const searchScope = ref(null)  // null表示未选择，数字类型：1=个人，2=科室，3=全院
+const searchKeyword = ref('')
 
 // 表格数据
 const tableData = ref([])
@@ -229,50 +178,61 @@ const total = ref(0)
 // 新增模态框相关
 const addDialogVisible = ref(false)
 const addFormRef = ref()
+// 【修改5】新增表单默认值：删除“病愈”硬编码，业务分类默认空
 const addForm = ref({
   phraseName: '',
   phraseContent: '',
   sortNo: 1,
   phraseType: 1,
-  phraseCategory: '病愈'
+  phraseCategory: '' // 业务分类默认空，强制用户选择
 })
 
-// 表单验证规则
-const rules = {
+// 【修改6】完善新增表单验证规则（补充业务分类必填）
+const addRules = {
   phraseName: [
-    { required: true, message: '请输入常用语名称', trigger: 'blur' }
+    { required: true, message: '请输入常用语名称', trigger: 'blur' },
+    { max: 50, message: '常用语名称不能超过50字', trigger: 'blur' }
   ],
   phraseContent: [
     { required: true, message: '请输入常用语内容', trigger: 'blur' }
   ],
   phraseType: [
     { required: true, message: '请选择范围', trigger: 'change' }
+  ],
+  phraseCategory: [
+    { required: true, message: '请选择业务分类', trigger: 'change' }
   ]
 }
 
 // 编辑状态管理
 const editingId = ref(null)
 const editForm = ref({})
+// 【修改7】完善编辑表单验证规则
 const editRules = {
   phraseName: [
-    { required: true, message: '请输入常用语名称', trigger: 'blur' }
+    { required: true, message: '请输入常用语名称', trigger: 'blur' },
+    { max: 50, message: '常用语名称不能超过50字', trigger: 'blur' }
   ],
   phraseContent: [
     { required: true, message: '请输入常用语内容', trigger: 'blur' }
+  ],
+  phraseType: [
+    { required: true, message: '请选择范围', trigger: 'change' }
+  ],
+  phraseCategory: [
+    { required: true, message: '请选择业务分类', trigger: 'change' }
   ]
 }
 
-// 获取业务分类数据字典
-const { businessclassification } = useDict('businessclassification')
+// 【废弃】原数据字典（后续如需对接dict，需确保dict的value是后端编码：MAIN_COMPLAINT等）
+// const { businessclassification } = useDict('businessclassification')
 
-// 获取业务分类名称
-const getBusinessTypeName = (category) => {
-  // 直接返回后端返回的phrase_category字段值
-  // 从数据库截图看，phrase_category已经是中文名称："主诉"、"现病史"、"术后"等
-  if (category) {
-    return category
-  }
-  return '未知类型'
+// 【修改8】重构业务分类名称转换方法（适配后端编码→中文）
+const getBusinessTypeName = (code) => {
+  if (!code) return '未知类型'
+  // 从枚举选项中匹配编码，返回中文名称
+  const item = businessTypeOptions.value.find(item => item.value === code)
+  return item ? item.label : '未知类型'
 }
 
 // 获取范围名称
@@ -290,25 +250,25 @@ const validatePhraseName = (phraseName, excludeId = null) => {
   if (!phraseName || !phraseName.trim()) {
     return { valid: false, message: '请输入常用语名称' }
   }
-  
+
   // 检查字数限制
   if (phraseName.trim().length > 50) {
     return { valid: false, message: '常用语名称不能超过50字' }
   }
-  
+
   // 检查名称是否已存在
   const existingPhrase = allData.value.find(item => {
     // 排除自身（更新时）
     if (excludeId && item.id === excludeId) {
       return false
     }
-    return item.phraseName === phraseName.trim()
+    return item.phraseName.trim() === phraseName.trim()
   })
-  
+
   if (existingPhrase) {
     return { valid: false, message: '常用语名称已存在，请输入不同的名称' }
   }
-  
+
   return { valid: true, message: '' }
 }
 
@@ -323,7 +283,7 @@ const fetchDoctorPhraseList = async () => {
     if (response.code === 200 && response.data && response.data.data) {
       // 按照sortNo由小到大排序
       allData.value = response.data.data.sort((a, b) => a.sortNo - b.sortNo)
-      total.value = response.data.data.length
+      total.value = allData.value.length
       // 执行客户端分页
       applyPagination()
     } else {
@@ -332,6 +292,7 @@ const fetchDoctorPhraseList = async () => {
       total.value = 0
     }
   } catch (error) {
+    console.error('获取列表失败：', error) // 【优化】增加控制台日志便于调试
     ElMessage.error('获取数据失败: 网络请求错误')
     allData.value = []
     total.value = 0
@@ -343,7 +304,8 @@ const handleReset = () => {
   // 重置搜索条件
   searchScope.value = null
   searchKeyword.value = ''
-  
+  // 重置分页到第一页
+  currentPage.value = 1
   // 重新加载所有数据
   fetchDoctorPhraseList()
 }
@@ -370,18 +332,15 @@ const handleCurrentChange = (val) => {
 const handleSearch = async () => {
   try {
     // searchScope可能是null（未选择）、1=个人，2=科室，3=全院
-    const searchScopeValue = searchScope.value
-    const phraseType = searchScopeValue === null ? undefined : searchScopeValue
-    
+    const phraseType = searchScope.value === null ? undefined : searchScope.value
+
     // 调用搜索接口：phraseName, phraseType
-    // 如果phraseType为undefined，则后端不会按范围过滤，查询所有数据
     const response = await searchDoctorPhraseList(searchKeyword.value, phraseType)
-    
-    // 处理后端返回的数据结构：data.data
+
     if (response.code === 200 && response.data && response.data.data) {
       // 按照sortNo由小到大排序
       allData.value = response.data.data.sort((a, b) => a.sortNo - b.sortNo)
-      total.value = response.data.data.length
+      total.value = allData.value.length
       currentPage.value = 1 // 搜索后重置到第一页
       applyPagination() // 应用分页
     } else {
@@ -390,6 +349,7 @@ const handleSearch = async () => {
       total.value = 0
     }
   } catch (error) {
+    console.error('搜索失败：', error)
     ElMessage.error('搜索失败: 网络请求错误')
     allData.value = []
     total.value = 0
@@ -399,13 +359,17 @@ const handleSearch = async () => {
 // 打开新增模态框
 const showAddDialog = () => {
   // 重置表单
-    addForm.value = {
-      phraseName: '',
-      phraseContent: '',
-      sortNo: 1,
-      phraseType: 1,
-      phraseCategory: '病愈'
-    }
+  addForm.value = {
+    phraseName: '',
+    phraseContent: '',
+    sortNo: 1,
+    phraseType: 1,
+    phraseCategory: '' // 【修改9】默认空，强制选择
+  }
+  // 重置表单验证状态
+  if (addFormRef.value) {
+    addFormRef.value.clearValidate()
+  }
   // 打开模态框
   addDialogVisible.value = true
 }
@@ -413,54 +377,43 @@ const showAddDialog = () => {
 // 提交新增表单
 const handleAdd = async () => {
   try {
-    // 验证表单
-    await addFormRef.value.validate()
-    
+    // 先执行表单验证
+    const validateResult = await addFormRef.value.validate()
+    if (!validateResult) return
+
     // 名称唯一性校验
     const nameValidation = validatePhraseName(addForm.value.phraseName)
     if (!nameValidation.valid) {
       ElMessage.error(nameValidation.message)
       return
     }
-    
+
     // 添加数据库要求的必填默认字段
     const formData = {
       ...addForm.value,
-      phraseCode: 'PHR000',
+      phraseCode: 'PHR000', // 建议后端自动生成，前端可传空
       enableFlag: 1,
-      staffId: 1001,
-      deptCode: 'DEPT001',
-      creatorId: 1001
+      staffId: 1001, // 建议从登录态获取，不要硬编码
+      deptCode: 'DEPT001', // 建议从登录态获取
+      creatorId: 1001 // 建议从登录态获取
     }
-    
+
     // 调用新增接口
     const response = await addDoctorPhrase(formData)
-    
+
     // 处理新增结果
     if (response.code === 200) {
       ElMessage.success('新增成功')
-      // 关闭模态框
       addDialogVisible.value = false
-      // 将新数据添加到数组开头，使新增的数据在表格最上方显示
-      const newData = {
-        ...formData,
-        id: response.data.id || Date.now() // 使用后端返回的id或当前时间戳作为临时id
-      }
-      allData.value.unshift(newData)
-      total.value = allData.value.length
-      // 重新应用分页
-      applyPagination()
+      // 重新拉取数据（比手动unshift更可靠，避免数据不一致）
+      fetchDoctorPhraseList()
     } else {
       ElMessage.error('新增失败: ' + (response.msg || '未知错误'))
     }
   } catch (error) {
+    console.error('新增失败：', error)
     // 表单验证失败或其他错误
-    if (error instanceof Error) {
-      ElMessage.error('请填写完整信息或网络请求错误')
-    } else {
-      // 表单验证失败的情况
-      ElMessage.error('请填写完整信息')
-    }
+    ElMessage.error('新增失败: 请填写完整信息或网络异常')
   }
 }
 
@@ -468,33 +421,31 @@ const handleAdd = async () => {
 const handleDelete = async (row) => {
   try {
     // 弹出确认对话框
-    await ElMessageBox.confirm('确定要删除该常用语吗？', '删除确认', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-    
+    await ElMessageBox.confirm(
+      '确定要删除该常用语吗？删除后无法恢复！',
+      '删除确认',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+    )
+
     // 调用删除接口
     const response = await deleteDoctorPhrase(row.id)
-    
-    // 处理删除结果
+
     if (response.code === 200) {
       ElMessage.success('删除成功')
-      // 重新获取数据以更新界面
+      // 重新拉取数据
       fetchDoctorPhraseList()
     } else {
       ElMessage.error('删除失败: ' + (response.msg || '未知错误'))
     }
   } catch (error) {
-    // 如果用户取消删除，不显示错误信息
-    if (error !== 'cancel' && error !== undefined) {
-      if (error.msg) {
-        ElMessage.error('删除操作失败: ' + error.msg)
-      } else if (error instanceof Error) {
-        ElMessage.error('删除操作失败: 网络请求错误')
-      } else {
-        ElMessage.error('删除操作失败: 未知错误')
-      }
+    // 用户取消删除时不提示错误
+    if (error !== 'cancel') {
+      console.error('删除失败：', error)
+      ElMessage.error('删除操作失败: 网络异常或权限不足')
     }
   }
 }
@@ -503,61 +454,63 @@ const handleDelete = async (row) => {
 const handleEdit = (row) => {
   // 进入编辑状态
   editingId.value = row.id
-  // 复制当前行数据到编辑表单
-  editForm.value = {
-    ...row,
-    // 确保phraseCategory和phraseType类型正确
-    phraseCategory: row.phraseCategory,
-    phraseType: row.phraseType
-  }
+  // 复制当前行数据到编辑表单（深拷贝避免原数据被修改）
+  editForm.value = JSON.parse(JSON.stringify(row))
+  // 确保类型正确
+  editForm.value.sortNo = Number(editForm.value.sortNo) || 1
+  editForm.value.phraseType = Number(editForm.value.phraseType) || 1
 }
 
 // 取消编辑
 const handleCancel = () => {
-  // 退出编辑状态
   editingId.value = null
-  // 清空编辑表单
   editForm.value = {}
 }
 
 // 保存编辑
 const handleSave = async () => {
   try {
-    // 验证表单数据
+    // 基础非空校验
     if (!editForm.value.phraseName || !editForm.value.phraseContent) {
-      ElMessage.error('请填写完整信息')
+      ElMessage.error('请填写名称和内容')
       return
     }
-    
+    if (!editForm.value.phraseCategory) {
+      ElMessage.error('请选择业务分类')
+      return
+    }
+    if (!editForm.value.phraseType) {
+      ElMessage.error('请选择范围')
+      return
+    }
+
     // 名称唯一性校验（排除当前记录）
     const nameValidation = validatePhraseName(editForm.value.phraseName, editingId.value)
     if (!nameValidation.valid) {
       ElMessage.error(nameValidation.message)
       return
     }
-    
+
     // 准备更新数据
     const updateData = {
       ...editForm.value,
-      enableFlag: 1 // 确保启用状态
+      enableFlag: 1,
+      updateTime: new Date().toISOString() // 可选：前端临时赋值，后端最终以自己的为准
     }
-    
+
     // 调用更新接口
     const response = await updateDoctorPhrase(updateData)
-    
-    // 处理更新结果
+
     if (response.code === 200) {
       ElMessage.success('更新成功')
-      // 退出编辑状态
       editingId.value = null
-      // 清空编辑表单
       editForm.value = {}
-      // 重新获取数据以更新界面
       fetchDoctorPhraseList()
     } else {
       ElMessage.error('更新失败: ' + (response.msg || '未知错误'))
     }
   } catch (error) {
+    console.error('更新失败：', error)
     ElMessage.error('更新操作失败: 网络请求错误')
   }
 }
@@ -577,6 +530,10 @@ onMounted(() => {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
+  flex-wrap: wrap;
+  /* 【优化】适配小屏幕，防止按钮换行溢出 */
+  gap: 10px;
+  /* 替换margin-left，更优雅的间距 */
 }
 
 .pagination-container {
@@ -584,4 +541,9 @@ onMounted(() => {
   display: flex;
   justify-content: flex-end;
 }
+
+/* 【优化】新增表单样式适配 */
+.add-form {
+  padding: 10px 0;
+}
 </style>
\ No newline at end of file

From ae96bbd0bb31d65c93dac2db49ae4b8d63f95cf1 Mon Sep 17 00:00:00 2001
From: sindir <sindirhuang@gmail.com>
Date: Mon, 19 Jan 2026 17:25:37 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B8=B8=E7=94=A8?=
 =?UTF-8?q?=E8=AF=AD=E7=AE=A1=E7=90=86=20-=20=E8=A1=8C=E5=86=85=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=94=B9=E4=B8=BA=E5=BC=B9=E7=AA=97=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E3=80=82=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E4=BE=BF=E6=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doctorstation/doctorphrase/index.vue      | 244 ++++++++----------
 1 file changed, 110 insertions(+), 134 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
index cea611dd..0d61d84a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
@@ -23,72 +23,30 @@
     <!-- 表格 -->
     <el-table :data="tableData" style="width: 100%; margin-top: 20px;">
       <el-table-column prop="sortNo" label="排序号" width="200">
-        <template #default="scope">
-          <el-input-number v-if="editingId === scope.row.id" v-model="editForm.sortNo" :min="1" :step="1"
-            style="width: 100%" />
-          <span v-else>{{ scope.row.sortNo }}</span>
-        </template>
       </el-table-column>
       <el-table-column prop="phraseName" label="名称" width="250">
-        <template #default="scope">
-          <el-input v-if="editingId === scope.row.id" v-model="editForm.phraseName" placeholder="请输入名称(不超过50字)"
-            maxlength="50" show-word-limit style="width: 100%" />
-          <span v-else>{{ scope.row.phraseName }}</span>
-        </template>
       </el-table-column>
       <el-table-column prop="phraseContent" label="内容">
-        <template #default="scope">
-          <el-input v-if="editingId === scope.row.id" v-model="editForm.phraseContent" placeholder="请输入内容"
-            type="textarea" :rows="3" style="width: 100%;" />
-          <span v-else>{{ scope.row.phraseContent }}</span>
-        </template>
       </el-table-column>
       <el-table-column label="范围" width="250">
         <template #default="scope">
-          <el-select v-if="editingId === scope.row.id" v-model="editForm.phraseType" placeholder="请选择范围"
-            style="width: 100%">
-            <el-option label="个人" :value="1"></el-option>
-            <el-option label="科室" :value="2"></el-option>
-            <el-option label="全院" :value="3"></el-option>
-          </el-select>
-          <span v-else>{{ getScopeName(scope.row.phraseType) }}</span>
+          {{ getScopeName(scope.row.phraseType) }}
         </template>
       </el-table-column>
-      <!-- 【修改1】业务分类列：删除硬编码的“病愈”选项，统一用枚举 -->
+      <!-- 业务分类列：使用枚举转换中文名称 -->
       <el-table-column label="业务分类" width="200">
         <template #default="scope">
-          <el-select v-if="editingId === scope.row.id" v-model="editForm.phraseCategory" placeholder="请选择业务分类"
-            style="width: 100%">
-            <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
-          </el-select>
-          <span v-else>{{ getBusinessTypeName(scope.row.phraseCategory) }}</span>
+          {{ getBusinessTypeName(scope.row.phraseCategory) }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200" fixed="right">
         <template #default="scope">
-          <!-- 编辑状态 -->
-          <template v-if="editingId === scope.row.id">
-            <el-button type="success" size="small" @click="handleSave">
-              <el-icon>
-                <Check />
-              </el-icon> 保存
-            </el-button>
-            <el-button type="warning" size="small" style="margin-left: 5px;" @click="handleCancel">
-              <el-icon>
-                <Close />
-              </el-icon> 取消
-            </el-button>
-          </template>
-          <!-- 非编辑状态 -->
-          <template v-else>
-            <el-button type="primary" size="small" @click="handleEdit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="danger" size="small" style="margin-left: 5px;" @click="handleDelete(scope.row)">
-              删除
-            </el-button>
-          </template>
+          <el-button type="primary" size="small" @click="showEditDialog(scope.row)">
+            编辑
+          </el-button>
+          <el-button type="danger" size="small" style="margin-left: 5px;" @click="handleDelete(scope.row)">
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -102,7 +60,6 @@
 
     <!-- 新增模态框 -->
     <el-dialog v-model="addDialogVisible" title="新增医生常用语" width="600px" center>
-      <!-- 【修改2】绑定编辑表单的ref和验证规则 -->
       <el-form ref="addFormRef" :model="addForm" :rules="addRules" label-width="100px" class="add-form">
         <el-form-item label="名称" prop="phraseName">
           <el-input v-model="addForm.phraseName" placeholder="请输入常用语名称(不超过50字)" maxlength="50" show-word-limit
@@ -115,7 +72,6 @@
         <el-form-item label="排序号">
           <el-input-number v-model="addForm.sortNo" :min="1" :step="1" style="width: 100%;"></el-input-number>
         </el-form-item>
-        <!-- 【修改3】新增表单业务分类：删除硬编码“病愈”，用枚举 -->
         <el-form-item label="业务分类" prop="phraseCategory">
           <el-select v-model="addForm.phraseCategory" placeholder="请选择业务分类" style="width: 100%;">
             <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label"
@@ -137,6 +93,42 @@
         </span>
       </template>
     </el-dialog>
+
+    <!-- 编辑模态框 -->
+    <el-dialog v-model="editDialogVisible" title="编辑医生常用语" width="600px" center>
+      <el-form ref="editFormRef" :model="editForm" :rules="editRules" label-width="100px" class="add-form">
+        <el-form-item label="名称" prop="phraseName">
+          <el-input v-model="editForm.phraseName" placeholder="请输入常用语名称(不超过50字)" maxlength="50" show-word-limit
+            style="width: 100%;"></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="phraseContent">
+          <el-input v-model="editForm.phraseContent" placeholder="请输入常用语内容" type="textarea" :rows="4"
+            style="width: 100%;"></el-input>
+        </el-form-item>
+        <el-form-item label="排序号">
+          <el-input-number v-model="editForm.sortNo" :min="1" :step="1" style="width: 100%;"></el-input-number>
+        </el-form-item>
+        <el-form-item label="业务分类" prop="phraseCategory">
+          <el-select v-model="editForm.phraseCategory" placeholder="请选择业务分类" style="width: 100%;">
+            <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="范围" prop="phraseType">
+          <el-select v-model="editForm.phraseType" placeholder="请选择范围" style="width: 100%;">
+            <el-option label="个人" :value="1"></el-option>
+            <el-option label="科室" :value="2"></el-option>
+            <el-option label="全院" :value="3"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="editDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleEditSave">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -151,10 +143,10 @@ import {
   updateDoctorPhrase
 } from './api'
 import { ElMessage, ElMessageBox } from 'element-plus'
-// 【修改4】如果数据字典未对齐后端枚举，暂时注释useDict，改用固定枚举（后续可替换为dict）
+// 如果数据字典未对齐后端枚举，暂时注释useDict，改用固定枚举（后续可替换为dict）
 // import { useDict } from '@/utils/dict'
 
-// 【核心修改】定义和后端枚举对齐的业务分类选项（替换原businessclassification）
+// 核心配置：定义和后端枚举对齐的业务分类选项（替换原businessclassification）
 const businessTypeOptions = ref([
   { label: '主诉', value: 'MAIN_COMPLAINT' },
   { label: '现病史', value: 'PRESENT_HISTORY' },
@@ -170,24 +162,24 @@ const searchKeyword = ref('')
 // 表格数据
 const tableData = ref([])
 
-// 分页
+// 分页参数配置
 const currentPage = ref(1)
 const pageSize = ref(15)
 const total = ref(0)
 
-// 新增模态框相关
+// 新增模态框相关配置
 const addDialogVisible = ref(false)
 const addFormRef = ref()
-// 【修改5】新增表单默认值：删除“病愈”硬编码，业务分类默认空
+// 新增表单默认值：业务分类默认空，强制用户选择
 const addForm = ref({
   phraseName: '',
   phraseContent: '',
   sortNo: 1,
   phraseType: 1,
-  phraseCategory: '' // 业务分类默认空，强制用户选择
+  phraseCategory: ''
 })
 
-// 【修改6】完善新增表单验证规则（补充业务分类必填）
+// 完善新增表单验证规则（补充业务分类必填、名称50字限制）
 const addRules = {
   phraseName: [
     { required: true, message: '请输入常用语名称', trigger: 'blur' },
@@ -204,10 +196,20 @@ const addRules = {
   ]
 }
 
-// 编辑状态管理
-const editingId = ref(null)
-const editForm = ref({})
-// 【修改7】完善编辑表单验证规则
+// 编辑模态框相关配置
+const editDialogVisible = ref(false)
+const editFormRef = ref()
+// 编辑表单默认值配置
+const editForm = ref({
+  id: '',
+  phraseName: '',
+  phraseContent: '',
+  sortNo: 1,
+  phraseType: 1,
+  phraseCategory: ''
+})
+
+// 完善编辑表单验证规则（和新增一致，保证校验统一）
 const editRules = {
   phraseName: [
     { required: true, message: '请输入常用语名称', trigger: 'blur' },
@@ -224,18 +226,14 @@ const editRules = {
   ]
 }
 
-// 【废弃】原数据字典（后续如需对接dict，需确保dict的value是后端编码：MAIN_COMPLAINT等）
-// const { businessclassification } = useDict('businessclassification')
-
-// 【修改8】重构业务分类名称转换方法（适配后端编码→中文）
+// 重构业务分类名称转换方法（适配后端编码→中文展示）
 const getBusinessTypeName = (code) => {
   if (!code) return '未知类型'
-  // 从枚举选项中匹配编码，返回中文名称
   const item = businessTypeOptions.value.find(item => item.value === code)
   return item ? item.label : '未知类型'
 }
 
-// 获取范围名称
+// 获取范围名称转换方法
 const getScopeName = (scope) => {
   const scopeMap = {
     1: '个人',
@@ -245,46 +243,41 @@ const getScopeName = (scope) => {
   return scopeMap[scope] || '未知范围'
 }
 
-// 名称唯一性校验函数
+// 名称唯一性校验函数（新增/编辑通用，编辑时排除自身ID）
 const validatePhraseName = (phraseName, excludeId = null) => {
   if (!phraseName || !phraseName.trim()) {
     return { valid: false, message: '请输入常用语名称' }
   }
-
-  // 检查字数限制
+  // 检查字数限制，严格控制50字
   if (phraseName.trim().length > 50) {
     return { valid: false, message: '常用语名称不能超过50字' }
   }
-
-  // 检查名称是否已存在
+  // 检查名称是否已存在，编辑时排除当前记录
   const existingPhrase = allData.value.find(item => {
-    // 排除自身（更新时）
     if (excludeId && item.id === excludeId) {
       return false
     }
     return item.phraseName.trim() === phraseName.trim()
   })
-
   if (existingPhrase) {
     return { valid: false, message: '常用语名称已存在，请输入不同的名称' }
   }
-
   return { valid: true, message: '' }
 }
 
-// 所有数据（用于客户端分页）
+// 所有数据（用于客户端分页处理）
 const allData = ref([])
 
-// 获取医生常用语列表
+// 获取医生常用语列表数据
 const fetchDoctorPhraseList = async () => {
   try {
     const response = await getDoctorPhraseList()
     // 处理后端返回的数据结构：data.data
     if (response.code === 200 && response.data && response.data.data) {
-      // 按照sortNo由小到大排序
+      // 按照sortNo由小到大排序，保证列表顺序正确
       allData.value = response.data.data.sort((a, b) => a.sortNo - b.sortNo)
       total.value = allData.value.length
-      // 执行客户端分页
+      // 执行客户端分页逻辑
       applyPagination()
     } else {
       ElMessage.error('获取数据失败: ' + (response.msg || '未知错误'))
@@ -292,14 +285,14 @@ const fetchDoctorPhraseList = async () => {
       total.value = 0
     }
   } catch (error) {
-    console.error('获取列表失败：', error) // 【优化】增加控制台日志便于调试
+    console.error('获取列表失败：', error) // 增加控制台日志便于调试
     ElMessage.error('获取数据失败: 网络请求错误')
     allData.value = []
     total.value = 0
   }
 }
 
-// 重置功能
+// 重置功能方法
 const handleReset = () => {
   // 重置搜索条件
   searchScope.value = null
@@ -310,33 +303,32 @@ const handleReset = () => {
   fetchDoctorPhraseList()
 }
 
-// 客户端分页处理
+// 客户端分页处理核心方法
 const applyPagination = () => {
   const start = (currentPage.value - 1) * pageSize.value
   const end = start + pageSize.value
   tableData.value = allData.value.slice(start, end)
 }
 
-// 分页处理
+// 分页条数改变事件
 const handleSizeChange = (val) => {
   pageSize.value = val
   applyPagination()
 }
 
+// 分页页码改变事件
 const handleCurrentChange = (val) => {
   currentPage.value = val
   applyPagination()
 }
 
-// 搜索功能
+// 搜索功能核心方法
 const handleSearch = async () => {
   try {
     // searchScope可能是null（未选择）、1=个人，2=科室，3=全院
     const phraseType = searchScope.value === null ? undefined : searchScope.value
-
     // 调用搜索接口：phraseName, phraseType
     const response = await searchDoctorPhraseList(searchKeyword.value, phraseType)
-
     if (response.code === 200 && response.data && response.data.data) {
       // 按照sortNo由小到大排序
       allData.value = response.data.data.sort((a, b) => a.sortNo - b.sortNo)
@@ -356,15 +348,15 @@ const handleSearch = async () => {
   }
 }
 
-// 打开新增模态框
+// 打开新增模态框方法
 const showAddDialog = () => {
-  // 重置表单
+  // 重置表单数据
   addForm.value = {
     phraseName: '',
     phraseContent: '',
     sortNo: 1,
     phraseType: 1,
-    phraseCategory: '' // 【修改9】默认空，强制选择
+    phraseCategory: ''
   }
   // 重置表单验证状态
   if (addFormRef.value) {
@@ -374,7 +366,7 @@ const showAddDialog = () => {
   addDialogVisible.value = true
 }
 
-// 提交新增表单
+// 提交新增表单方法
 const handleAdd = async () => {
   try {
     // 先执行表单验证
@@ -400,7 +392,6 @@ const handleAdd = async () => {
 
     // 调用新增接口
     const response = await addDoctorPhrase(formData)
-
     // 处理新增结果
     if (response.code === 200) {
       ElMessage.success('新增成功')
@@ -417,7 +408,7 @@ const handleAdd = async () => {
   }
 }
 
-// 删除功能
+// 删除功能方法
 const handleDelete = async (row) => {
   try {
     // 弹出确认对话框
@@ -430,10 +421,8 @@ const handleDelete = async (row) => {
         type: 'warning'
       }
     )
-
     // 调用删除接口
     const response = await deleteDoctorPhrase(row.id)
-
     if (response.code === 200) {
       ElMessage.success('删除成功')
       // 重新拉取数据
@@ -450,61 +439,48 @@ const handleDelete = async (row) => {
   }
 }
 
-// 编辑按钮点击事件
-const handleEdit = (row) => {
-  // 进入编辑状态
-  editingId.value = row.id
-  // 复制当前行数据到编辑表单（深拷贝避免原数据被修改）
+// 打开编辑弹窗核心方法 - 点击表格编辑按钮触发
+const showEditDialog = (row) => {
+  // 深拷贝当前行数据到编辑表单，避免原数据被修改
   editForm.value = JSON.parse(JSON.stringify(row))
-  // 确保类型正确
+  // 确保数字类型正确，防止表单赋值异常
   editForm.value.sortNo = Number(editForm.value.sortNo) || 1
   editForm.value.phraseType = Number(editForm.value.phraseType) || 1
+  // 重置表单验证状态
+  if (editFormRef.value) {
+    editFormRef.value.clearValidate()
+  }
+  // 打开编辑弹窗
+  editDialogVisible.value = true
 }
 
-// 取消编辑
-const handleCancel = () => {
-  editingId.value = null
-  editForm.value = {}
-}
-
-// 保存编辑
-const handleSave = async () => {
+// 编辑表单提交保存方法
+const handleEditSave = async () => {
   try {
-    // 基础非空校验
-    if (!editForm.value.phraseName || !editForm.value.phraseContent) {
-      ElMessage.error('请填写名称和内容')
-      return
-    }
-    if (!editForm.value.phraseCategory) {
-      ElMessage.error('请选择业务分类')
-      return
-    }
-    if (!editForm.value.phraseType) {
-      ElMessage.error('请选择范围')
-      return
-    }
+    // 先执行表单验证
+    const validateResult = await editFormRef.value.validate()
+    if (!validateResult) return
 
-    // 名称唯一性校验（排除当前记录）
-    const nameValidation = validatePhraseName(editForm.value.phraseName, editingId.value)
+    // 名称唯一性校验（排除当前编辑的这条记录ID）
+    const nameValidation = validatePhraseName(editForm.value.phraseName, editForm.value.id)
     if (!nameValidation.valid) {
       ElMessage.error(nameValidation.message)
       return
     }
 
-    // 准备更新数据
+    // 准备更新数据，修复时间格式为ISO字符串，适配后端LocalDateTime
     const updateData = {
       ...editForm.value,
       enableFlag: 1,
-      updateTime: new Date().toISOString() // 可选：前端临时赋值，后端最终以自己的为准
+      updateTime: new Date().toISOString() // 前端临时赋值，后端最终以自己的为准
     }
 
     // 调用更新接口
     const response = await updateDoctorPhrase(updateData)
-
     if (response.code === 200) {
       ElMessage.success('更新成功')
-      editingId.value = null
-      editForm.value = {}
+      editDialogVisible.value = false
+      // 重新拉取数据，保证列表数据最新
       fetchDoctorPhraseList()
     } else {
       ElMessage.error('更新失败: ' + (response.msg || '未知错误'))
@@ -515,7 +491,7 @@ const handleSave = async () => {
   }
 }
 
-// 组件挂载时获取数据
+// 组件挂载时初始化加载数据
 onMounted(() => {
   fetchDoctorPhraseList()
 })
@@ -531,7 +507,7 @@ onMounted(() => {
   align-items: center;
   margin-bottom: 20px;
   flex-wrap: wrap;
-  /* 【优化】适配小屏幕，防止按钮换行溢出 */
+  /* 适配小屏幕，防止按钮换行溢出 */
   gap: 10px;
   /* 替换margin-left，更优雅的间距 */
 }
@@ -542,7 +518,7 @@ onMounted(() => {
   justify-content: flex-end;
 }
 
-/* 【优化】新增表单样式适配 */
+/* 新增表单样式适配 */
 .add-form {
   padding: 10px 0;
 }

From aa3beb848b923d1b3d770ecfa983b36c29b585e8 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Mon, 19 Jan 2026 21:41:05 +0800
Subject: [PATCH 03/14] =?UTF-8?q?fix(patient):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=92=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改handlePatientInfo方法中的患者对象初始化逻辑
- 添加患者ID存在时的查询验证机制
- 区分新增和更新操作分别调用不同的服务方法
- 移除重复的身份证号查询条件优化性能
- 统一患者信息保存和更新的操作流程
---
 .../impl/PatientInformationServiceImpl.java   | 25 +++++++++++++++----
 .../service/impl/PatientServiceImpl.java      | 13 +++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
index fd72e0ca..8018fd8d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
@@ -308,12 +308,20 @@ public class PatientInformationServiceImpl implements IPatientInformationService
      * @return 患者信息
      */
     private Patient handlePatientInfo(PatientBaseInfoDto patientInfoDto) {
-        Patient patient = new Patient();
-        patient.setId(patientInfoDto.getId());
-        if (patientInfoDto.getId() == null) {
+        Patient patient;
+        if (patientInfoDto.getId() != null) {
+            // 更新现有患者信息
+            patient = patientService.getById(patientInfoDto.getId());
+            if (patient == null) {
+                throw new ServiceException("患者信息不存在，无法更新");
+            }
+        } else {
+            // 新增患者信息
+            patient = new Patient();
             patient.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix(), 10));
-            patientInfoDto.setActiveFlag(PublicationStatus.ACTIVE.getValue()); // 默认启用
+            patient.setActiveFlag(PublicationStatus.ACTIVE.getValue()); // 默认启用
         }
+
         patient.setName(patientInfoDto.getName()); // 患者姓名
         patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patientInfoDto.getName())); // 拼音首拼
         patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patientInfoDto.getName())); // 五笔首拼
@@ -337,7 +345,14 @@ public class PatientInformationServiceImpl implements IPatientInformationService
         patient.setDeceasedDate(patientInfoDto.getDeceasedDate()); // 死亡时间
         patient.setNationalityCode(patientInfoDto.getNationalityCode());// 民族
         patient.setActiveFlag(patientInfoDto.getActiveFlag());// 活动标识
-        patientService.saveOrUpdate(patient);
+
+        if (patientInfoDto.getId() != null) {
+            // 更新操作
+            patientService.updateById(patient);
+        } else {
+            // 新增操作
+            patientService.save(patient);
+        }
 
         return patient;
     }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
index 449d1b6e..0aa2eb59 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
@@ -32,18 +32,11 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
      */
     @Override
     public boolean saveOrUpdatePatient(Patient patient) {
-
-        // 身份证ID，患者ID，确定唯一患者
-        LambdaQueryWrapper<Patient> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Patient::getId, patient.getId()).eq(Patient::getIdCard, patient.getIdCard());
-
-        Patient existingPatient = baseMapper.selectOne(queryWrapper);
-        if (existingPatient != null) {
-            // 如果记录存在，更新记录
-            patient.setId(existingPatient.getId());
+        if (patient.getId() != null) {
+            // 如果提供了ID，则直接更新该ID的记录
             return baseMapper.updateById(patient) > 0;
         } else {
-            // 如果记录不存在，插入新记录
+            // 如果没有提供ID，则插入新记录
             return baseMapper.insert(patient) > 0;
         }
     }

From 095c43bbf37ad367aa661eb07668defaa40318d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E7=8B=BB=E7=8C=8A?= <sarem_w@sina.com>
Date: Mon, 19 Jan 2026 21:48:11 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BB=E5=98=B1?=
 =?UTF-8?q?=E4=B8=8B=E8=8E=B7=E5=8F=96=E8=AF=BB=E5=8F=96=E6=85=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=90=8C=E6=97=B6=E8=A7=A3=E5=86=B3=E7=B3=BB?=
 =?UTF-8?q?=E5=88=97=E5=AD=97=E5=85=B8=E8=A1=A8=E8=AF=BB=E5=8F=96=E6=85=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/openhis/common/aspectj/DictAspect.java   | 16 +++++-----------
 .../doctorstation/components/adviceBaseList.vue  |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
index 82d75965..c35d38a6 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
@@ -2,6 +2,7 @@ package com.openhis.common.aspectj;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.utils.DictUtils;
 import com.openhis.common.annotation.Dict;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -115,19 +116,12 @@ public class DictAspect {
     }
 
     private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) {
-        String sql;
-        if (StringUtils.isEmpty(dictTable)) {
-            // 场景 1：默认查询 sys_dict_data 表
-            sql = "SELECT dict_label FROM sys_dict_data WHERE dict_type = ? AND dict_value::varchar = ? LIMIT 1";
-            try {
-                return jdbcTemplate.queryForObject(sql, String.class, dictCode, dictValue);
-            } catch (DataAccessException e) {
-                // 如果查询结果为空，返回 空字符串
-                return "";
-            }
+        if (StringUtils.hasText(dictTable)) {
+            // 场景 1：默认字典走DictUtils缓存
+            return DictUtils.getDictLabel(dictCode, dictValue);
         } else {
             // 场景 2：查询指定表
-            sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
+            String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
             try {
                 return jdbcTemplate.queryForObject(sql, String.class, dictValue);
             } catch (DataAccessException e) {
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index 12c6a6f4..bdc16ab7 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -424,7 +424,7 @@ function clickRow(row) {
 
 // 初始化
 onMounted(() => {
-  preloadData(); // 预加载数据
+  // preloadData(); // 预加载数据
   getList(); // 获取初始数据
 });
 

From deebcde41f252def004a4438d7ae1487c4790f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E7=8B=BB=E7=8C=8A?= <sarem_w@sina.com>
Date: Mon, 19 Jan 2026 21:48:43 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-ui-vue3/package-lock.json | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json
index 0a4c8bed..db9d77ff 100644
--- a/openhis-ui-vue3/package-lock.json
+++ b/openhis-ui-vue3/package-lock.json
@@ -1637,7 +1637,6 @@
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -1648,7 +1647,6 @@
       "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -3335,7 +3333,6 @@
       "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -5578,15 +5575,13 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -6539,7 +6534,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -6780,7 +6774,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
       "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -6793,7 +6786,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
       "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -7045,7 +7037,6 @@
       "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -7224,7 +7215,6 @@
       "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -7257,7 +7247,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz",
       "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==",
-      "peer": true,
       "dependencies": {
         "preval.macro": "^4.0.0"
       }
@@ -8457,7 +8446,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -8819,7 +8807,6 @@
       "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.19.3",
         "postcss": "^8.4.31",
@@ -8924,7 +8911,6 @@
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.25.tgz",
       "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.25",
         "@vue/compiler-sfc": "3.5.25",

From 803e4d0bb547f72edf801fa6c2071f0fc270d0c5 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Mon, 19 Jan 2026 22:36:04 +0800
Subject: [PATCH 06/14] =?UTF-8?q?refactor(inhospitalnursestation):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E9=99=A2=E6=8A=A4=E5=A3=AB=E7=AB=99?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将CTE查询重构为子查询以提高执行效率
- 为位置和医生查询添加LIMIT 1约束以减少数据量
- 移除不必要的GROUP BY子句以简化查询逻辑
- 在前端组件中实现异步数据加载和错误处理机制
- 使用可选链操作符处理空值情况避免报错
- 添加防抖机制解决单击双击冲突问题
- 优化患者列表和床位列表的并行加载逻辑
- 清理调试用的console.log语句并替换为有意义的信息
---
 md/test.html                                  |  10 --
 .../ATDManageAppMapper.xml                    | 168 +++++++++---------
 .../src/template/HospitalRecordForm.vue       |   2 +-
 .../src/views/basicmanage/ward/index.vue      |   2 +-
 .../home/components/patientListDialog.vue     |   4 +-
 .../components/newfeeDetailQuery.vue          |   2 +-
 .../inOut/components/bedAllocation.vue        | 143 ++++++++++-----
 .../inOut/components/transferInDialog.vue     |   2 +-
 .../inOut/components/transferOut.vue          |  45 +++--
 .../src/views/inpatientNurse/inOut/index.vue  |  19 +-
 .../nursingstatistics/operationrecord.vue     |   2 +-
 .../views/inpatientNurse/tprChart/index.vue   |   2 +-
 .../medicationDetails.vue                     |   2 +-
 .../patientmanagement/index.vue               |   2 +-
 14 files changed, 234 insertions(+), 171 deletions(-)
 delete mode 100644 md/test.html

diff --git a/md/test.html b/md/test.html
deleted file mode 100644
index c7218294..00000000
--- a/md/test.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>测试合并11111</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
index d14e1454..274ba3c1 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -224,27 +224,6 @@
     </select>
     <select id="selectAdmissionPatientInfo"
             resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto">
-        WITH locations AS (SELECT ael.encounter_id,
-                                  ael.start_time,
-                                  al.form_enum,
-                                  al.id     AS location_id,
-                                  al."name" AS location_name
-                           FROM adm_encounter_location ael
-                                    LEFT JOIN adm_location al
-                                              ON ael.location_id = al.id
-                                                  AND al.delete_flag = '0'
-                           WHERE ael.status_enum = #{active}
-                             AND ael.delete_flag = '0'),
-             practitioners AS (SELECT aep.encounter_id,
-                                      aep.type_code,
-                                      pra.id     AS practitioner_id,
-                                      pra."name" AS practitioner_name
-                               FROM adm_encounter_participant aep
-                                        LEFT JOIN adm_practitioner pra
-                                                  ON aep.practitioner_id = pra.id
-                                                      AND pra.delete_flag = '0'
-                               WHERE aep.status_enum = #{active}
-                                 AND aep.delete_flag = '0')
         SELECT ae.id                             AS encounter_id,
                ae.bus_no,
                ae.priority_enum,
@@ -273,27 +252,84 @@
                fc.contract_name,
                diagnosis.condition_names
         FROM adm_encounter ae
-                 LEFT JOIN locations AS bed
-                           ON bed.encounter_id = ae.id
-                               AND bed.form_enum = #{bed}
-                 LEFT JOIN locations AS house
-                           ON house.encounter_id = ae.id
-                               AND house.form_enum = #{house}
-                 LEFT JOIN locations AS ward
-                           ON ward.encounter_id = ae.id
-                               AND ward.form_enum = #{ward}
-                 LEFT JOIN practitioners AS primaryNurse
-                           ON primaryNurse.encounter_id = ae.id
-                               AND primaryNurse.type_code = #{primaryNurse}
-                 LEFT JOIN practitioners AS attendingDoctor
-                           ON attendingDoctor.encounter_id = ae.id
-                               AND attendingDoctor.type_code = #{attendingDoctor}
-                 LEFT JOIN practitioners AS admittingDoctor
-                           ON admittingDoctor.encounter_id = ae.id
-                               AND admittingDoctor.type_code = #{admittingDoctor}
-                 LEFT JOIN practitioners AS chiefDoctor
-                           ON chiefDoctor.encounter_id = ae.id
-                               AND chiefDoctor.type_code = #{chiefDoctor}
+                 LEFT JOIN (
+                    SELECT ael.encounter_id,
+                           ael.start_time,
+                           al.id     AS location_id,
+                           al."name" AS location_name
+                    FROM adm_encounter_location ael
+                             LEFT JOIN adm_location al ON ael.location_id = al.id AND al.delete_flag = '0'
+                    WHERE ael.status_enum = #{active}
+                      AND ael.delete_flag = '0'
+                      AND ael.form_enum = #{bed}
+                    LIMIT 1
+                ) AS bed ON bed.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT ael.encounter_id,
+                           al.id     AS location_id,
+                           al."name" AS location_name
+                    FROM adm_encounter_location ael
+                             LEFT JOIN adm_location al ON ael.location_id = al.id AND al.delete_flag = '0'
+                    WHERE ael.status_enum = #{active}
+                      AND ael.delete_flag = '0'
+                      AND ael.form_enum = #{house}
+                    LIMIT 1
+                ) AS house ON house.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT ael.encounter_id,
+                           al.id     AS location_id,
+                           al."name" AS location_name
+                    FROM adm_encounter_location ael
+                             LEFT JOIN adm_location al ON ael.location_id = al.id AND al.delete_flag = '0'
+                    WHERE ael.status_enum = #{active}
+                      AND ael.delete_flag = '0'
+                      AND ael.form_enum = #{ward}
+                    LIMIT 1
+                ) AS ward ON ward.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT aep.encounter_id,
+                           pra.id     AS practitioner_id,
+                           pra."name" AS practitioner_name
+                    FROM adm_encounter_participant aep
+                             LEFT JOIN adm_practitioner pra ON aep.practitioner_id = pra.id AND pra.delete_flag = '0'
+                    WHERE aep.status_enum = #{active}
+                      AND aep.delete_flag = '0'
+                      AND aep.type_code = #{primaryNurse}
+                    LIMIT 1
+                ) AS primaryNurse ON primaryNurse.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT aep.encounter_id,
+                           pra.id     AS practitioner_id,
+                           pra."name" AS practitioner_name
+                    FROM adm_encounter_participant aep
+                             LEFT JOIN adm_practitioner pra ON aep.practitioner_id = pra.id AND pra.delete_flag = '0'
+                    WHERE aep.status_enum = #{active}
+                      AND aep.delete_flag = '0'
+                      AND aep.type_code = #{attendingDoctor}
+                    LIMIT 1
+                ) AS attendingDoctor ON attendingDoctor.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT aep.encounter_id,
+                           pra.id     AS practitioner_id,
+                           pra."name" AS practitioner_name
+                    FROM adm_encounter_participant aep
+                             LEFT JOIN adm_practitioner pra ON aep.practitioner_id = pra.id AND pra.delete_flag = '0'
+                    WHERE aep.status_enum = #{active}
+                      AND aep.delete_flag = '0'
+                      AND aep.type_code = #{admittingDoctor}
+                    LIMIT 1
+                ) AS admittingDoctor ON admittingDoctor.encounter_id = ae.id
+                 LEFT JOIN (
+                    SELECT aep.encounter_id,
+                           pra.id     AS practitioner_id,
+                           pra."name" AS practitioner_name
+                    FROM adm_encounter_participant aep
+                             LEFT JOIN adm_practitioner pra ON aep.practitioner_id = pra.id AND pra.delete_flag = '0'
+                    WHERE aep.status_enum = #{active}
+                      AND aep.delete_flag = '0'
+                      AND aep.type_code = #{chiefDoctor}
+                    LIMIT 1
+                ) AS chiefDoctor ON chiefDoctor.encounter_id = ae.id
                  LEFT JOIN adm_organization ao
                            ON ao.id = ae.organization_id
                                AND ao.delete_flag = '0'
@@ -307,47 +343,17 @@
                  LEFT JOIN fin_contract fc
                            ON aa.contract_no = fc.bus_no
                                AND fc.delete_flag = '0'
-                 LEFT JOIN (SELECT aed.encounter_id,
-                                   STRING_AGG(ccd.name, ', ') AS condition_names
-                            FROM adm_encounter_diagnosis aed
-                                     INNER JOIN cli_condition cc
-                                                ON cc.id = aed.condition_id
-                                                    AND cc.delete_flag = '0'
-                                     INNER JOIN cli_condition_definition ccd
-                                                ON ccd.id = cc.definition_id
-                                                    AND ccd.delete_flag = '0'
-                            WHERE aed.delete_flag = '0'
-                            GROUP BY aed.encounter_id) AS diagnosis
-                           ON ae.id = diagnosis.encounter_id
+                 LEFT JOIN (
+                    SELECT aed.encounter_id,
+                           STRING_AGG(ccd.name, ', ') AS condition_names
+                    FROM adm_encounter_diagnosis aed
+                             INNER JOIN cli_condition cc ON cc.id = aed.condition_id AND cc.delete_flag = '0'
+                             INNER JOIN cli_condition_definition ccd ON ccd.id = cc.definition_id AND ccd.delete_flag = '0'
+                    WHERE aed.delete_flag = '0'
+                    GROUP BY aed.encounter_id
+                ) AS diagnosis ON ae.id = diagnosis.encounter_id
         WHERE ae.id = #{encounterId}
           AND ae.delete_flag = '0'
-        GROUP BY ae.id,
-                 ae.bus_no,
-                 ae.priority_enum,
-                 ae.organization_id,
-                 ae.start_time,
-                 bed.start_time,
-                 bed.location_id,
-                 bed.location_name,
-                 house.location_id,
-                 house.location_name,
-                 ward.location_id,
-                 ward.location_name,
-                 primaryNurse.practitioner_id,
-                 primaryNurse.practitioner_name,
-                 attendingDoctor.practitioner_id,
-                 attendingDoctor.practitioner_name,
-                 admittingDoctor.practitioner_id,
-                 admittingDoctor.practitioner_name,
-                 chiefDoctor.practitioner_id,
-                 chiefDoctor.practitioner_name,
-                 ao."name",
-                 ap."name",
-                 ap.gender_enum,
-                 ap.birth_date,
-                 ap.phone,
-                 fc.contract_name,
-                 diagnosis.condition_names
     </select>
     <select id="getAmount" resultType="com.openhis.web.inhospitalnursestation.dto.EncounterAccountDto">
         SELECT aa.id,
diff --git a/openhis-ui-vue3/src/template/HospitalRecordForm.vue b/openhis-ui-vue3/src/template/HospitalRecordForm.vue
index 663e679c..3e4bfffc 100644
--- a/openhis-ui-vue3/src/template/HospitalRecordForm.vue
+++ b/openhis-ui-vue3/src/template/HospitalRecordForm.vue
@@ -347,7 +347,7 @@ const printForm = () => {
 };
 
 function handleClick() {
-  console.log('112313413');
+  console.log('住院记录表单点击事件触发');
 }
 
 const resetFun = (data) => {
diff --git a/openhis-ui-vue3/src/views/basicmanage/ward/index.vue b/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
index 919a9b60..95096b92 100644
--- a/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
@@ -582,7 +582,7 @@ function submitForm() {
   console.log('params11========>', JSON.stringify(params));
   orgRef.value.validate((valid) => {
     if (valid) {
-      console.log('99999999');
+      console.log('表单验证通过，准备提交数据');
 
       if (form.busNoParent) {
         if (form.formEnum == 4) {
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
index 2249ecc3..49ad9b28 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settlement/components/home/components/patientListDialog.vue
@@ -59,12 +59,12 @@ const doRegistering = (row: any) => {
 // })
 /* 取消 */
 const cancelAct = () => {
-  console.log('121231');
+  console.log('取消患者列表对话框操作');
 
 }
 /* 保存,登记 */
 const handleSubmit = () => {
-  console.log('121231');
+  console.log('提交患者列表对话框操作');
 }
 defineExpose({})
 
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue
index e3f00d18..42209d9b 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue
@@ -544,7 +544,7 @@ function handleDatePickerChange() {
 
 // 清空
 const onClear = () => {
-  console.log('1111111111');
+  console.log('费用明细查询条件已清空');
 
   const today = new Date();
   dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
index bde05a47..d453267f 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
@@ -44,8 +44,8 @@
             >
               <div class="bed-card__body">
                 <div>
-                  <div class="bed-card__title" :title="item.houseName + '-' + item.bedName">
-                    {{ item.houseName + '-' + item.bedName }}
+                  <div class="bed-card__title" :title="(item.houseName || '-') + '-' + (item.bedName || '-')">
+                    {{ (item.houseName || '-') + '-' + (item.bedName || '-') }}
                   </div>
                   <div class="bed-tag" :class="getBedTagClass(item)">
                     {{ item.bedStatus_enumText }}
@@ -130,6 +130,8 @@ const initInfoOptions = ref<InitInfoOptions>({
   priorityOptions: [],
   wardListOptions: [],
 });
+// 用于处理单击/双击冲突
+let clickTimer = null;
 let loadingInstance: any = undefined;
 // 入院病区loading
 const selectHosLoding = ref(true);
@@ -223,29 +225,38 @@ const queryParams = ref<{
   bedStatus: '', // 这个字段现在只用于床位查询，不再用于患者列表查询
 });
 
-const ininData = () => {
-  Promise.all([
-    getInit().then((res) => {
-      initInfoOptions.value = res.data;
-      priorityOptions.value = res.data.priorityOptions || [];
-      return res;
-    }),
-    getPractitionerWard().then((res) => {
-      selectHosLoding.value = false;
-      queryParams.value.wardId = res[0].id;
-      initInfoOptions.value.wardListOptions = res;
-      return changeWardLocationId(res[0].id, true); // 传入 true 表示初始化阶段，不调用 getList
-    }),
-  ]).then(() => {
+const ininData = async () => {
+  try {
+    // 先获取初始化数据
+    const initRes = await getInit();
+    initInfoOptions.value = initRes.data;
+    priorityOptions.value = initRes.data.priorityOptions || [];
+
+    // 然后获取科室数据
+    const wardRes = await getPractitionerWard();
+    selectHosLoding.value = false;
+    queryParams.value.wardId = wardRes[0]?.id || '';
+    initInfoOptions.value.wardListOptions = wardRes;
+
+    // 获取病房数据
+    if (wardRes[0]?.id) {
+      await changeWardLocationId(wardRes[0].id, true); // 传入 true 表示初始化阶段，不调用 getList
+    }
+
+    // 最后获取列表数据
     getList();
-  });
+  } catch (error) {
+    console.error('初始化数据失败:', error);
+    // 即使某个请求失败，也要尝试加载列表
+    getList();
+  }
 };
 onMounted(() => {
   ininData();
 });
 
-const refreshTap = () => {
-  ininData();
+const refreshTap = async () => {
+  await ininData();
 };
 defineExpose({ state, refreshTap });
 
@@ -257,23 +268,32 @@ const filteredBadList = computed(() => {
   return badList.value.filter((item) => item.bedStatus == bedStatusFilter.value);
 });
 
-const getList = () => {
+const getList = async () => {
   loadingInstance = ElLoading.service({ fullscreen: true });
-  getPatientList();
-  // 床位查询不使用encounterStatus参数，只使用基本的查询参数
-  const bedQueryParams = {
-    ...queryParams.value,
-    encounterStatus: undefined, // 移除encounterStatus，确保不影响床位列表查询
-  };
 
-  getBedInfo(bedQueryParams).then((res) => {
-    loadingInstance.close();
-    badList.value = res.data.records;
-  });
+  try {
+    // 并行获取患者列表和床位列表
+    const [patientData, bedRes] = await Promise.all([
+      getPatientList(),
+      getBedInfo({
+        ...queryParams.value,
+        encounterStatus: undefined, // 移除encounterStatus，确保不影响床位列表查询
+      })
+    ]);
+
+    // 更新床位列表
+    badList.value = bedRes.data.records;
+  } catch (error) {
+    console.error('获取列表数据失败:', error);
+  } finally {
+    if (loadingInstance) {
+      loadingInstance.close();
+    }
+  }
 };
 
 // 重置查询条件
-function resetQuery() {
+async function resetQuery() {
   // 不重置入院病区
   const resetParams = {
     ...queryParams.value,
@@ -288,7 +308,7 @@ function resetQuery() {
     bedStatus: '',
   };
   bedStatusFilter.value = '';
-  getList();
+  await getList();
 }
 // 入院病区下拉选
 function changeWardLocationId(id: string | number, isInit = false) {
@@ -302,41 +322,72 @@ function changeWardLocationId(id: string | number, isInit = false) {
     selectHoouseLoding.value = false;
     wardLocationList.value = res;
     if (!isInit) {
-      getList();
+      // 在非初始化情况下，需要同时更新患者列表和床位列表
+      getPatientList();
+      // 床位查询不使用encounterStatus参数，只使用基本的查询参数
+      const bedQueryParams = {
+        ...queryParams.value,
+        encounterStatus: undefined, // 移除encounterStatus，确保不影响床位列表查询
+      };
+      getBedInfo(bedQueryParams).then((bedRes) => {
+        badList.value = bedRes.data.records;
+      });
     }
     return res;
   });
 }
 // 入院病房下拉选
-const onHosHouse = () => {
-  getList();
+const onHosHouse = async () => {
+  await getList();
 };
 // 住院状态下拉选
-const onHosStatus = () => {
-  getList();
+const onHosStatus = async () => {
+  await getList();
 };
 // 获新入院患者列表
-function getPatientList() {
+async function getPatientList() {
   // 为患者列表查询创建一个新的参数对象，不包含bedStatus
   const patientQueryParams = {
     ...queryParams.value,
     bedStatus: undefined, // 移除bedStatus，确保不影响患者列表查询
   };
-  getPendingInfo(patientQueryParams).then((res) => {
+  try {
+    const res = await getPendingInfo(patientQueryParams);
     loading.value = false;
     patientList.value = res.data.records;
     total.value = res.data.total;
-  });
+    return res;
+  } catch (error) {
+    console.error('获取患者列表失败:', error);
+    throw error;
+  }
 }
 
-const handleTransferInOk = () => {
+const handleTransferInOk = async () => {
   transferInDialogVisible.value = false;
-  getList();
+  await getList();
 };
 
-function handleCardClick(item: any, index: number) {}
+// 单击患者卡片事件 - 直接触发入科选床界面
+function handleCardClick(item: any, index: number) {
+  if (item.encounterStatus == 2) {
+    ElMessage({
+      message: '请分配病床！',
+      type: 'warning',
+      grouping: true,
+      showClose: true,
+    });
+  } else {
+    pendingInfo.value = {
+      ...item,
+      entranceType: 1,
+    };
 
-// 双击患者卡片事件
+    transferInDialogVisible.value = true;
+  }
+}
+
+// 双击患者卡片事件 - 保持原有逻辑
 function handleCardDblClick(item: any) {
   if (item.encounterStatus == 2) {
     ElMessage({
@@ -367,8 +418,8 @@ function handleDragStart(event: DragEvent, item: any) {
   }
 }
 
-function handleQuery() {
-  getList();
+async function handleQuery() {
+  await getList();
 }
 
 // 拖拽结束事件
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
index 479d65e5..4bbd5624 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
@@ -17,7 +17,7 @@
               <div class="patient-info">
                 <div style="display: flex; align-items: center; margin-bottom: 16px">
                   <div style="margin-right: 36px; font-size: 18px; font-weight: 700">
-                    {{ props.pendingInfo.houseName + '-' + props.pendingInfo.bedName }}
+                    {{ (props.pendingInfo.houseName || '-') + '-' + (props.pendingInfo.bedName || '-') }}
                   </div>
                   <div style="border-radius: 50px; border: 2px solid slategray; padding: 4px 12px">
                     {{ props.pendingInfo.contractName }}
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
index ec839344..2b3c3985 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
@@ -746,25 +746,42 @@ function handleGetDRMedication() {
     });
 }
 
-const initData = () => {
-  getInit().then((res) => {
-    initInfoOptions.value = res.data;
+const initData = async () => {
+  try {
+    // 并行获取初始化数据和科室数据
+    const [initRes, wardRes] = await Promise.all([
+      getInit(),
+      getPractitionerWard()
+    ]);
+
+    // 处理初始化数据
+    initInfoOptions.value = initRes.data;
+
+    // 处理科室数据
+    queryParams.value.wardId = wardRes[0]?.id || '';
+    initInfoOptions.value.wardListOptions = wardRes;
+
+    // 获取病房数据
+    if (wardRes[0]?.id) {
+      changeWardLocationId(wardRes[0].id);
+    }
+
+    // 最后获取患者列表
     getPatientList();
-  });
-  getPractitionerWard().then((res) => {
-    queryParams.value.wardId = res[0].id;
-    initInfoOptions.value.wardListOptions = res;
-    changeWardLocationId(res[0].id);
-  });
+  } catch (error) {
+    console.error('初始化数据失败:', error);
+    // 即使初始化失败，也要尝试加载患者列表
+    getPatientList();
+  }
 };
 
 // 初始化加载患者列表
-onMounted(() => {
-  initData();
+onMounted(async () => {
+  await initData();
 });
-const refreshTap = () => {
-  console.log('22222223');
-  initData();
+const refreshTap = async () => {
+  console.log('刷新转科/出院页面数据');
+  await initData();
 };
 defineExpose({ refreshTap });
 </script>
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
index 214adfba..e750de3f 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
@@ -44,16 +44,15 @@ const thirdRef = ref();
 onBeforeMount(() => {});
 onMounted(() => {});
 defineExpose({ state });
-const test = () => {
-  nextTick(() => {
-    if (activeTabName.value == 'first') {
-      firstRef?.value?.refreshTap();
-    } else if (activeTabName.value == 'second') {
-      secondRef?.value?.refreshTap();
-    } else if (activeTabName.value == 'third') {
-      thirdRef?.value?.refreshTap();
-    }
-  });
+const test = async () => {
+  await nextTick();
+  if (activeTabName.value == 'first') {
+    await firstRef?.value?.refreshTap();
+  } else if (activeTabName.value == 'second') {
+    await secondRef?.value?.refreshTap();
+  } else if (activeTabName.value == 'third') {
+    await thirdRef?.value?.refreshTap();
+  }
 };
 
 const activeTabName = ref('first');
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue b/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
index 85432de3..8b290748 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
@@ -496,7 +496,7 @@ const dateChange = () => {
 };
 // 计算时间
 rulesFrom.value.recordTime = computed(() => {
-  console.log('11111111111111');
+  console.log('操作记录时间计算', rulesFrom.value.date + ' ' + rulesFrom.value.time);
 
   return rulesFrom.value.date + ' ' + rulesFrom.value.time;
 });
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
index 782f7da2..ea03f1f9 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
@@ -274,7 +274,7 @@ function init1(data) {
  * 点击患者列表行 获取患者体温单数据
  */
 function viewPatient(row) {
-  console.log('1232312123221231');
+  console.log('查看患者体温单数据', row.patientName);
 
   patientInfo.value = row;
   console.log('点击患者列表行 获取患者体温单数据', row);
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
index 389c139c..be7df767 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
@@ -557,7 +557,7 @@ watch(
         queryParams.value.dispenseTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
       }
       queryParams.value.flag = 1;
-      console.log('11111111111111');
+      console.log('药品明细查询参数已设置完成');
 
       // 执行查询
       getList();
diff --git a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index f0c81478..6078292c 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -218,7 +218,7 @@ watch(
       if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
         age--;
       }
-      console.log('22222222');
+      console.log('计算患者年龄完成:', age);
 
       form.value.age = age;
     }

From a3dce8de60624511ae6766d9c20adb8a05d70620 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Mon, 19 Jan 2026 23:18:38 +0800
Subject: [PATCH 07/14] =?UTF-8?q?fix(inhospitalnurse):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BD=8F=E9=99=A2=E6=8A=A4=E5=A3=AB=E7=AB=99=E6=82=A3?=
 =?UTF-8?q?=E8=80=85=E7=AE=A1=E7=90=86=E5=92=8C=E5=BA=8A=E4=BD=8D=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除住院参与者更新失败时的异常返回，改为静默处理
- 更新床位分配提示信息，为用户提供更清晰的操作指导
- 实现实施科室下拉选择器的远程搜索功能，提升大数据量下的用户体验
- 添加节点切换时的未保存数据确认提醒，防止数据丢失
- 优化实施科室管理页面的选项过滤和加载状态管理
---
 .../impl/ATDManageAppServiceImpl.java         |  7 +--
 .../basicmanage/implementDepartment/index.vue | 60 ++++++++++++++++---
 .../inOut/components/bedAllocation.vue        |  6 +-
 3 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
index c99a1604..5a5e4509 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
@@ -293,11 +293,8 @@ public class ATDManageAppServiceImpl implements IATDManageAppService {
             if (admissionPatientInfoDto.getPriorityEnum() != null) {
                 // 更新患者病情
                 encounterService.updatePriorityEnumById(encounterId, admissionPatientInfoDto.getPriorityEnum());
-                // 将之前的住院参与者更新为已完成
-                Integer result = encounterParticipantService.updateEncounterParticipantsStatus(encounterId);
-                if (result == 0) {
-                    return R.fail("患者信息更新失败，请联系管理员");
-                }
+                // 将之前的住院参与者更新为已完成（如果存在的话）
+                encounterParticipantService.updateEncounterParticipantsStatus(encounterId);
                 // 更新住院参与者
                 // 住院医生
                 encounterParticipantService.creatEncounterParticipants(encounterId, startTime,
diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
index 69dc396e..ad3c574a 100644
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -81,15 +81,15 @@
                 v-model="scope.row.activityDefinitionId"
                 filterable
                 remote
-                reserve-keyword
-                placeholder="请选择"
-                remote-show-suffix
+                :remote-method="(query) => handleRemoteQuery(query, scope.row)"
+                :loading="scope.row.loading"
+                placeholder="请输入并搜索项目"
                 style="width: 400px; max-width: 500px"
                 :class="{ 'error-border': scope.row.error }"
                 clearable
               >
                 <el-option
-                  v-for="item in allImplementDepartmentList"
+                  v-for="item in scope.row.filteredOptions || []"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -243,6 +243,15 @@ function getAllImplementDepartment() {
       value: item.activityDefinitionId,
       label: item.activityDefinitionName,
     }));
+
+    // 为所有现有行初始化过滤选项
+    catagoryList.value.forEach(row => {
+      if (!row.hasOwnProperty('filteredOptions')) {
+        row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
+        row.loading = false;
+      }
+    });
+
     loading.value = false;
   });
 }
@@ -253,6 +262,26 @@ function handleSelectionChange(selection) {
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
+// 远程搜索处理函数
+function handleRemoteQuery(query, row) {
+  if (query !== '') {
+    // 设置加载状态
+    row.loading = true;
+    // 模拟异步延迟
+    setTimeout(() => {
+      // 过滤选项
+      row.filteredOptions = allImplementDepartmentList.value.filter(item => {
+        return item.label.toLowerCase().includes(query.toLowerCase()) ||
+               item.value.toLowerCase().includes(query.toLowerCase());
+      });
+      row.loading = false;
+    }, 300); // 300ms 延迟，模拟网络请求
+  } else {
+    // 如果查询为空，显示所有选项（但限制数量以提高性能）
+    row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
+  }
+}
+
 // 新增项目
 function handleAddItem() {
   if (data.isAdding) {
@@ -262,9 +291,11 @@ function handleAddItem() {
   const newRow = {
     startTime: '00:00:00',
     endTime: '23:59:59',
+    loading: false, // 添加加载状态
+    filteredOptions: allImplementDepartmentList.value.slice(0, 100), // 初始化过滤选项，限制数量
   };
   catagoryList.value.push(newRow);
-  total.value = organization.value.length;
+  total.value = catagoryList.value.length; // 修正：使用实际数据列表长度，而不是组织结构长度
   data.isAdding = true; // 设置标志位为 true，表示有未保存的
 }
 // 批量添加
@@ -272,6 +303,7 @@ function handleBacthAddItem() {
   // 批量添加显示对话框
   bacthAddItemDialogVisible.value = true;
 }
+
 // 检验 编辑或 保存数据
 function handleBlur(row, index) {
   let hasError = false;
@@ -344,9 +376,23 @@ function deleteSelectedRows(row) {
 }
 /** 节点单击事件 */
 function handleNodeClick(res, node) {
-  // 新增按钮是否 disable
-  data.isAdding = false;
+  // 检查是否有未保存的数据
+  if (data.isAdding) {
+    proxy.$modal.confirm('当前有未保存的数据，切换节点将丢失未保存的数据，是否继续？').then(() => {
+      // 确认切换，重置状态
+      data.isAdding = false;
+      continueHandleNodeClick(node);
+    }).catch(() => {
+      // 取消切换，保持当前状态
+      return;
+    });
+  } else {
+    continueHandleNodeClick(node);
+  }
+}
 
+// 实际的节点点击处理逻辑
+function continueHandleNodeClick(node) {
   // 新增按钮是否 disable
   if (node.parent === null || node.level === 1) {
     isAddDisable.value = true;
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
index d453267f..1d7650f8 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/bedAllocation.vue
@@ -371,8 +371,9 @@ const handleTransferInOk = async () => {
 // 单击患者卡片事件 - 直接触发入科选床界面
 function handleCardClick(item: any, index: number) {
   if (item.encounterStatus == 2) {
+    // 显示提示信息，指导用户如何分配床位
     ElMessage({
-      message: '请分配病床！',
+      message: '该患者尚未分配病床，请通过拖拽操作将患者分配到右侧床位',
       type: 'warning',
       grouping: true,
       showClose: true,
@@ -390,8 +391,9 @@ function handleCardClick(item: any, index: number) {
 // 双击患者卡片事件 - 保持原有逻辑
 function handleCardDblClick(item: any) {
   if (item.encounterStatus == 2) {
+    // 显示提示信息，指导用户如何分配床位
     ElMessage({
-      message: '请分配病床！',
+      message: '该患者尚未分配病床，请通过拖拽操作将患者分配到右侧床位',
       type: 'warning',
       grouping: true,
       showClose: true,

From 649f7bcf5b3458024df3c5a0eef3926ba6f47545 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 20 Jan 2026 08:24:07 +0800
Subject: [PATCH 08/14] =?UTF-8?q?fix(database):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=92=8C=E5=85=B3=E8=81=94=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在ATDManageAppMapper.xml中添加DISTINCT关键字解决入院患者信息重复问题
- 重构PatientHomeAppMapper.xml中的复杂查询逻辑，使用子查询替代多层JOIN提高性能
- 修复vital signs查询中的字段关联错误，将base_service_req_id改为request_id
- 优化前端implementDepartment组件的数据加载逻辑，添加异步处理和错误捕获
- 为诊疗项目下拉框添加数据加载状态检查，防止空数据导致的界面异常
- 实现防抖机制和数据量限制，提升大数据量下的响应性能
- 添加并行数据加载，减少页面初始化时间
---
 .../ATDManageAppMapper.xml                    |   2 +-
 .../inpatientmanage/PatientHomeAppMapper.xml  | 409 ++++++++++--------
 .../inpatientmanage/VitalSignsAppMapper.xml   |   2 +-
 .../basicmanage/implementDepartment/index.vue | 108 +++--
 4 files changed, 314 insertions(+), 207 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
index 274ba3c1..63956bc9 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -224,7 +224,7 @@
     </select>
     <select id="selectAdmissionPatientInfo"
             resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto">
-        SELECT ae.id                             AS encounter_id,
+        SELECT DISTINCT ae.id                             AS encounter_id,
                ae.bus_no,
                ae.priority_enum,
                ae.organization_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
index fc4d50b5..e6685204 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
@@ -2,189 +2,250 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper">
 
-    <!-- 患者首页信息分页查询-->
+    <!-- 患者首页信息分页查询 -->
     <select id="getPage" parameterType="java.util.Map"
             resultType="com.openhis.web.inpatientmanage.dto.PatientHomeDto">
         SELECT
-            T1.id,
-            T1.active_flag,
-            T1.temp_flag,
-            T1."name" AS patientName, -- 患者姓名
-            T1.name_json,
-            T1.bus_no AS patientNo, -- 病历号
-            T1.gender_enum, -- 患者性别
-            T1.birth_date,
-            T1.deceased_date,
-            T1.marital_status_enum,
-            T1.prfs_enum,
-            T1.phone, -- 患者手机号
-            COALESCE(NULLIF(T1.address, ''), '') AS address, -- 处理空地址
-            T1.address_province,
-            T1.address_city,
-            T1.address_district,
-            T1.address_street,
-            T1.address_json,
-            T1.nationality_code,
-            T1.id_card,
-            T1.py_str,
-            T1.wb_str,
-            T1.blood_abo,
-            T1.blood_rh,
-            T1.work_company,
-            T1.native_place,
-            T1.country_code,
-            T1.link_name,
-            T1.link_relation_code,
-            T1.link_telcom,
-            T1.link_jsons,
-            T1.tenant_id,
-            T2.bus_no AS hospitalNo, -- 住院号
-            T2.id AS encounterId, -- 就诊ID
-            T2.priority_enum, -- 护理级别
-            T2.status_enum, -- 患者状态
-            T2.organization_id,-- 入院科室
-            T2.start_time AS admissionDate, -- 入院日期
-            T2.end_time AS dischargeDate, -- 出院日期
-            T2.class_enum, -- 就诊类别
-            Doctor.name AS responsibleDoctor, -- 责任医生
-            Nurse.name AS responsibleNurse, -- 责任护士
-            T6.type_code, -- 费别
-            T7.status_enum AS surgeryStatusEnum, -- 手术状态
-            T8.start_time AS surgeryStartTime,  -- 手术开始时间
-            T8.end_time AS surgeryEndTime,    -- 手术结束时间
-            T9.id AS encounterLocationId, -- 就诊位置ID
-            T9.location_id, -- 床位号
-            T11."name" AS caty, -- 入院科室
-            T12."name" AS mainDiagnosis -- 主要诊断
-        FROM adm_patient AS T1
-            LEFT JOIN adm_encounter T2
-                ON T1.id = T2.patient_id  -- 患者ID
-                AND T2.delete_flag = '0'
-                AND T2.class_enum = '1'   -- 仅选择住院患者
-            -- 获取责任医生
-            LEFT JOIN (
-                SELECT
-                    encounter_id,
-                    practitioner_id,
-                    "name",
-                    ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY practitioner_id) as rn
-                FROM (
-                    SELECT
-                        T3.encounter_id,
-                        T4."name",
-                        T3.practitioner_id
-                    FROM adm_encounter_participant T3
-                        LEFT JOIN adm_practitioner T4
-                            ON T3.practitioner_id = T4.id
-                            AND T4.delete_flag = '0'
-                    WHERE T3.type_code = '9' -- 责任医生类型
-                        AND T3.delete_flag = '0'
-                    ) sub
-            ) Doctor ON T2.id = Doctor.encounter_id AND Doctor.rn = 1
-            -- 获取责任护士
-            LEFT JOIN (
-                SELECT
-                    encounter_id,
-                    practitioner_id,
-                    "name",
-                    ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY practitioner_id) as rn
-                FROM (
-                    SELECT
-                        T3.encounter_id,
-                        T4."name",
-                        T3.practitioner_id
-                    FROM adm_encounter_participant T3
-                        LEFT JOIN adm_practitioner T4
-                            ON T3.practitioner_id = T4.id
-                            AND T4.delete_flag = '0'
-                    WHERE T3.type_code = '2' -- 责任护士类型
-                        AND T3.delete_flag = '0'
-                ) sub
-            ) Nurse ON T2.id = Nurse.encounter_id AND Nurse.rn = 1
-            LEFT JOIN adm_encounter_diagnosis T5
-                ON T2.id = T5.encounter_id -- 就诊ID
-                AND T5.maindise_flag = 1
-                AND T5.delete_flag = '0'
-            LEFT JOIN adm_account T6
-                ON T2.id = T6.encounter_id -- 就诊ID
-                AND T6.delete_flag = '0'
-            LEFT JOIN cli_procedure T7
-                ON T1.id = T7.patient_id -- 患者ID
-                AND T7.delete_flag = '0'
-            LEFT JOIN cli_procedure_performer T8
-                ON T7.id = T8.procedure_id -- 手术ID
-                AND T8.delete_flag = '0'
-            LEFT JOIN adm_encounter_location T9
-                ON T2.id = T9.encounter_id -- 就诊ID
-                AND T9.form_enum = 8
-                AND T9.delete_flag = '0'
-            LEFT JOIN adm_organization T11
-                ON T2.organization_id = T11.id
-                AND T11.type_enum = 2
-                AND T11.delete_flag = '0'
-            LEFT JOIN cli_condition_definition T12
-                ON T5.condition_id = T12.id
-                AND T12.delete_flag = '0'
-            LEFT JOIN wor_service_request T13
-                ON T2.id = T13.encounter_id
-                AND T7.base_service_req_id = T13.id
-                AND T13.delete_flag = '0'
-            LEFT JOIN wor_service_request_detail T14
-                ON T13.id = T14.service_req_id
-                AND T14.type_code = '3'
-                AND T14.delete_flag = '0'
-        <where>
-            T1.delete_flag = '0'
-            -- 患者ID
-            <if test="patientId != null">
-                AND T1.id = #{patientId}
-            </if>
+            id,
+            active_flag,
+            temp_flag,
+            patientName,
+            name_json,
+            patientNo,
+            gender_enum,
+            birth_date,
+            deceased_date,
+            marital_status_enum,
+            prfs_enum,
+            phone,
+            address,
+            address_province,
+            address_city,
+            address_district,
+            address_street,
+            address_json,
+            nationality_code,
+            id_card,
+            py_str,
+            wb_str,
+            blood_abo,
+            blood_rh,
+            work_company,
+            native_place,
+            country_code,
+            link_name,
+            link_relation_code,
+            link_telcom,
+            link_jsons,
+            tenant_id,
+            hospitalNo,
+            encounterId,
+            priority_enum,
+            status_enum,
+            organization_id,
+            admissionDate,
+            dischargeDate,
+            class_enum,
+            responsibleDoctor,
+            responsibleNurse,
+            type_code,
+            surgeryStatusEnum,
+            surgeryStartTime,
+            surgeryEndTime,
+            encounterLocationId,
+            location_id,
+            caty,
+            mainDiagnosis
+        FROM (
+            SELECT
+                patient_base.*,
+                ROW_NUMBER() OVER (PARTITION BY patient_base.id ORDER BY patient_base.encounterId) as rn
+            FROM (
+                SELECT DISTINCT
+                    T1.id,
+                    T1.active_flag,
+                    T1.temp_flag,
+                    T1."name" AS patientName, -- 患者姓名
+                    T1.name_json,
+                    T1.bus_no AS patientNo, -- 病历号
+                    T1.gender_enum, -- 患者性别
+                    T1.birth_date,
+                    T1.deceased_date,
+                    T1.marital_status_enum,
+                    T1.prfs_enum,
+                    T1.phone, -- 患者手机号
+                    COALESCE(NULLIF(T1.address, ''), '') AS address, -- 处理空地址
+                    T1.address_province,
+                    T1.address_city,
+                    T1.address_district,
+                    T1.address_street,
+                    T1.address_json,
+                    T1.nationality_code,
+                    T1.id_card,
+                    T1.py_str,
+                    T1.wb_str,
+                    T1.blood_abo,
+                    T1.blood_rh,
+                    T1.work_company,
+                    T1.native_place,
+                    T1.country_code,
+                    T1.link_name,
+                    T1.link_relation_code,
+                    T1.link_telcom,
+                    T1.link_jsons,
+                    T1.tenant_id,
+                    T2.bus_no AS hospitalNo, -- 住院号
+                    T2.id AS encounterId, -- 就诊ID
+                    T2.priority_enum, -- 护理级别
+                    T2.status_enum, -- 患者状态
+                    T2.organization_id,-- 入院科室
+                    T2.start_time AS admissionDate, -- 入院日期
+                    T2.end_time AS dischargeDate, -- 出院日期
+                    T2.class_enum, -- 就诊类别
+                    -- 获取责任医生（使用子查询确保只返回一个值）
+                    (SELECT p."name"
+                     FROM adm_encounter_participant ep
+                     LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id AND p.delete_flag = '0'
+                     WHERE ep.encounter_id = T2.id
+                       AND ep.type_code = '9'
+                       AND ep.delete_flag = '0'
+                     ORDER BY ep.practitioner_id
+                     LIMIT 1) AS responsibleDoctor,
+                    -- 获取责任护士（使用子查询确保只返回一个值）
+                    (SELECT p."name"
+                     FROM adm_encounter_participant ep
+                     LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id AND p.delete_flag = '0'
+                     WHERE ep.encounter_id = T2.id
+                       AND ep.type_code = '2'
+                       AND ep.delete_flag = '0'
+                     ORDER BY ep.practitioner_id
+                     LIMIT 1) AS responsibleNurse,
+                    T6.type_code, -- 费别
+                    T7.status_enum AS surgeryStatusEnum, -- 手术状态
+                    T8.start_time AS surgeryStartTime,  -- 手术开始时间
+                    T8.end_time AS surgeryEndTime,    -- 手术结束时间
+                    T9.id AS encounterLocationId, -- 就诊位置ID
+                    T9.location_id, -- 床位号
+                    T11."name" AS caty, -- 入院科室
+                    T12."name" AS mainDiagnosis -- 主要诊断
+                FROM adm_patient AS T1
+                    INNER JOIN adm_encounter T2  -- 改为INNER JOIN确保患者有就诊记录
+                        ON T1.id = T2.patient_id  -- 患者ID
+                        AND T2.delete_flag = '0'
+                        AND T2.class_enum = '1'   -- 仅选择住院患者
+                    LEFT JOIN adm_encounter_diagnosis T5
+                        ON T2.id = T5.encounter_id -- 就诊ID
+                        AND T5.maindise_flag = 1
+                        AND T5.delete_flag = '0'
+                    LEFT JOIN adm_account T6
+                        ON T2.id = T6.encounter_id -- 就诊ID
+                        AND T6.delete_flag = '0'
+                    LEFT JOIN (
+                        SELECT
+                            patient_id,
+                            status_enum,
+                            id,
+                            request_id,
+                            ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY id DESC) as rn
+                        FROM cli_procedure
+                        WHERE delete_flag = '0'
+                    ) T7 ON T1.id = T7.patient_id AND T7.rn = 1
+                    LEFT JOIN (
+                        SELECT
+                            procedure_id,
+                            start_time,
+                            end_time,
+                            ROW_NUMBER() OVER (PARTITION BY procedure_id ORDER BY id DESC) as rn
+                        FROM cli_procedure_performer
+                        WHERE delete_flag = '0'
+                    ) T8 ON T7.id = T8.procedure_id AND T8.rn = 1
+                    LEFT JOIN adm_encounter_location T9
+                        ON T2.id = T9.encounter_id -- 就诊ID
+                        AND T9.form_enum = 8
+                        AND T9.delete_flag = '0'
+                    LEFT JOIN adm_organization T11
+                        ON T2.organization_id = T11.id
+                        AND T11.type_enum = 2
+                        AND T11.delete_flag = '0'
+                    LEFT JOIN cli_condition_definition T12
+                        ON T5.condition_id = T12.id
+                        AND T12.delete_flag = '0'
+                WHERE T1.delete_flag = '0'
+                -- 患者ID
+                <if test="patientId != null">
+                    AND T1.id = #{patientId}
+                </if>
 
-            -- 在科
-            <if test="statusEnum == 1">
-                AND T9.status_enum = 2
-            </if>
+                -- 在科
+                <if test="statusEnum == 1">
+                    AND T9.status_enum = 2
+                </if>
 
-            -- 待出院
-            <if test="statusEnum == 3">
-                AND T2.status_enum = 4
-            </if>
+                -- 待出院
+                <if test="statusEnum == 3">
+                    AND T2.status_enum = 4
+                </if>
 
-            -- 危重
-            <if test="statusEnum == 4">
-                AND T2.priority_enum = 1
-            </if>
+                -- 危重
+                <if test="statusEnum == 4">
+                    AND T2.priority_enum = 1
+                </if>
 
-            -- 手术
-            <if test="statusEnum == 5">
-                AND T14.type_code = '3'
-            </if>
-
-            -- 欠费
-            <if test="statusEnum == 6">
-                AND T6.balance_amount &lt; 0
-            </if>
-
-            -- 已出院
-            <if test="statusEnum == 7">
-                AND T2.status_enum = 5
-            </if>
-
-            <if test="searchKey != null and searchKey != ''">
-                AND (
-                    -- 住院号
-                    T2.bus_no = #{searchKey}
-                    -- 患者姓名
-                    OR T1.name like concat('%', #{searchKey}, '%')
-                    -- 责任医生
-                    OR Doctor.name like concat('%', #{searchKey}, '%')
-                    -- 责任护士
-                    OR Nurse.name like concat('%', #{searchKey}, '%')
+                -- 手术
+                <if test="statusEnum == 5">
+                    AND EXISTS (
+                        SELECT 1
+                        FROM wor_service_request_detail wsrd
+                        INNER JOIN wor_service_request wsr ON wsrd.service_req_id = wsr.id
+                        WHERE wsr.encounter_id = T2.id
+                          AND wsrd.type_code = '3'
+                          AND wsr.delete_flag = '0'
+                          AND wsrd.delete_flag = '0'
                     )
-            </if>
-        </where>
+                </if>
 
-        ORDER BY T9.location_id ASC
+                -- 欠费
+                <if test="statusEnum == 6">
+                    AND T6.balance_amount &lt; 0
+                </if>
+
+                -- 已出院
+                <if test="statusEnum == 7">
+                    AND T2.status_enum = 5
+                </if>
+
+                <if test="searchKey != null and searchKey != ''">
+                    AND (
+                        -- 住院号
+                        T2.bus_no = #{searchKey}
+                        -- 患者姓名
+                        OR T1.name like concat('%', #{searchKey}, '%')
+                        -- 责任医生（在子查询中处理）
+                        OR EXISTS (
+                            SELECT 1
+                            FROM adm_encounter_participant ep
+                            LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id AND p.delete_flag = '0'
+                            WHERE ep.encounter_id = T2.id
+                              AND ep.type_code = '9'
+                              AND ep.delete_flag = '0'
+                              AND p."name" like concat('%', #{searchKey}, '%')
+                        )
+                        -- 责任护士（在子查询中处理）
+                        OR EXISTS (
+                            SELECT 1
+                            FROM adm_encounter_participant ep
+                            LEFT JOIN adm_practitioner p ON ep.practitioner_id = p.id AND p.delete_flag = '0'
+                            WHERE ep.encounter_id = T2.id
+                              AND ep.type_code = '2'
+                              AND ep.delete_flag = '0'
+                              AND p."name" like concat('%', #{searchKey}, '%')
+                        )
+                    )
+                </if>
+            ) patient_base
+        ) ranked_result
+        WHERE rn = 1
+        ORDER BY location_id ASC
     </select>
 
     <!-- 科室空床查询-->
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
index 9aed0bb4..225d6d1f 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
@@ -46,7 +46,7 @@
             AND T6.delete_flag = '0'
         LEFT JOIN wor_service_request T7
             ON T1.encounter_id = T7.encounter_id
-            AND T5.base_service_req_id = T7.id
+            AND T5.request_id = T7.id
             AND T7.delete_flag = '0'
         LEFT JOIN wor_service_request_detail T8
             ON T7.id = T8.service_req_id
diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
index ad3c574a..421bb342 100644
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -236,24 +236,34 @@ const filterNode = (value, data) => {
 };
 // 所有诊疗项目列表
 const allImplementDepartmentList = ref([]);
-function getAllImplementDepartment() {
+async function getAllImplementDepartment() {
   loading.value = true;
-  getAllTreatmentList().then((res) => {
+  try {
+    const res = await getAllTreatmentList();
     allImplementDepartmentList.value = res.data.map((item) => ({
       value: item.activityDefinitionId,
       label: item.activityDefinitionName,
     }));
 
-    // 为所有现有行初始化过滤选项
-    catagoryList.value.forEach(row => {
-      if (!row.hasOwnProperty('filteredOptions')) {
-        row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
-        row.loading = false;
-      }
-    });
+    // 为所有现有行初始化过滤选项（使用防抖处理，避免频繁更新）
+    if (catagoryList.value && catagoryList.value.length > 0) {
+      // 使用 setTimeout 将 DOM 更新推迟到下一个事件循环，避免阻塞
+      setTimeout(() => {
+        catagoryList.value.forEach(row => {
+          if (!row.hasOwnProperty('filteredOptions')) {
+            row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
+            row.loading = false;
+          }
+        });
+      }, 0);
+    }
 
     loading.value = false;
-  });
+  } catch (error) {
+    console.error('获取诊疗项目列表失败:', error);
+    loading.value = false;
+    proxy.$message.error('获取诊疗项目列表失败');
+  }
 }
 
 /** 选择条数  */
@@ -269,16 +279,30 @@ function handleRemoteQuery(query, row) {
     row.loading = true;
     // 模拟异步延迟
     setTimeout(() => {
-      // 过滤选项
-      row.filteredOptions = allImplementDepartmentList.value.filter(item => {
+      // 确保数据已加载
+      if (!allImplementDepartmentList.value || allImplementDepartmentList.value.length === 0) {
+        row.filteredOptions = [];
+        row.loading = false;
+        return;
+      }
+
+      // 过滤选项，限制结果数量以提高性能
+      const filtered = allImplementDepartmentList.value.filter(item => {
         return item.label.toLowerCase().includes(query.toLowerCase()) ||
                item.value.toLowerCase().includes(query.toLowerCase());
       });
+
+      // 限制返回结果数量，避免过多选项导致性能问题
+      row.filteredOptions = filtered.slice(0, 100); // 限制为前100个匹配项
       row.loading = false;
     }, 300); // 300ms 延迟，模拟网络请求
   } else {
     // 如果查询为空，显示所有选项（但限制数量以提高性能）
-    row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
+    if (allImplementDepartmentList.value && allImplementDepartmentList.value.length > 0) {
+      row.filteredOptions = allImplementDepartmentList.value.slice(0, 100); // 限制为前100个
+    } else {
+      row.filteredOptions = [];
+    }
   }
 }
 
@@ -288,6 +312,15 @@ function handleAddItem() {
     proxy.$message.warning('请先保存当前行后再新增！');
     return;
   }
+
+  // 确保 allImplementDepartmentList 已经初始化
+  if (!allImplementDepartmentList.value || allImplementDepartmentList.value.length === 0) {
+    proxy.$message.warning('正在加载数据，请稍后再试！');
+    // 如果数据还未加载完成，尝试重新加载
+    getAllImplementDepartment();
+    return;
+  }
+
   const newRow = {
     startTime: '00:00:00',
     endTime: '23:59:59',
@@ -411,26 +444,28 @@ function continueHandleNodeClick(node) {
 }
 
 /** 目录分类查询 */
-function getDiseaseTreatmentList() {
+async function getDiseaseTreatmentList() {
   loading.value = true;
-  getDiseaseTreatmentInit().then(({ data }) => {
-    loading.value = false;
+  try {
+    const { data } = await getDiseaseTreatmentInit();
 
-    //分类目录初始化获取
+    // 分类目录初始化获取
     catagoryDicts.value = data.diagnosisCategoryOptions.sort((a, b) => {
       return parseInt(a.value) - parseInt(b.value);
     });
-  });
-  // 诊疗目录分类查询下拉树结d构
-  loading.value = true;
-  // 诊疗目录分类查询下拉树结d构
-  getImplDepartList();
+  } catch (error) {
+    console.error('获取疾病治疗初始化数据失败:', error);
+    proxy.$message.error('获取分类目录失败');
+  }
+
+  // 诊疗目录分类查询下拉树结构
+  await getImplDepartList();
+  loading.value = false;
 }
 // 诊疗目录分类查询下拉树结d构
-function getImplDepartList() {
-  loading.value = true;
-  getImplementDepartmentList().then((res) => {
-    loading.value = false;
+async function getImplDepartList() {
+  try {
+    const res = await getImplementDepartmentList();
     if (res.code === 200) {
       if (res.data.records.length > 0) {
         organization.value = res.data.records.map((res) => {
@@ -444,13 +479,24 @@ function getImplDepartList() {
         organization.value = [];
       }
     } else {
-      this.$modal.msgError(res.code);
+      proxy.$modal.msgError(res.code);
     }
-  });
+  } catch (error) {
+    console.error('获取实施部门列表失败:', error);
+    proxy.$message.error('获取科室信息失败');
+  }
 }
-onMounted(() => {
-  getAllImplementDepartment();
-  getDiseaseTreatmentList();
+onMounted(async () => {
+  try {
+    // 并行加载数据，提高效率
+    await Promise.all([
+      getAllImplementDepartment(),
+      getDiseaseTreatmentList()
+    ]);
+  } catch (error) {
+    console.error('初始化数据加载失败:', error);
+    proxy.$message.error('数据加载失败，请稍后重试');
+  }
 });
 </script>
 <style scoped>

From d1223aec0742009c9eba05a70d4173a9843558b0 Mon Sep 17 00:00:00 2001
From: nanyangbreeze <1955231298@qq.com>
Date: Tue, 20 Jan 2026 09:31:37 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=8C=82=E5=8F=B7=E8=A1=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutpatientRegistrationAppServiceImpl.java |   49 +
 .../appservice/TriageQueueAppService.java     |   27 +
 .../impl/TriageQueueAppServiceImpl.java       |  556 ++++
 .../controller/TriageQueueController.java     |   70 +
 .../dto/TriageQueueActionReq.java             |   14 +
 .../dto/TriageQueueAddReq.java                |   18 +
 .../dto/TriageQueueAdjustReq.java             |   13 +
 .../dto/TriageQueueEncounterItem.java         |   15 +
 .../domain/TriageCandidateExclusion.java      |   36 +
 .../domain/TriageQueueItem.java               |   43 +
 .../TriageCandidateExclusionMapper.java       |   10 +
 .../mapper/TriageQueueItemMapper.java         |   12 +
 .../TriageCandidateExclusionService.java      |    8 +
 .../service/TriageQueueItemService.java       |   10 +
 .../TriageCandidateExclusionServiceImpl.java  |   12 +
 .../impl/TriageQueueItemServiceImpl.java      |   14 +
 ...5_add_table_triage_candidate_exclusion.sql |   45 +
 .../20260115_add_table_triage_queue_item.sql  |   35 +
 .../sql/debug_queue_date_issue.sql            |  108 +
 .../sql/query_smart_candidate_pool.sql        |  313 +++
 .../sql/query_smart_candidate_pool_page.sql   |  268 ++
 ...ry_smart_candidate_pool_with_exclusion.sql |  366 +++
 .../src/views/triageandqueuemanage/api.js     |   93 +-
 .../triageandqueuemanage/cardiology/index.vue | 2418 +++++++++++++++--
 query_serial_number.sql                       |  121 +
 sql/query_today_outpatient_patients.sql       |  224 ++
 排查指南-字段查询问题.md                      |  284 ++
 27 files changed, 4875 insertions(+), 307 deletions(-)
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
 create mode 100644 openhis-server-new/sql/20260115_add_table_triage_candidate_exclusion.sql
 create mode 100644 openhis-server-new/sql/20260115_add_table_triage_queue_item.sql
 create mode 100644 openhis-server-new/sql/debug_queue_date_issue.sql
 create mode 100644 openhis-server-new/sql/query_smart_candidate_pool.sql
 create mode 100644 openhis-server-new/sql/query_smart_candidate_pool_page.sql
 create mode 100644 openhis-server-new/sql/query_smart_candidate_pool_with_exclusion.sql
 create mode 100644 query_serial_number.sql
 create mode 100644 sql/query_today_outpatient_patients.sql
 create mode 100644 排查指南-字段查询问题.md

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
index b6dc20ba..78623cba 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -29,6 +29,8 @@ import com.openhis.web.chargemanage.dto.PatientMetadata;
 import com.openhis.web.chargemanage.dto.PractitionerMetadata;
 import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
@@ -38,12 +40,15 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 门诊挂号 应用实现类
  */
+@Slf4j
 @Service
 public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistrationAppService {
 
@@ -76,6 +81,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
 
     @Resource
     IPatientIdentifierService patientIdentifierService;
+    
+    @Resource
+    TriageCandidateExclusionService triageCandidateExclusionService;
 
     /**
      * 门诊挂号 - 查询患者信息
@@ -308,6 +316,47 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             new Page<>(pageNo, pageSize), EncounterClass.AMB.getValue(), EncounterStatus.IN_PROGRESS.getValue(),
             ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode(), queryWrapper,
             ChargeItemContext.REGISTER.getValue(), PaymentStatus.SUCCESS.getValue());
+        
+        // 过滤候选池排除列表（如果是从智能候选池查询，排除已加入队列的患者）
+        // 检查请求参数 excludeFromCandidatePool，如果为 true 或未设置，则过滤排除列表
+        String excludeParam = request.getParameter("excludeFromCandidatePool");
+        boolean shouldExclude = excludeParam == null || "true".equalsIgnoreCase(excludeParam);
+        if (shouldExclude && currentDayEncounter != null && !currentDayEncounter.getRecords().isEmpty()) {
+            try {
+                // 获取当前租户和日期
+                Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+                LocalDate today = LocalDate.now();
+                
+                // 查询排除列表
+                List<TriageCandidateExclusion> exclusions = triageCandidateExclusionService.list(
+                    new LambdaQueryWrapper<TriageCandidateExclusion>()
+                        .eq(TriageCandidateExclusion::getTenantId, tenantId)
+                        .eq(TriageCandidateExclusion::getExclusionDate, today)
+                        .eq(TriageCandidateExclusion::getDeleteFlag, "0")
+                );
+                
+                if (exclusions != null && !exclusions.isEmpty()) {
+                    // 构建排除的 encounterId 集合
+                    Set<Long> excludedEncounterIds = exclusions.stream()
+                        .map(TriageCandidateExclusion::getEncounterId)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toSet());
+                    
+                    // 过滤结果
+                    List<CurrentDayEncounterDto> filteredRecords = currentDayEncounter.getRecords().stream()
+                        .filter(e -> e.getEncounterId() == null || !excludedEncounterIds.contains(e.getEncounterId()))
+                        .collect(Collectors.toList());
+                    
+                    // 更新分页结果
+                    currentDayEncounter.setRecords(filteredRecords);
+                    currentDayEncounter.setTotal(filteredRecords.size());
+                }
+            } catch (Exception e) {
+                // 如果过滤失败，记录日志但不影响正常查询
+                log.warn("过滤候选池排除列表失败", e);
+            }
+        }
+        
         currentDayEncounter.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java
new file mode 100644
index 00000000..27231a19
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java
@@ -0,0 +1,27 @@
+package com.openhis.web.triageandqueuemanage.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
+
+import java.time.LocalDate;
+
+public interface TriageQueueAppService {
+    R<?> list(Long organizationId, LocalDate date);
+    R<?> add(TriageQueueAddReq req);
+    R<?> remove(Long id);
+    R<?> adjust(TriageQueueAdjustReq req);
+    /** 选呼：将之前叫号中置为完成，选中的置为叫号中 */
+    R<?> call(TriageQueueActionReq req);
+    /** 完成：叫号中 -> 完成(移出列表)，并自动推进下一个等待为叫号中 */
+    R<?> complete(TriageQueueActionReq req);
+    /** 过号重排：叫号中 -> 跳过并移到末尾，并自动推进下一个等待为叫号中 */
+    R<?> requeue(TriageQueueActionReq req);
+    /** 跳过：兼容前端按钮（当前实现等同于过号重排） */
+    R<?> skip(TriageQueueActionReq req);
+    /** 下一患者：当前叫号中 -> 完成，下一位等待 -> 叫号中 */
+    R<?> next(TriageQueueActionReq req);
+}
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
new file mode 100644
index 00000000..e1606e63
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
@@ -0,0 +1,556 @@
+package com.openhis.web.triageandqueuemanage.appservice.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
+import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
+import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueEncounterItem;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class TriageQueueAppServiceImpl implements TriageQueueAppService {
+
+    private static final String STATUS_WAITING = "WAITING";
+    private static final String STATUS_CALLING = "CALLING";
+    private static final String STATUS_SKIPPED = "SKIPPED";
+    private static final String STATUS_COMPLETED = "COMPLETED";
+
+    @Resource
+    private TriageQueueItemService triageQueueItemService;
+    
+    @Resource
+    private TriageCandidateExclusionService triageCandidateExclusionService;
+
+    @Override
+    public R<?> list(Long organizationId, LocalDate date) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        // 只查询今天的患者
+        LocalDate qd = date != null ? date : LocalDate.now();
+        
+        LambdaQueryWrapper<TriageQueueItem> wrapper = new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getQueueDate, qd)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .ne(TriageQueueItem::getStatus, STATUS_COMPLETED)
+            .orderByAsc(TriageQueueItem::getQueueOrder);
+        
+        // 如果指定了科室，按科室过滤；否则查询所有科室（全科模式）
+        if (organizationId != null) {
+            wrapper.eq(TriageQueueItem::getOrganizationId, organizationId);
+        }
+        
+        List<TriageQueueItem> list = triageQueueItemService.list(wrapper);
+        
+        // 双重保险：再次过滤掉 COMPLETED 状态的患者（防止数据库中有异常数据）
+        if (list != null && !list.isEmpty()) {
+            int beforeSize = list.size();
+            list = list.stream()
+                .filter(item -> !STATUS_COMPLETED.equals(item.getStatus()))
+                .collect(java.util.stream.Collectors.toList());
+            if (beforeSize != list.size()) {
+                System.out.println(">>> [TriageQueue] list() 警告：过滤掉了 " + (beforeSize - list.size()) + " 条 COMPLETED 状态的记录");
+            }
+        }
+        
+        // 调试日志：检查状态值
+        if (list != null && !list.isEmpty()) {
+            System.out.println(">>> [TriageQueue] list() 返回 " + list.size() + " 条记录（已排除 COMPLETED）");
+            for (int i = 0; i < Math.min(3, list.size()); i++) {
+                TriageQueueItem item = list.get(i);
+                System.out.println("    [" + i + "] patientName=" + item.getPatientName() 
+                    + ", status=" + item.getStatus() 
+                    + ", organizationId=" + item.getOrganizationId());
+            }
+        }
+        return R.ok(list);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> add(TriageQueueAddReq req) {
+        if (req == null || ObjectUtil.isNull(req.getOrganizationId())) {
+            return R.fail("organizationId 不能为空");
+        }
+        if (CollUtil.isEmpty(req.getItems())) {
+            return R.fail("items 不能为空");
+        }
+
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        LocalDate qd = LocalDate.now();
+        Long orgId = req.getOrganizationId();
+
+        List<TriageQueueItem> existing = triageQueueItemService.list(new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getOrganizationId, orgId)
+            .eq(TriageQueueItem::getQueueDate, qd)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .ne(TriageQueueItem::getStatus, STATUS_COMPLETED));
+
+        int maxOrder = existing.stream().map(TriageQueueItem::getQueueOrder).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
+
+        int added = 0;
+        for (TriageQueueEncounterItem it : req.getItems()) {
+            if (it == null || it.getEncounterId() == null) continue;
+            boolean exists = existing.stream().anyMatch(e -> Objects.equals(e.getEncounterId(), it.getEncounterId()));
+            if (exists) continue;
+
+            TriageQueueItem qi = new TriageQueueItem()
+                .setTenantId(tenantId)
+                .setQueueDate(qd)
+                .setOrganizationId(orgId)
+                .setOrganizationName(req.getOrganizationName())
+                .setEncounterId(it.getEncounterId())
+                .setPatientId(it.getPatientId())
+                .setPatientName(it.getPatientName())
+                .setHealthcareName(it.getHealthcareName())
+                .setPractitionerName(it.getPractitionerName())
+                .setStatus(STATUS_WAITING)
+                .setQueueOrder(++maxOrder)
+                .setDeleteFlag("0")
+                .setCreateTime(LocalDateTime.now())
+                .setUpdateTime(LocalDateTime.now());
+
+            triageQueueItemService.save(qi);
+            
+            // 记录到候选池排除列表（避免刷新后重新出现在候选池）
+            TriageCandidateExclusion exclusion = triageCandidateExclusionService.getOne(
+                new LambdaQueryWrapper<TriageCandidateExclusion>()
+                    .eq(TriageCandidateExclusion::getTenantId, tenantId)
+                    .eq(TriageCandidateExclusion::getExclusionDate, qd)
+                    .eq(TriageCandidateExclusion::getEncounterId, it.getEncounterId())
+                    .eq(TriageCandidateExclusion::getDeleteFlag, "0")
+            );
+            if (exclusion == null) {
+                exclusion = new TriageCandidateExclusion()
+                    .setTenantId(tenantId)
+                    .setExclusionDate(qd)
+                    .setEncounterId(it.getEncounterId())
+                    .setPatientId(it.getPatientId())
+                    .setPatientName(it.getPatientName())
+                    .setOrganizationId(orgId)
+                    .setOrganizationName(req.getOrganizationName())
+                    .setReason("ADDED_TO_QUEUE")
+                    .setDeleteFlag("0")
+                    .setCreateTime(LocalDateTime.now())
+                    .setUpdateTime(LocalDateTime.now());
+                triageCandidateExclusionService.save(exclusion);
+            }
+            
+            added++;
+        }
+
+        return R.ok(added);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> remove(Long id) {
+        if (id == null) return R.fail("id 不能为空");
+        TriageQueueItem item = triageQueueItemService.getById(id);
+        if (item == null) return R.fail("队列项不存在");
+        
+        // 逻辑删除队列项
+        item.setDeleteFlag("1").setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(item);
+        
+        // 从排除列表中删除记录，使患者重新出现在候选池中
+        Integer tenantId = item.getTenantId();
+        LocalDate exclusionDate = item.getQueueDate();
+        Long encounterId = item.getEncounterId();
+        
+        if (tenantId != null && exclusionDate != null && encounterId != null) {
+            TriageCandidateExclusion exclusion = triageCandidateExclusionService.getOne(
+                new LambdaQueryWrapper<TriageCandidateExclusion>()
+                    .eq(TriageCandidateExclusion::getTenantId, tenantId)
+                    .eq(TriageCandidateExclusion::getExclusionDate, exclusionDate)
+                    .eq(TriageCandidateExclusion::getEncounterId, encounterId)
+                    .eq(TriageCandidateExclusion::getDeleteFlag, "0")
+            );
+            
+            if (exclusion != null) {
+                // 逻辑删除排除记录
+                exclusion.setDeleteFlag("1").setUpdateTime(LocalDateTime.now());
+                triageCandidateExclusionService.updateById(exclusion);
+            }
+        }
+        
+        recalcOrders(item.getOrganizationId(), item.getQueueDate());
+        return R.ok(true);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> adjust(TriageQueueAdjustReq req) {
+        if (req == null || req.getId() == null) return R.fail("id 不能为空");
+        if (!"up".equalsIgnoreCase(req.getDirection()) && !"down".equalsIgnoreCase(req.getDirection())) {
+            return R.fail("direction 只能是 up/down");
+        }
+        TriageQueueItem cur = triageQueueItemService.getById(req.getId());
+        if (cur == null) return R.fail("队列项不存在");
+
+        List<TriageQueueItem> list = listInternal(cur.getOrganizationId(), cur.getQueueDate());
+        list.sort(Comparator.comparing(TriageQueueItem::getQueueOrder).thenComparing(TriageQueueItem::getId));
+        int idx = -1;
+        for (int i = 0; i < list.size(); i++) {
+            if (Objects.equals(list.get(i).getId(), cur.getId())) { idx = i; break; }
+        }
+        if (idx == -1) return R.fail("队列项不在当前队列");
+
+        int targetIdx = "up".equalsIgnoreCase(req.getDirection()) ? idx - 1 : idx + 1;
+        if (targetIdx < 0 || targetIdx >= list.size()) return R.ok(false);
+
+        TriageQueueItem other = list.get(targetIdx);
+        Integer tmp = cur.getQueueOrder();
+        cur.setQueueOrder(other.getQueueOrder()).setUpdateTime(LocalDateTime.now());
+        other.setQueueOrder(tmp).setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(cur);
+        triageQueueItemService.updateById(other);
+
+        recalcOrders(cur.getOrganizationId(), cur.getQueueDate());
+        return R.ok(true);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> call(TriageQueueActionReq req) {
+        if (req == null || req.getId() == null) return R.fail("id 不能为空");
+        TriageQueueItem selected = triageQueueItemService.getById(req.getId());
+        if (selected == null) return R.fail("队列项不存在");
+
+        // 只将"等待"状态的患者转为"叫号中"，允许有多个"叫号中"的患者
+        if (STATUS_WAITING.equals(selected.getStatus())) {
+            selected.setStatus(STATUS_CALLING).setUpdateTime(LocalDateTime.now());
+            triageQueueItemService.updateById(selected);
+            return R.ok(true);
+        } else if (STATUS_CALLING.equals(selected.getStatus())) {
+            // 如果已经是"叫号中"状态，直接返回成功（不做任何操作）
+            return R.ok(true);
+        } else {
+            // 其他状态（如 SKIPPED、COMPLETED）不能选呼
+            return R.fail("只能选呼\"等待\"状态的患者，当前患者状态为：" + selected.getStatus());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> complete(TriageQueueActionReq req) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        TriageQueueItem calling = null;
+        
+        // 关键改进：如果提供了 id，直接通过ID获取（像 call 方法一样），不依赖查询条件
+        if (req != null && req.getId() != null) {
+            calling = triageQueueItemService.getById(req.getId());
+            if (calling == null) {
+                return R.fail("队列项不存在");
+            }
+            // 验证状态
+            if (!STATUS_CALLING.equals(calling.getStatus())) {
+                return R.fail("只能完成\"叫号中\"状态的患者，当前患者状态为：" + calling.getStatus());
+            }
+        } else {
+            // 如果没有提供 id，通过查询条件查找（兼容旧逻辑）
+            Long orgId = req != null && req.getOrganizationId() != null ? req.getOrganizationId() : null;
+            System.out.println(">>> [TriageQueue] complete() 开始执行（不限制日期，通过查询条件）, tenantId=" + tenantId + ", orgId=" + orgId);
+
+            LambdaQueryWrapper<TriageQueueItem> callingWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getTenantId, tenantId)
+                .eq(TriageQueueItem::getDeleteFlag, "0")
+                .eq(TriageQueueItem::getStatus, STATUS_CALLING)
+                .orderByAsc(TriageQueueItem::getQueueOrder)
+                .last("LIMIT 1");
+            
+            if (orgId != null) {
+                callingWrapper.eq(TriageQueueItem::getOrganizationId, orgId);
+            }
+            
+            calling = triageQueueItemService.getOne(callingWrapper, false);
+            
+            System.out.println(">>> [TriageQueue] complete() 查询叫号中患者（不限制日期）: orgId=" + orgId + ", 结果=" + (calling != null ? calling.getPatientName() + "(status=" + calling.getStatus() + ", queueDate=" + calling.getQueueDate() + ")" : "null"));
+
+            if (calling == null) {
+                return R.fail("当前没有叫号中的患者");
+            }
+        }
+        
+        // 使用实际找到的科室ID
+        Long actualOrgId = calling.getOrganizationId();
+
+        // 1) 叫号中 -> 完成（移出列表）
+        calling.setStatus(STATUS_COMPLETED).setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(calling);
+
+        // 2) 自动推进下一个等待为叫号中（同一科室，包含跳过状态，不限制日期）
+        LambdaQueryWrapper<TriageQueueItem> nextWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .and(w -> w.eq(TriageQueueItem::getStatus, STATUS_WAITING)
+                       .or()
+                       .eq(TriageQueueItem::getStatus, STATUS_SKIPPED))
+            .orderByAsc(TriageQueueItem::getQueueOrder)
+            .last("LIMIT 1");
+        
+        // 如果指定了科室ID，则按科室过滤；否则查询所有科室（全科模式）
+        if (actualOrgId != null) {
+            nextWrapper.eq(TriageQueueItem::getOrganizationId, actualOrgId);
+        }
+        
+        TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
+        
+        System.out.println(">>> [TriageQueue] complete() 查询等待患者（不限制日期）: actualOrgId=" + actualOrgId + ", 结果=" + (next != null ? next.getPatientName() + "(status=" + next.getStatus() + ")" : "null"));
+
+        if (next != null) {
+            next.setStatus(STATUS_CALLING).setUpdateTime(LocalDateTime.now());
+            triageQueueItemService.updateById(next);
+        }
+
+        recalcOrders(actualOrgId, null);
+        return R.ok(true);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> requeue(TriageQueueActionReq req) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        TriageQueueItem calling = null;
+        
+
+        if (req != null && req.getId() != null) {
+            calling = triageQueueItemService.getById(req.getId());
+            if (calling == null) {
+                return R.fail("队列项不存在");
+            }
+            // 验证状态
+            if (!STATUS_CALLING.equals(calling.getStatus())) {
+                return R.fail("只能对\"叫号中\"状态的患者进行过号重排，当前患者状态为：" + calling.getStatus());
+            }
+        } else {
+            // 如果没有提供 id，通过查询条件查找（兼容旧逻辑）
+            Long orgId = req != null && req.getOrganizationId() != null ? req.getOrganizationId() : null;
+
+            LambdaQueryWrapper<TriageQueueItem> callingWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getTenantId, tenantId)
+                .eq(TriageQueueItem::getDeleteFlag, "0")
+                .eq(TriageQueueItem::getStatus, STATUS_CALLING)
+                .orderByAsc(TriageQueueItem::getQueueOrder)
+                .last("LIMIT 1");
+            
+            if (orgId != null) {
+                callingWrapper.eq(TriageQueueItem::getOrganizationId, orgId);
+            }
+            
+            calling = triageQueueItemService.getOne(callingWrapper, false);
+
+            if (calling == null) return R.fail("当前没有叫号中的患者");
+        }
+        
+        // 使用实际找到的科室ID
+        Long actualOrgId = calling.getOrganizationId();
+
+        // 关键改进：在执行"跳过"操作之前，先检查是否有等待中的患者（判断队列状态）
+        // 如果没有等待中的患者，就不应该执行"过号重排"操作
+        LambdaQueryWrapper<TriageQueueItem> nextWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .and(w -> w.eq(TriageQueueItem::getStatus, STATUS_WAITING)
+                       .or()
+                       .eq(TriageQueueItem::getStatus, STATUS_SKIPPED))
+            .orderByAsc(TriageQueueItem::getQueueOrder)
+            .last("LIMIT 1");
+        
+        // 如果指定了科室ID，则按科室过滤；否则查询所有科室（全科模式）
+        if (actualOrgId != null) {
+            nextWrapper.eq(TriageQueueItem::getOrganizationId, actualOrgId);
+        }
+        
+        TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
+        
+        // 调试日志：检查查询结果
+        System.out.println(">>> [TriageQueue] requeue() 查询等待中的患者:");
+        System.out.println(">>>   - 科室ID: " + actualOrgId);
+        System.out.println(">>>   - 找到的等待患者: " + (next != null ? next.getPatientName() + " (状态: " + next.getStatus() + ")" : "null"));
+        
+        // 如果找不到等待中的患者，直接返回失败（不执行跳过操作）
+        if (next == null) {
+            System.out.println(">>> [TriageQueue] requeue() 失败：没有等待中的患者");
+            return R.fail("当前没有等待中的患者");
+        }
+
+        // 找末尾序号（同一科室，不限制日期）
+        Integer maxOrder = triageQueueItemService.list(new LambdaQueryWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getTenantId, tenantId)
+                .eq(TriageQueueItem::getOrganizationId, actualOrgId)
+                .eq(TriageQueueItem::getDeleteFlag, "0")
+                .ne(TriageQueueItem::getStatus, STATUS_COMPLETED))
+            .stream()
+            .map(TriageQueueItem::getQueueOrder)
+            .filter(Objects::nonNull)
+            .max(Integer::compareTo)
+            .orElse(0);
+
+        // 1) 叫号中 -> 跳过，并移到末尾
+        calling.setStatus(STATUS_SKIPPED).setQueueOrder(maxOrder + 1).setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(calling);
+
+        // 2) 自动推进下一个等待为叫号中
+        next.setStatus(STATUS_CALLING).setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(next);
+
+        recalcOrders(actualOrgId, null);
+        return R.ok(true);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> skip(TriageQueueActionReq req) {
+        // 当前业务“跳过”按“过号重排”处理：叫号中 -> 跳过并移到末尾，自动推进下一等待
+        return requeue(req);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> next(TriageQueueActionReq req) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        TriageQueueItem calling = null;
+        
+        System.out.println(">>> [TriageQueue] next() 开始执行（不限制日期）, tenantId=" + tenantId);
+
+        // 关键改进：如果提供了 id，优先使用 id 直接查找（像 call 方法一样）
+        if (req != null && req.getId() != null) {
+            calling = triageQueueItemService.getById(req.getId());
+            if (calling == null) {
+                return R.fail("队列项不存在");
+            }
+            // 验证状态：必须是"叫号中"状态
+            if (!STATUS_CALLING.equals(calling.getStatus())) {
+                return R.fail("只能对\"叫号中\"状态的患者执行\"下一患者\"操作，当前患者状态为：" + calling.getStatus());
+            }
+        } else {
+            // 如果没有提供 id，通过查询条件查找（兼容旧逻辑）
+            Long orgId = req != null && req.getOrganizationId() != null ? req.getOrganizationId() : null;
+            
+            LambdaQueryWrapper<TriageQueueItem> callingWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getTenantId, tenantId)
+                .eq(TriageQueueItem::getDeleteFlag, "0")
+                .eq(TriageQueueItem::getStatus, STATUS_CALLING)
+                .orderByAsc(TriageQueueItem::getQueueOrder)
+                .last("LIMIT 1");
+            
+            if (orgId != null) {
+                callingWrapper.eq(TriageQueueItem::getOrganizationId, orgId);
+            }
+            
+            calling = triageQueueItemService.getOne(callingWrapper, false);
+        }
+
+        Long actualOrgId = null;
+        
+        // 当前叫号中 -> 完成（如果不存在，就当作从头找第一位等待）
+        if (calling != null) {
+            calling.setStatus(STATUS_COMPLETED).setUpdateTime(LocalDateTime.now());
+            triageQueueItemService.updateById(calling);
+            actualOrgId = calling.getOrganizationId(); // 使用叫号中患者所在的科室
+        } else {
+            // 如果没有叫号中的患者，使用请求中的 organizationId（如果有）
+            if (req != null && req.getOrganizationId() != null) {
+                actualOrgId = req.getOrganizationId();
+            }
+        }
+
+        // 下一位等待 -> 叫号中（如果之前有叫号中的，就在同一科室找；否则在全科找）
+        // 注意：也包含"跳过"状态的患者，因为跳过后的患者也可以重新叫号（不限制日期）
+        LambdaQueryWrapper<TriageQueueItem> nextWrapper = new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .and(w -> w.eq(TriageQueueItem::getStatus, STATUS_WAITING)
+                       .or()
+                       .eq(TriageQueueItem::getStatus, STATUS_SKIPPED))
+            .orderByAsc(TriageQueueItem::getQueueOrder)
+            .last("LIMIT 1");
+        
+        if (actualOrgId != null) {
+            nextWrapper.eq(TriageQueueItem::getOrganizationId, actualOrgId);
+        }
+        
+        TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
+        
+        // 调试日志：打印查询条件和结果
+        System.out.println(">>> [TriageQueue] next() 查询条件（不限制日期）: tenantId=" + tenantId 
+            + ", actualOrgId=" + actualOrgId
+            + ", deleteFlag=0"
+            + ", status IN (WAITING, SKIPPED)");
+        System.out.println(">>> [TriageQueue] next() 查询结果: calling=" + (calling != null ? calling.getPatientName() + "(status=" + calling.getStatus() + ", queueDate=" + calling.getQueueDate() + ")" : "null")
+            + ", next=" + (next != null ? next.getPatientName() + "(status=" + next.getStatus() + ", queueDate=" + next.getQueueDate() + ")" : "null"));
+
+        if (next == null) {
+            if (actualOrgId != null) {
+                recalcOrders(actualOrgId, null);
+            }
+            return R.fail("当前没有等待的患者");
+        }
+
+        next.setStatus(STATUS_CALLING).setUpdateTime(LocalDateTime.now());
+        triageQueueItemService.updateById(next);
+
+        if (next.getOrganizationId() != null) {
+            recalcOrders(next.getOrganizationId(), null);
+        }
+        return R.ok(true);
+    }
+
+    private List<TriageQueueItem> listInternal(Long orgId, LocalDate qd) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        LambdaQueryWrapper<TriageQueueItem> wrapper = new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getOrganizationId, orgId)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .ne(TriageQueueItem::getStatus, STATUS_COMPLETED);
+        // 如果 qd 不为 null，才添加日期限制
+        if (qd != null) {
+            wrapper.eq(TriageQueueItem::getQueueDate, qd);
+        }
+        return triageQueueItemService.list(wrapper);
+    }
+
+    private TriageQueueItem findCalling(Long orgId, LocalDate qd) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        return triageQueueItemService.getOne(new LambdaQueryWrapper<TriageQueueItem>()
+            .eq(TriageQueueItem::getTenantId, tenantId)
+            .eq(TriageQueueItem::getOrganizationId, orgId)
+            .eq(TriageQueueItem::getQueueDate, qd)
+            .eq(TriageQueueItem::getDeleteFlag, "0")
+            .eq(TriageQueueItem::getStatus, STATUS_CALLING)
+            .last("LIMIT 1"), false);
+    }
+
+    private void recalcOrders(Long orgId, LocalDate qd) {
+        List<TriageQueueItem> list = listInternal(orgId, qd);
+        list.sort(Comparator.comparing(TriageQueueItem::getQueueOrder).thenComparing(TriageQueueItem::getId));
+        int i = 1;
+        for (TriageQueueItem it : list) {
+            if (!Objects.equals(it.getQueueOrder(), i)) {
+                it.setQueueOrder(i).setUpdateTime(LocalDateTime.now());
+                triageQueueItemService.updateById(it);
+            }
+            i++;
+        }
+    }
+}
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java
new file mode 100644
index 00000000..5697a499
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java
@@ -0,0 +1,70 @@
+package com.openhis.web.triageandqueuemanage.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
+import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+
+@RestController
+@Slf4j
+@RequestMapping("/triage/queue")
+public class TriageQueueController {
+
+    @Resource
+    private TriageQueueAppService triageQueueAppService;
+
+    @GetMapping("/list")
+    public R<?> list(@RequestParam(value = "organizationId", required = false) Long organizationId,
+                     @RequestParam(value = "date", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date) {
+        return triageQueueAppService.list(organizationId, date);
+    }
+
+    @PostMapping("/add")
+    public R<?> add(@RequestBody TriageQueueAddReq req) {
+        return triageQueueAppService.add(req);
+    }
+
+    @DeleteMapping("/remove/{id}")
+    public R<?> remove(@PathVariable("id") Long id) {
+        return triageQueueAppService.remove(id);
+    }
+
+    @PutMapping("/adjust")
+    public R<?> adjust(@RequestBody TriageQueueAdjustReq req) {
+        return triageQueueAppService.adjust(req);
+    }
+
+    @PostMapping("/call")
+    public R<?> call(@RequestBody TriageQueueActionReq req) {
+        return triageQueueAppService.call(req);
+    }
+
+    @PostMapping("/complete")
+    public R<?> complete(@RequestBody(required = false) TriageQueueActionReq req) {
+        return triageQueueAppService.complete(req);
+    }
+
+    @PostMapping("/requeue")
+    public R<?> requeue(@RequestBody(required = false) TriageQueueActionReq req) {
+        return triageQueueAppService.requeue(req);
+    }
+
+    @PostMapping("/skip")
+    public R<?> skip(@RequestBody(required = false) TriageQueueActionReq req) {
+        return triageQueueAppService.skip(req);
+    }
+
+    @PostMapping("/next")
+    public R<?> next(@RequestBody(required = false) TriageQueueActionReq req) {
+        return triageQueueAppService.next(req);
+    }
+}
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java
new file mode 100644
index 00000000..1ba6e187
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java
@@ -0,0 +1,14 @@
+package com.openhis.web.triageandqueuemanage.dto;
+
+import lombok.Data;
+
+@Data
+public class TriageQueueActionReq {
+    /** 目标队列项ID（例如：选呼时选中的患者） */
+    private Long id;
+    /** 科室ID（可选：不传则用当前登录人orgId） */
+    private Long organizationId;
+}
+
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java
new file mode 100644
index 00000000..44f681f7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java
@@ -0,0 +1,18 @@
+package com.openhis.web.triageandqueuemanage.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TriageQueueAddReq {
+    /** 科室ID（就诊科室） */
+    private Long organizationId;
+    /** 科室名称（冗余存储，便于展示） */
+    private String organizationName;
+    /** 要加入队列的就诊记录 */
+    private List<TriageQueueEncounterItem> items;
+}
+
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
new file mode 100644
index 00000000..d800c1dc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
@@ -0,0 +1,13 @@
+package com.openhis.web.triageandqueuemanage.dto;
+
+import lombok.Data;
+
+@Data
+public class TriageQueueAdjustReq {
+    private Long id;
+    /** up / down */
+    private String direction;
+}
+
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
new file mode 100644
index 00000000..09d6ea87
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
@@ -0,0 +1,15 @@
+package com.openhis.web.triageandqueuemanage.dto;
+
+import lombok.Data;
+
+@Data
+public class TriageQueueEncounterItem {
+    private Long encounterId;
+    private Long patientId;
+    private String patientName;
+    private String healthcareName;
+    private String practitionerName;
+}
+
+
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java
new file mode 100644
index 00000000..7c7340ee
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java
@@ -0,0 +1,36 @@
+package com.openhis.triageandqueuemanage.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "hisdev.triage_candidate_exclusion")
+@EqualsAndHashCode(callSuper = false)
+public class TriageCandidateExclusion {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Integer tenantId;
+    private LocalDate exclusionDate;
+    private Long encounterId;
+    private Long patientId;
+    private String patientName;
+    private Long organizationId;
+    private String organizationName;
+    
+    /** 排除原因：ADDED_TO_QUEUE（加入队列）、MANUAL_REMOVE（手动移除）等 */
+    private String reason;
+    
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private String deleteFlag;
+}
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java
new file mode 100644
index 00000000..83aaba54
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java
@@ -0,0 +1,43 @@
+package com.openhis.triageandqueuemanage.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "hisdev.triage_queue_item")
+@EqualsAndHashCode(callSuper = false)
+public class TriageQueueItem {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Integer tenantId;
+    private LocalDate queueDate;
+    private Long organizationId;
+    private String organizationName;
+
+    private Long encounterId;
+    private Long patientId;
+    private String patientName;
+
+    private String healthcareName;
+    private String practitionerName;
+
+    /** WAITING / CALLING / SKIPPED / COMPLETED */
+    private String status;
+    private Integer queueOrder;
+
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+
+    private String deleteFlag;
+}
+
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
new file mode 100644
index 00000000..57cde407
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.triageandqueuemanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TriageCandidateExclusionMapper extends BaseMapper<TriageCandidateExclusion> {
+}
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java
new file mode 100644
index 00000000..6c36336a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java
@@ -0,0 +1,12 @@
+package com.openhis.triageandqueuemanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TriageQueueItemMapper extends BaseMapper<TriageQueueItem> {
+}
+
+
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java
new file mode 100644
index 00000000..9745206d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java
@@ -0,0 +1,8 @@
+package com.openhis.triageandqueuemanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+
+public interface TriageCandidateExclusionService extends IService<TriageCandidateExclusion> {
+}
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java
new file mode 100644
index 00000000..77931fd5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java
@@ -0,0 +1,10 @@
+package com.openhis.triageandqueuemanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+
+public interface TriageQueueItemService extends IService<TriageQueueItem> {
+}
+
+
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
new file mode 100644
index 00000000..4acb082f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
@@ -0,0 +1,12 @@
+package com.openhis.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.openhis.triageandqueuemanage.mapper.TriageCandidateExclusionMapper;
+import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TriageCandidateExclusionServiceImpl extends ServiceImpl<TriageCandidateExclusionMapper, TriageCandidateExclusion> implements TriageCandidateExclusionService {
+}
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
new file mode 100644
index 00000000..159df9c4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
@@ -0,0 +1,14 @@
+package com.openhis.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import com.openhis.triageandqueuemanage.mapper.TriageQueueItemMapper;
+import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TriageQueueItemServiceImpl extends ServiceImpl<TriageQueueItemMapper, TriageQueueItem> implements TriageQueueItemService {
+}
+
+
+
diff --git a/openhis-server-new/sql/20260115_add_table_triage_candidate_exclusion.sql b/openhis-server-new/sql/20260115_add_table_triage_candidate_exclusion.sql
new file mode 100644
index 00000000..ffe0c1e9
--- /dev/null
+++ b/openhis-server-new/sql/20260115_add_table_triage_candidate_exclusion.sql
@@ -0,0 +1,45 @@
+-- 智能分诊排队：候选池排除记录表
+-- 用途：记录已从智能候选池中移除的患者（加入队列后不再出现在候选池）
+-- 注意：必须在后端实际连接的 schema 中执行（dev环境是 hisdev，test环境是 histest，prd环境是 hisprd）
+-- 执行前请先确认：SET search_path TO hisdev; （或对应的 schema）
+
+CREATE TABLE IF NOT EXISTS hisdev.triage_candidate_exclusion (
+    id               BIGSERIAL PRIMARY KEY,
+    tenant_id        INTEGER      NOT NULL,
+    exclusion_date   DATE         NOT NULL,
+    encounter_id     BIGINT       NOT NULL,
+    patient_id       BIGINT,
+    patient_name     VARCHAR(255),
+    organization_id  BIGINT,
+    organization_name VARCHAR(255),
+    reason           VARCHAR(100) DEFAULT 'ADDED_TO_QUEUE', -- 排除原因：ADDED_TO_QUEUE（加入队列）、MANUAL_REMOVE（手动移除）等
+    create_time      TIMESTAMP    DEFAULT CURRENT_TIMESTAMP,
+    update_time      TIMESTAMP    DEFAULT CURRENT_TIMESTAMP,
+    delete_flag      CHAR(1)      NOT NULL DEFAULT '0'
+);
+
+-- 常用查询索引：按租户/日期/就诊记录查询
+CREATE INDEX IF NOT EXISTS idx_triage_candidate_exclusion_list
+    ON hisdev.triage_candidate_exclusion (tenant_id, exclusion_date, delete_flag, encounter_id);
+
+-- 防重复：同一天同租户同就诊记录只能有一条排除记录（未删除）
+CREATE UNIQUE INDEX IF NOT EXISTS uq_triage_candidate_exclusion_encounter
+    ON hisdev.triage_candidate_exclusion (tenant_id, exclusion_date, encounter_id, delete_flag)
+    WHERE delete_flag = '0';
+
+-- 就诊记录ID索引（用于关联查询）
+CREATE INDEX IF NOT EXISTS idx_triage_candidate_exclusion_encounter_id
+    ON hisdev.triage_candidate_exclusion (encounter_id);
+
+-- 注释
+COMMENT ON TABLE hisdev.triage_candidate_exclusion IS '智能分诊排队候选池排除记录表';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.tenant_id IS '租户ID';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.exclusion_date IS '排除日期（通常为当天）';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.encounter_id IS '就诊记录ID（唯一标识）';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.patient_id IS '患者ID';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.patient_name IS '患者姓名';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.organization_id IS '科室ID';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.organization_name IS '科室名称';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.reason IS '排除原因：ADDED_TO_QUEUE（加入队列）、MANUAL_REMOVE（手动移除）等';
+COMMENT ON COLUMN hisdev.triage_candidate_exclusion.delete_flag IS '删除标志：0-未删除，1-已删除';
+
diff --git a/openhis-server-new/sql/20260115_add_table_triage_queue_item.sql b/openhis-server-new/sql/20260115_add_table_triage_queue_item.sql
new file mode 100644
index 00000000..f2253a22
--- /dev/null
+++ b/openhis-server-new/sql/20260115_add_table_triage_queue_item.sql
@@ -0,0 +1,35 @@
+-- 智能分诊排队：队列持久化表（与 TriageQueueItem.java 字段一致）
+-- 注意：必须在后端实际连接的 schema 中执行（dev环境是 hisdev，test环境是 histest，prd环境是 hisprd）
+-- 执行前请先确认：SET search_path TO hisdev; （或对应的 schema）
+
+CREATE TABLE IF NOT EXISTS triage_queue_item (
+    id               BIGSERIAL PRIMARY KEY,
+    tenant_id        INTEGER      NOT NULL,
+    queue_date       DATE         NOT NULL,
+    organization_id  BIGINT       NOT NULL,
+    organization_name VARCHAR(255),
+    encounter_id     BIGINT       NOT NULL,
+    patient_id       BIGINT,
+    patient_name     VARCHAR(255),
+    healthcare_name  VARCHAR(255),
+    practitioner_name VARCHAR(255),
+    status           VARCHAR(50)  NOT NULL, -- WAITING/CALLING/SKIPPED/COMPLETED
+    queue_order      INTEGER      NOT NULL,
+    create_time      TIMESTAMP,
+    update_time      TIMESTAMP,
+    delete_flag      CHAR(1)      NOT NULL DEFAULT '0'
+);
+
+-- 常用查询索引：按租户/科室/日期/状态/顺序取队列
+CREATE INDEX IF NOT EXISTS idx_triage_queue_item_list
+    ON triage_queue_item (tenant_id, queue_date, organization_id, delete_flag, status, queue_order);
+
+-- 防重复：同一天同租户同科室同就诊记录只能在队列里一条（未删除）
+CREATE UNIQUE INDEX IF NOT EXISTS uq_triage_queue_item_encounter
+    ON triage_queue_item (tenant_id, queue_date, organization_id, encounter_id, delete_flag)
+    WHERE delete_flag = '0';
+
+-- 就诊记录ID索引（用于关联查询）
+CREATE INDEX IF NOT EXISTS idx_triage_queue_item_encounter_id
+    ON triage_queue_item (encounter_id);
+
diff --git a/openhis-server-new/sql/debug_queue_date_issue.sql b/openhis-server-new/sql/debug_queue_date_issue.sql
new file mode 100644
index 00000000..fd4a5136
--- /dev/null
+++ b/openhis-server-new/sql/debug_queue_date_issue.sql
@@ -0,0 +1,108 @@
+-- ============================================
+-- 调试队列日期问题
+-- 用途：检查数据库中的 queue_date 字段值，找出为什么查询不到数据
+-- ============================================
+
+-- 1. 查看所有队列记录的日期分布
+SELECT 
+    queue_date,
+    status,
+    COUNT(*) AS count,
+    STRING_AGG(patient_name, ', ') AS patients
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+GROUP BY queue_date, status
+ORDER BY queue_date DESC, status;
+
+-- 2. 查看指定科室的所有记录（不限制日期）
+SELECT 
+    id,
+    queue_date,
+    status,
+    patient_name,
+    organization_id,
+    organization_name,
+    queue_order,
+    create_time
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND organization_id = 1995302136614969300
+ORDER BY queue_date DESC, queue_order ASC;
+
+-- 3. 查看今天的记录（使用 CURRENT_DATE）
+SELECT 
+    id,
+    queue_date,
+    status,
+    patient_name,
+    organization_id,
+    queue_order
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND queue_date = CURRENT_DATE
+  AND organization_id = 1995302136614969300
+ORDER BY queue_order ASC;
+
+-- 4. 查看 2026-01-16 的记录
+SELECT 
+    id,
+    queue_date,
+    status,
+    patient_name,
+    organization_id,
+    queue_order
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND queue_date = '2026-01-16'::DATE
+  AND organization_id = 1995302136614969300
+ORDER BY queue_order ASC;
+
+-- 5. 查看 2025-01-16 的记录（可能是昨天的数据）
+SELECT 
+    id,
+    queue_date,
+    status,
+    patient_name,
+    organization_id,
+    queue_order
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND queue_date = '2025-01-16'::DATE
+  AND organization_id = 1995302136614969300
+ORDER BY queue_order ASC;
+
+-- 6. 查看最近的记录（最近7天）
+SELECT 
+    queue_date,
+    status,
+    COUNT(*) AS count
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND queue_date >= CURRENT_DATE - INTERVAL '7 days'
+GROUP BY queue_date, status
+ORDER BY queue_date DESC, status;
+
+-- 7. 检查系统当前日期（PostgreSQL）
+SELECT CURRENT_DATE AS current_date_in_db;
+
+-- 8. 查看所有状态为 WAITING 或 SKIPPED 的记录（不限制日期）
+SELECT 
+    id,
+    queue_date,
+    status,
+    patient_name,
+    organization_id,
+    queue_order
+FROM hisdev.triage_queue_item
+WHERE tenant_id = 1
+  AND delete_flag = '0'
+  AND status IN ('WAITING', 'SKIPPED')
+  AND organization_id = 1995302136614969300
+ORDER BY queue_date DESC, queue_order ASC;
+
diff --git a/openhis-server-new/sql/query_smart_candidate_pool.sql b/openhis-server-new/sql/query_smart_candidate_pool.sql
new file mode 100644
index 00000000..b79639c1
--- /dev/null
+++ b/openhis-server-new/sql/query_smart_candidate_pool.sql
@@ -0,0 +1,313 @@
+-- ============================================
+-- 智能候选池查询SQL（当日已挂号患者）
+-- 对应接口：GET /charge-manage/register/current-day-encounter
+-- 用途：查询当日已挂号但未入队的患者，用于智能分诊排队管理
+-- ============================================
+
+-- 完整SQL查询（包含所有关联表）
+SELECT T9.tenant_id AS tenantId,
+       T9.encounter_id AS encounterId,
+       T9.display_order AS displayOrder,
+       T9.organization_id AS organizationId,
+       T9.organization_name AS organizationName,
+       T9.healthcare_name AS healthcareName,
+       T9.practitioner_user_id AS practitionerUserId,
+       T9.practitioner_name AS practitionerName,
+       T9.contract_name AS contractName,
+       T9.patient_id AS patientId,
+       T9.patient_name AS patientName,
+       T9.phone,
+       T9.gender_enum AS genderEnum,
+       T9.id_card AS idCard,
+       T9.status_enum AS statusEnum,
+       T9.register_time AS registerTime,
+       T9.total_price AS totalPrice,
+       T9.account_name AS accountName,
+       T9.enterer_name AS entererName,
+       T9.charge_item_ids AS chargeItemIds,
+       T9.payment_id AS paymentId,
+       T9.picture_url AS pictureUrl,
+       T9.birth_date AS birthDate,
+       COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo
+FROM (
+    SELECT T1.tenant_id       AS tenant_id,
+           T1.id              AS encounter_id,
+           T1.display_order   AS display_order,
+           T1.organization_id AS organization_id,
+           T2.NAME            AS organization_name,
+           T3.NAME            AS healthcare_name,
+           T5.user_id         AS practitioner_user_id,
+           T5.NAME            AS practitioner_name,
+           T7.contract_name   AS contract_name,
+           T8.id              AS patient_id,
+           T8.NAME            AS patient_name,
+           T8.phone           AS phone,
+           T8.gender_enum     AS gender_enum,
+           T8.id_card         AS id_card,
+           T1.status_enum     AS status_enum,
+           T1.create_time     AS register_time,
+           T10.total_price,
+           T11."name"         AS account_name,
+           T12."name"         AS enterer_name,
+           T13.charge_item_ids,
+           T13.id             AS payment_id,
+           ai.picture_url     AS picture_url,
+           T8.birth_date      AS birth_date,
+           T8.bus_no          AS patient_bus_no,
+           T18.identifier_no  AS identifier_no
+    FROM adm_encounter AS T1
+    -- 关联科室表
+    LEFT JOIN adm_organization AS T2 
+        ON T1.organization_id = T2.ID 
+        AND T2.delete_flag = '0'
+    -- 关联医疗服务类型表（号别）
+    LEFT JOIN adm_healthcare_service AS T3 
+        ON T1.service_type_id = T3.ID 
+        AND T3.delete_flag = '0'
+    -- 关联就诊参与者表（医生信息）
+    LEFT JOIN (
+        SELECT *
+        FROM (
+            SELECT *,
+                   ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+            FROM adm_encounter_participant
+            WHERE delete_flag = '0'
+              AND (
+                  -- 如果就诊状态为"进行中"，查找"接诊医生"（admitter）
+                  (type_code = 'admitter' AND EXISTS(SELECT 1
+                                                     FROM adm_encounter AS T1
+                                                     WHERE T1.status_enum = 2  -- IN_PROGRESS
+                                                       AND T1.ID = encounter_id))
+                  OR
+                  -- 如果就诊状态不是"进行中"，查找"挂号医生"（registration_doctor）
+                  (type_code = 'registration_doctor' AND NOT EXISTS(SELECT 1
+                                                                     FROM adm_encounter AS T1
+                                                                     WHERE T1.status_enum = 2  -- IN_PROGRESS
+                                                                       AND T1.ID = encounter_id))
+              )
+        ) t
+        WHERE rn = 1
+    ) AS T4 ON T1.ID = T4.encounter_id
+    -- 关联医生表
+    LEFT JOIN adm_practitioner AS T5 
+        ON T5.ID = T4.practitioner_id 
+        AND T5.delete_flag = '0'
+    -- 关联账户表
+    LEFT JOIN adm_account AS T6
+        ON T1.ID = T6.encounter_id 
+        AND T6.delete_flag = '0' 
+        AND T6.encounter_flag = '1'
+    -- 关联合同表
+    LEFT JOIN fin_contract AS T7 
+        ON T6.contract_no = T7.bus_no 
+        AND T7.delete_flag = '0'
+    -- 关联患者表
+    LEFT JOIN adm_patient AS T8 
+        ON T1.patient_id = T8.ID 
+        AND T8.delete_flag = '0'
+    -- 关联患者标识表（身份证号等）
+    LEFT JOIN (
+        SELECT patient_id,
+               identifier_no
+        FROM (
+            SELECT patient_id,
+                   identifier_no,
+                   ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+            FROM adm_patient_identifier
+            WHERE delete_flag = '0'
+              AND identifier_no IS NOT NULL
+              AND identifier_no != ''
+        ) t
+        WHERE rn = 1
+    ) AS T18 ON T8.id = T18.patient_id
+    -- 关联收费项目表（挂号费）
+    LEFT JOIN adm_charge_item AS T10 
+        ON T1.id = T10.encounter_id 
+        AND T10.delete_flag = '0'
+        AND T10.context_enum = 1  -- REGISTER（挂号）
+    -- 关联账户表（收费账户）
+    LEFT JOIN adm_account AS T11 
+        ON T10.account_id = T11.id 
+        AND T11.delete_flag = '0'
+    -- 关联医生表（收费医生）
+    LEFT JOIN adm_practitioner AS T12 
+        ON T12.ID = T10.enterer_id 
+        AND T12.delete_flag = '0'
+    -- 关联支付对账表（已支付）
+    LEFT JOIN fin_payment_reconciliation T13
+        ON T10.id::TEXT = ANY(string_to_array(T13.charge_item_ids,','))
+            AND T13.delete_flag = '0'
+            AND T13.status_enum = 1  -- SUCCESS（支付成功）
+    -- 关联退号记录（当状态为退号时，通过relation_id关联原支付记录）
+    LEFT JOIN fin_payment_reconciliation T14
+        ON T13.id = T14.relation_id
+            AND T14.delete_flag = '0'
+            AND T14.status_enum = 3  -- REFUND（退款）
+            AND T14.payment_enum = 1
+    -- 关联退号医生
+    LEFT JOIN adm_practitioner AS T15 
+        ON T15.ID = T14.enterer_id 
+        AND T15.delete_flag = '0'
+    -- 关联系统用户表
+    LEFT JOIN sys_user AS T17 
+        ON T17.user_id = T15.user_id 
+        AND T17.delete_flag = '0'
+    -- 关联退号支付详情，获取退款方式（聚合多个支付方式）
+    LEFT JOIN (
+        SELECT reconciliation_id,
+               STRING_AGG(
+                   CASE pay_enum
+                       WHEN 220400 THEN '现金'
+                       WHEN 220100 THEN '微信'
+                       WHEN 220200 THEN '支付宝'
+                       WHEN 220300 THEN '银联'
+                   END,
+                   ','
+                   ORDER BY pay_enum
+               ) AS refund_method
+        FROM fin_payment_rec_detail
+        WHERE delete_flag = '0'
+          AND amount < 0
+          AND pay_enum IN (220400, 220100, 220200, 220300)
+        GROUP BY reconciliation_id
+    ) AS T16 ON T14.id = T16.reconciliation_id
+    -- 关联发票表
+    LEFT JOIN adm_invoice AS ai
+        ON ai.reconciliation_id = T13.id 
+        AND ai.delete_flag = '0'
+    WHERE T1.delete_flag = '0'
+      AND T1.class_enum = 1  -- 门诊（AMB）
+      AND T10.context_enum = 1  -- 挂号（REGISTER）
+      -- 动态条件（由前端传入，通过 ${ew.customSqlSegment} 注入）
+      -- 例如：AND T1.create_time::DATE = CURRENT_DATE  -- 当日挂号
+      -- 例如：AND T1.status_enum != 6  -- 排除退号（statusEnum = -1时）
+      -- 例如：AND (T8.name LIKE '%关键词%' OR T2.name LIKE '%关键词%' ...)  -- 模糊搜索
+) AS T9
+-- 动态查询条件（由 MyBatis-Plus QueryWrapper 生成）
+-- ${ew.customSqlSegment}
+ORDER BY T9.register_time DESC;
+
+-- ============================================
+-- 简化版查询（仅查询核心字段，用于快速测试）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    pt.birth_date AS birthDate,
+    org.id AS organizationId,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime,
+    enc.status_enum AS statusEnum
+FROM adm_encounter enc
+INNER JOIN adm_patient pt 
+    ON enc.patient_id = pt.id 
+    AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org 
+    ON enc.organization_id = org.id 
+    AND org.delete_flag = '0'
+LEFT JOIN adm_healthcare_service hcs 
+    ON enc.service_type_id = hcs.id 
+    AND hcs.delete_flag = '0'
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0'
+      AND type_code IN ('admitter', 'registration_doctor')
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+LEFT JOIN adm_practitioner pr 
+    ON ep.practitioner_id = pr.id 
+    AND pr.delete_flag = '0'
+INNER JOIN adm_charge_item ci 
+    ON enc.id = ci.encounter_id 
+    AND ci.delete_flag = '0'
+    AND ci.context_enum = 1  -- 挂号
+INNER JOIN fin_payment_reconciliation prc
+    ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0'
+    AND prc.status_enum = 1  -- 支付成功
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1  -- 门诊
+  AND enc.create_time::DATE = CURRENT_DATE  -- 当日挂号
+  AND enc.status_enum != 6  -- 排除退号
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 查询条件说明
+-- ============================================
+-- 1. 基础条件：
+--    - enc.delete_flag = '0'  -- 未删除
+--    - enc.class_enum = 1     -- 门诊（AMB）
+--    - ci.context_enum = 1    -- 挂号（REGISTER）
+--    - prc.status_enum = 1    -- 支付成功（SUCCESS）
+--
+-- 2. 日期过滤：
+--    - enc.create_time::DATE = CURRENT_DATE  -- 当日挂号（由前端传入 date 参数）
+--
+-- 3. 状态过滤：
+--    - enc.status_enum != 6  -- 排除退号（当 statusEnum = -1 时）
+--    - enc.status_enum = 2   -- 进行中（IN_PROGRESS，用于判断医生类型）
+--
+-- 4. 模糊搜索（由前端传入 searchKey 参数）：
+--    - patient_name（患者姓名）
+--    - organization_name（科室名称）
+--    - practitioner_name（医生姓名）
+--    - healthcare_name（号别名称）
+--    - identifier_no（身份证号）
+--
+-- 5. 租户过滤（由后端自动添加）：
+--    - tenant_id = ?  -- 当前登录用户的租户ID
+--
+-- 6. 分页（由 MyBatis-Plus Page 对象处理）：
+--    - LIMIT ? OFFSET ?
+
+-- ============================================
+-- 常用查询示例
+-- ============================================
+
+-- 示例1：查询今天所有已挂号患者（排除退号）
+SELECT 
+    enc.id AS encounterId,
+    pt.name AS patientName,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+LEFT JOIN adm_healthcare_service hcs ON enc.service_type_id = hcs.id AND hcs.delete_flag = '0'
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0' AND type_code IN ('admitter', 'registration_doctor')
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6
+ORDER BY enc.create_time DESC;
+
+-- 示例2：查询指定科室的已挂号患者
+-- 在示例1的基础上添加：
+-- AND enc.organization_id = ?  -- 科室ID
+
+-- 示例3：按患者姓名模糊搜索
+-- 在示例1的基础上添加：
+-- AND pt.name LIKE '%关键词%'
+
+-- 示例4：查询已加入队列的患者（用于去重）
+SELECT DISTINCT encounter_id
+FROM hisdev.triage_queue_item
+WHERE delete_flag = '0'
+  AND queue_date = CURRENT_DATE
+  AND status != 'COMPLETED';
+
diff --git a/openhis-server-new/sql/query_smart_candidate_pool_page.sql b/openhis-server-new/sql/query_smart_candidate_pool_page.sql
new file mode 100644
index 00000000..4d5e8890
--- /dev/null
+++ b/openhis-server-new/sql/query_smart_candidate_pool_page.sql
@@ -0,0 +1,268 @@
+-- ============================================
+-- 智能候选池查询SQL（智能分诊排队管理页面专用）
+-- 页面：智能分诊排队管理 - 心内科
+-- 用途：查询"已签到未入队"的患者（当日已挂号，但未加入队列）
+-- ============================================
+
+-- ============================================
+-- 方案一：完整查询（包含所有字段，排除已在队列中的患者）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    pt.birth_date AS birthDate,
+    -- 计算年龄（前端会调用 parseAge 函数）
+    CASE 
+        WHEN pt.birth_date IS NOT NULL THEN
+            EXTRACT(YEAR FROM AGE(pt.birth_date))::TEXT || '岁'
+        ELSE ''
+    END AS age,
+    org.id AS organizationId,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime,
+    enc.status_enum AS statusEnum,
+    -- 其他字段（如果需要）
+    pt.phone,
+    pt.gender_enum AS genderEnum,
+    pt.id_card AS idCard
+FROM adm_encounter enc
+-- 关联患者表
+INNER JOIN adm_patient pt 
+    ON enc.patient_id = pt.id 
+    AND pt.delete_flag = '0'
+-- 关联科室表
+LEFT JOIN adm_organization org 
+    ON enc.organization_id = org.id 
+    AND org.delete_flag = '0'
+-- 关联医疗服务类型表（号别）
+LEFT JOIN adm_healthcare_service hcs 
+    ON enc.service_type_id = hcs.id 
+    AND hcs.delete_flag = '0'
+-- 关联就诊参与者表（医生信息）
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0'
+      AND (
+          -- 如果就诊状态为"进行中"，查找"接诊医生"（admitter）
+          (type_code = 'admitter' AND EXISTS(SELECT 1
+                                             FROM adm_encounter AS e
+                                             WHERE e.status_enum = 2  -- IN_PROGRESS
+                                               AND e.id = encounter_id))
+          OR
+          -- 如果就诊状态不是"进行中"，查找"挂号医生"（registration_doctor）
+          (type_code = 'registration_doctor' AND NOT EXISTS(SELECT 1
+                                                            FROM adm_encounter AS e
+                                                            WHERE e.status_enum = 2  -- IN_PROGRESS
+                                                              AND e.id = encounter_id))
+      )
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+-- 关联医生表
+LEFT JOIN adm_practitioner pr 
+    ON ep.practitioner_id = pr.id 
+    AND pr.delete_flag = '0'
+-- 关联收费项目表（挂号费）
+INNER JOIN adm_charge_item ci 
+    ON enc.id = ci.encounter_id 
+    AND ci.delete_flag = '0'
+    AND ci.context_enum = 1  -- REGISTER（挂号）
+-- 关联支付对账表（已支付）
+INNER JOIN fin_payment_reconciliation prc
+    ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0'
+    AND prc.status_enum = 1  -- SUCCESS（支付成功）
+-- 排除已在队列中的患者（关键：LEFT JOIN + WHERE IS NULL）
+LEFT JOIN hisdev.triage_queue_item tqi
+    ON enc.id = tqi.encounter_id
+    AND tqi.delete_flag = '0'
+    AND tqi.queue_date = CURRENT_DATE
+    AND tqi.status != 'COMPLETED'  -- 排除已完成的状态
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1  -- 门诊（AMB）
+  AND enc.create_time::DATE = CURRENT_DATE  -- 当日挂号（前端会过滤 registerTime）
+  AND enc.status_enum != 6  -- 排除退号（statusEnum = -1 时）
+  AND tqi.id IS NULL  -- 关键：只查询不在队列中的患者
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 方案二：简化查询（仅核心字段，便于快速测试）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    org.id AS organizationId,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+LEFT JOIN adm_healthcare_service hcs ON enc.service_type_id = hcs.id AND hcs.delete_flag = '0'
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0' AND type_code IN ('admitter', 'registration_doctor')
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+-- 排除已在队列中的患者
+LEFT JOIN hisdev.triage_queue_item tqi
+    ON enc.id = tqi.encounter_id
+    AND tqi.delete_flag = '0'
+    AND tqi.queue_date = CURRENT_DATE
+    AND tqi.status != 'COMPLETED'
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6
+  AND tqi.id IS NULL  -- 不在队列中
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 方案三：分步查询（便于调试和理解）
+-- ============================================
+
+-- 步骤1：查询当日已挂号的患者（不排除队列）
+SELECT 
+    enc.id AS encounterId,
+    pt.name AS patientName,
+    org.name AS organizationName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6;
+
+-- 步骤2：查询已在队列中的患者
+SELECT DISTINCT encounter_id
+FROM hisdev.triage_queue_item
+WHERE delete_flag = '0'
+  AND queue_date = CURRENT_DATE
+  AND status != 'COMPLETED';
+
+-- 步骤3：合并查询（使用 NOT EXISTS 或 NOT IN）
+SELECT 
+    enc.id AS encounterId,
+    pt.name AS patientName,
+    org.name AS organizationName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6
+  -- 排除已在队列中的患者
+  AND NOT EXISTS (
+      SELECT 1
+      FROM hisdev.triage_queue_item tqi
+      WHERE tqi.encounter_id = enc.id
+        AND tqi.delete_flag = '0'
+        AND tqi.queue_date = CURRENT_DATE
+        AND tqi.status != 'COMPLETED'
+  )
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 查询条件说明
+-- ============================================
+-- 1. 基础条件：
+--    - enc.delete_flag = '0'  -- 未删除
+--    - enc.class_enum = 1     -- 门诊（AMB）
+--    - ci.context_enum = 1    -- 挂号（REGISTER）
+--    - prc.status_enum = 1    -- 支付成功（SUCCESS）
+--
+-- 2. 日期过滤：
+--    - enc.create_time::DATE = CURRENT_DATE  -- 当日挂号
+--    注意：前端还会基于 registerTime 字段再次过滤今天的数据
+--
+-- 3. 状态过滤：
+--    - enc.status_enum != 6  -- 排除退号（对应前端 statusEnum = -1）
+--
+-- 4. 队列去重：
+--    - LEFT JOIN hisdev.triage_queue_item ... WHERE tqi.id IS NULL
+--    或者
+--    - NOT EXISTS (SELECT 1 FROM hisdev.triage_queue_item ...)
+--    排除已在队列中且状态不是 COMPLETED 的患者
+--
+-- 5. 租户过滤（如果需要）：
+--    - enc.tenant_id = ?  -- 当前登录用户的租户ID
+--
+-- 6. 模糊搜索（如果需要）：
+--    - pt.name LIKE '%关键词%'  -- 患者姓名
+--    - org.name LIKE '%关键词%'  -- 科室名称
+--    - pr.name LIKE '%关键词%'  -- 医生姓名
+--    - hcs.name LIKE '%关键词%'  -- 号别名称
+
+-- ============================================
+-- 调试查询（检查数据是否正确）
+-- ============================================
+
+-- 1. 检查当日已挂号患者总数
+SELECT COUNT(*) AS total_registered
+FROM adm_encounter enc
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6;
+
+-- 2. 检查已在队列中的患者数量
+SELECT COUNT(DISTINCT encounter_id) AS in_queue_count
+FROM hisdev.triage_queue_item
+WHERE delete_flag = '0'
+  AND queue_date = CURRENT_DATE
+  AND status != 'COMPLETED';
+
+-- 3. 检查候选池应该显示的患者数量（已挂号 - 已在队列）
+SELECT 
+    (SELECT COUNT(*) 
+     FROM adm_encounter enc
+     INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+     INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+         AND prc.delete_flag = '0' AND prc.status_enum = 1
+     WHERE enc.delete_flag = '0'
+       AND enc.class_enum = 1
+       AND enc.create_time::DATE = CURRENT_DATE
+       AND enc.status_enum != 6) 
+    - 
+    (SELECT COUNT(DISTINCT encounter_id)
+     FROM hisdev.triage_queue_item
+     WHERE delete_flag = '0'
+       AND queue_date = CURRENT_DATE
+       AND status != 'COMPLETED')
+    AS candidate_pool_count;
+
+-- 4. 查看队列中的患者详情（用于对比）
+SELECT 
+    tqi.encounter_id,
+    tqi.patient_name,
+    tqi.status,
+    tqi.queue_order
+FROM hisdev.triage_queue_item tqi
+WHERE tqi.delete_flag = '0'
+  AND tqi.queue_date = CURRENT_DATE
+  AND tqi.status != 'COMPLETED'
+ORDER BY tqi.queue_order;
+
diff --git a/openhis-server-new/sql/query_smart_candidate_pool_with_exclusion.sql b/openhis-server-new/sql/query_smart_candidate_pool_with_exclusion.sql
new file mode 100644
index 00000000..00058e4a
--- /dev/null
+++ b/openhis-server-new/sql/query_smart_candidate_pool_with_exclusion.sql
@@ -0,0 +1,366 @@
+-- ============================================
+-- 智能候选池查询SQL（完整版 - 包含排除列表）
+-- 页面：智能分诊排队管理 - 心内科
+-- 用途：查询"已签到未入队"的患者（当日已挂号，但未加入队列，且未在排除列表中）
+-- 更新日期：2025-01-15
+-- ============================================
+
+-- ============================================
+-- 方案一：完整查询（包含所有字段，排除已在队列和排除列表中的患者）
+-- ============================================
+SELECT 
+    T9.tenant_id AS tenantId,
+    T9.encounter_id AS encounterId,
+    T9.display_order AS displayOrder,
+    T9.organization_id AS organizationId,
+    T9.organization_name AS organizationName,
+    T9.healthcare_name AS healthcareName,
+    T9.practitioner_user_id AS practitionerUserId,
+    T9.practitioner_name AS practitionerName,
+    T9.contract_name AS contractName,
+    T9.patient_id AS patientId,
+    T9.patient_name AS patientName,
+    T9.phone,
+    T9.gender_enum AS genderEnum,
+    T9.id_card AS idCard,
+    T9.status_enum AS statusEnum,
+    T9.register_time AS registerTime,
+    T9.total_price AS totalPrice,
+    T9.account_name AS accountName,
+    T9.enterer_name AS entererName,
+    T9.charge_item_ids AS chargeItemIds,
+    T9.payment_id AS paymentId,
+    T9.picture_url AS pictureUrl,
+    T9.birth_date AS birthDate,
+    COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo,
+    -- 计算年龄（前端会调用 parseAge 函数）
+    CASE 
+        WHEN T9.birth_date IS NOT NULL THEN
+            EXTRACT(YEAR FROM AGE(T9.birth_date))::TEXT || '岁'
+        ELSE ''
+    END AS age
+FROM (
+    SELECT T1.tenant_id       AS tenant_id,
+           T1.id              AS encounter_id,
+           T1.display_order   AS display_order,
+           T1.organization_id AS organization_id,
+           T2.NAME            AS organization_name,
+           T3.NAME            AS healthcare_name,
+           T5.user_id         AS practitioner_user_id,
+           T5.NAME            AS practitioner_name,
+           T7.contract_name   AS contract_name,
+           T8.id              AS patient_id,
+           T8.NAME            AS patient_name,
+           T8.phone           AS phone,
+           T8.gender_enum     AS gender_enum,
+           T8.id_card         AS id_card,
+           T1.status_enum     AS status_enum,
+           T1.create_time     AS register_time,
+           T10.total_price,
+           T11."name"         AS account_name,
+           T12."name"         AS enterer_name,
+           T13.charge_item_ids,
+           T13.id             AS payment_id,
+           ai.picture_url     AS picture_url,
+           T8.birth_date      AS birth_date,
+           T8.bus_no          AS patient_bus_no,
+           T18.identifier_no  AS identifier_no
+    FROM adm_encounter AS T1
+    LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
+    LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
+    LEFT JOIN (
+        SELECT *
+        FROM (
+            SELECT *,
+                   ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+            FROM adm_encounter_participant
+            WHERE delete_flag = '0'
+              AND (
+                  (type_code = 'admitter' AND EXISTS(SELECT 1
+                                                     FROM adm_encounter AS T1
+                                                     WHERE T1.status_enum = 2  -- IN_PROGRESS
+                                                       AND T1.ID = encounter_id))
+                  OR
+                  (type_code = 'registration_doctor' AND NOT EXISTS(SELECT 1
+                                                                     FROM adm_encounter AS T1
+                                                                     WHERE T1.status_enum = 2  -- IN_PROGRESS
+                                                                       AND T1.ID = encounter_id))
+              )
+        ) t
+        WHERE rn = 1
+    ) AS T4 ON T1.ID = T4.encounter_id
+    LEFT JOIN adm_practitioner AS T5 ON T5.ID = T4.practitioner_id AND T5.delete_flag = '0'
+    LEFT JOIN adm_account AS T6
+              ON T1.ID = T6.encounter_id AND T6.delete_flag = '0' AND T6.encounter_flag = '1'
+    LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no AND T7.delete_flag = '0'
+    LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID AND T8.delete_flag = '0'
+    LEFT JOIN (
+        SELECT patient_id,
+               identifier_no
+        FROM (
+            SELECT patient_id,
+                   identifier_no,
+                   ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+            FROM adm_patient_identifier
+            WHERE delete_flag = '0'
+              AND identifier_no IS NOT NULL
+              AND identifier_no != ''
+        ) t
+        WHERE rn = 1
+    ) AS T18 ON T8.id = T18.patient_id
+    LEFT JOIN adm_charge_item AS T10 ON T1.id = T10.encounter_id AND T10.delete_flag = '0'
+    LEFT JOIN adm_account AS T11 ON T10.account_id = T11.id AND T11.delete_flag = '0'
+    LEFT JOIN adm_practitioner AS T12 ON T12.ID = T10.enterer_id AND T12.delete_flag = '0'
+    LEFT JOIN fin_payment_reconciliation T13
+              ON T10.id::TEXT = ANY(string_to_array(T13.charge_item_ids,','))
+                  AND T13.delete_flag = '0'
+                  AND T13.status_enum = 1  -- SUCCESS（支付成功）
+    LEFT JOIN adm_invoice AS ai
+              ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
+    WHERE T1.delete_flag = '0'
+      AND T1.class_enum = 1  -- 门诊（AMB）
+      AND T1.create_time::DATE = CURRENT_DATE  -- 当日挂号
+      AND T1.status_enum != 6  -- 排除退号
+      AND T10.context_enum = 1  -- REGISTER（挂号）
+) AS T9
+-- 排除已在队列中的患者（关键：LEFT JOIN + WHERE IS NULL）
+LEFT JOIN hisdev.triage_queue_item tqi
+    ON T9.encounter_id = tqi.encounter_id
+    AND tqi.delete_flag = '0'
+    AND tqi.queue_date = CURRENT_DATE
+    AND tqi.status != 'COMPLETED'  -- 排除已完成的状态
+-- 排除已在排除列表中的患者（新增：关键：LEFT JOIN + WHERE IS NULL）
+LEFT JOIN hisdev.triage_candidate_exclusion tce
+    ON T9.encounter_id = tce.encounter_id
+    AND tce.delete_flag = '0'
+    AND tce.exclusion_date = CURRENT_DATE
+    AND tce.tenant_id = T9.tenant_id  -- 按租户过滤
+WHERE tqi.id IS NULL  -- 关键：只查询不在队列中的患者
+  AND tce.id IS NULL  -- 关键：只查询不在排除列表中的患者
+ORDER BY T9.register_time DESC;
+
+-- ============================================
+-- 方案二：简化查询（仅核心字段，便于快速测试）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    org.id AS organizationId,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+LEFT JOIN adm_healthcare_service hcs ON enc.service_type_id = hcs.id AND hcs.delete_flag = '0'
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0' AND type_code IN ('admitter', 'registration_doctor')
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+-- 排除已在队列中的患者
+LEFT JOIN hisdev.triage_queue_item tqi
+    ON enc.id = tqi.encounter_id
+    AND tqi.delete_flag = '0'
+    AND tqi.queue_date = CURRENT_DATE
+    AND tqi.status != 'COMPLETED'
+-- 排除已在排除列表中的患者（新增）
+LEFT JOIN hisdev.triage_candidate_exclusion tce
+    ON enc.id = tce.encounter_id
+    AND tce.delete_flag = '0'
+    AND tce.exclusion_date = CURRENT_DATE
+    AND tce.tenant_id = enc.tenant_id
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6
+  AND tqi.id IS NULL  -- 不在队列中
+  AND tce.id IS NULL  -- 不在排除列表中
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 方案三：使用 NOT EXISTS 子查询（性能可能更好）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    org.id AS organizationId,
+    org.name AS organizationName,
+    hcs.name AS healthcareName,
+    pr.name AS practitionerName,
+    enc.create_time AS registerTime
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_organization org ON enc.organization_id = org.id AND org.delete_flag = '0'
+LEFT JOIN adm_healthcare_service hcs ON enc.service_type_id = hcs.id AND hcs.delete_flag = '0'
+LEFT JOIN (
+    SELECT encounter_id, practitioner_id,
+           ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+    FROM adm_encounter_participant
+    WHERE delete_flag = '0' AND type_code IN ('admitter', 'registration_doctor')
+) ep ON enc.id = ep.encounter_id AND ep.rn = 1
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6
+  -- 排除已在队列中的患者
+  AND NOT EXISTS (
+      SELECT 1
+      FROM hisdev.triage_queue_item tqi
+      WHERE tqi.encounter_id = enc.id
+        AND tqi.delete_flag = '0'
+        AND tqi.queue_date = CURRENT_DATE
+        AND tqi.status != 'COMPLETED'
+  )
+  -- 排除已在排除列表中的患者（新增）
+  AND NOT EXISTS (
+      SELECT 1
+      FROM hisdev.triage_candidate_exclusion tce
+      WHERE tce.encounter_id = enc.id
+        AND tce.delete_flag = '0'
+        AND tce.exclusion_date = CURRENT_DATE
+        AND tce.tenant_id = enc.tenant_id
+  )
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 查询条件说明
+-- ============================================
+-- 1. 基础条件：
+--    - enc.delete_flag = '0'  -- 未删除
+--    - enc.class_enum = 1     -- 门诊（AMB）
+--    - ci.context_enum = 1    -- 挂号（REGISTER）
+--    - prc.status_enum = 1    -- 支付成功（SUCCESS）
+--
+-- 2. 日期过滤：
+--    - enc.create_time::DATE = CURRENT_DATE  -- 当日挂号
+--    注意：前端还会基于 registerTime 字段再次过滤今天的数据
+--
+-- 3. 状态过滤：
+--    - enc.status_enum != 6  -- 排除退号（对应前端 statusEnum = -1）
+--
+-- 4. 队列去重：
+--    - LEFT JOIN hisdev.triage_queue_item ... WHERE tqi.id IS NULL
+--    或者
+--    - NOT EXISTS (SELECT 1 FROM hisdev.triage_queue_item ...)
+--    排除已在队列中且状态不是 COMPLETED 的患者
+--
+-- 5. 排除列表去重（新增）：
+--    - LEFT JOIN hisdev.triage_candidate_exclusion ... WHERE tce.id IS NULL
+--    或者
+--    - NOT EXISTS (SELECT 1 FROM hisdev.triage_candidate_exclusion ...)
+--    排除已在排除列表中的患者（已加入队列后被记录）
+--
+-- 6. 租户过滤（如果需要）：
+--    - enc.tenant_id = ?  -- 当前登录用户的租户ID
+--
+-- 7. 模糊搜索（如果需要）：
+--    - pt.name LIKE '%关键词%'  -- 患者姓名
+--    - org.name LIKE '%关键词%'  -- 科室名称
+--    - pr.name LIKE '%关键词%'  -- 医生姓名
+--    - hcs.name LIKE '%关键词%'  -- 号别名称
+
+-- ============================================
+-- 调试查询（检查数据是否正确）
+-- ============================================
+
+-- 1. 检查当日已挂号患者总数
+SELECT COUNT(*) AS total_registered
+FROM adm_encounter enc
+INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+    AND prc.delete_flag = '0' AND prc.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1
+  AND enc.create_time::DATE = CURRENT_DATE
+  AND enc.status_enum != 6;
+
+-- 2. 检查已在队列中的患者数量
+SELECT COUNT(DISTINCT encounter_id) AS in_queue_count
+FROM hisdev.triage_queue_item
+WHERE delete_flag = '0'
+  AND queue_date = CURRENT_DATE
+  AND status != 'COMPLETED';
+
+-- 3. 检查已在排除列表中的患者数量（新增）
+SELECT COUNT(DISTINCT encounter_id) AS in_exclusion_count
+FROM hisdev.triage_candidate_exclusion
+WHERE delete_flag = '0'
+  AND exclusion_date = CURRENT_DATE;
+
+-- 4. 检查候选池应该显示的患者数量（已挂号 - 已在队列 - 已在排除列表）
+SELECT 
+    (SELECT COUNT(*) 
+     FROM adm_encounter enc
+     INNER JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+     INNER JOIN fin_payment_reconciliation prc ON ci.id::TEXT = ANY(string_to_array(prc.charge_item_ids,','))
+         AND prc.delete_flag = '0' AND prc.status_enum = 1
+     WHERE enc.delete_flag = '0'
+       AND enc.class_enum = 1
+       AND enc.create_time::DATE = CURRENT_DATE
+       AND enc.status_enum != 6) 
+    - 
+    (SELECT COUNT(DISTINCT encounter_id)
+     FROM hisdev.triage_queue_item
+     WHERE delete_flag = '0'
+       AND queue_date = CURRENT_DATE
+       AND status != 'COMPLETED')
+    -
+    (SELECT COUNT(DISTINCT encounter_id)
+     FROM hisdev.triage_candidate_exclusion
+     WHERE delete_flag = '0'
+       AND exclusion_date = CURRENT_DATE)
+    AS candidate_pool_count;
+
+-- 5. 查看队列中的患者详情（用于对比）
+SELECT 
+    tqi.encounter_id,
+    tqi.patient_name,
+    tqi.status,
+    tqi.queue_order
+FROM hisdev.triage_queue_item tqi
+WHERE tqi.delete_flag = '0'
+  AND tqi.queue_date = CURRENT_DATE
+  AND tqi.status != 'COMPLETED'
+ORDER BY tqi.queue_order;
+
+-- 6. 查看排除列表中的患者详情（新增）
+SELECT 
+    tce.encounter_id,
+    tce.patient_name,
+    tce.reason,
+    tce.create_time
+FROM hisdev.triage_candidate_exclusion tce
+WHERE tce.delete_flag = '0'
+  AND tce.exclusion_date = CURRENT_DATE
+ORDER BY tce.create_time DESC;
+
+-- 7. 查看重叠的患者（既在队列中，又在排除列表中）
+SELECT 
+    tqi.encounter_id,
+    tqi.patient_name AS queue_patient_name,
+    tce.patient_name AS exclusion_patient_name,
+    tqi.status,
+    tce.reason
+FROM hisdev.triage_queue_item tqi
+INNER JOIN hisdev.triage_candidate_exclusion tce
+    ON tqi.encounter_id = tce.encounter_id
+    AND tqi.queue_date = tce.exclusion_date
+    AND tqi.tenant_id = tce.tenant_id
+WHERE tqi.delete_flag = '0'
+  AND tce.delete_flag = '0'
+  AND tqi.queue_date = CURRENT_DATE
+ORDER BY tqi.encounter_id;
+
diff --git a/openhis-ui-vue3/src/views/triageandqueuemanage/api.js b/openhis-ui-vue3/src/views/triageandqueuemanage/api.js
index 2b20d4fe..b7e7d176 100644
--- a/openhis-ui-vue3/src/views/triageandqueuemanage/api.js
+++ b/openhis-ui-vue3/src/views/triageandqueuemanage/api.js
@@ -27,42 +27,49 @@ export function updateCallNumberVoiceConfig(data) {
 }
 
 // 分诊排队管理相关API
-// 获取智能候选池（已签到未入队）
+// 说明：直接使用门诊挂号的"当日已挂号"接口
+// 获取智能候选池（使用门诊挂号当日已挂号接口）
 export function getCandidatePool(params) {
   return request({
-    url: '/triage/queue/candidatePool',
+    url: '/charge-manage/register/current-day-encounter',
     method: 'get',
-    params: params,
+    params: {
+      pageNo: params?.pageNo || 1,
+      pageSize: params?.pageSize || 10000,
+      searchKey: params?.searchKey || '',
+      statusEnum: params?.statusEnum || -1 // -1表示排除退号记录（正常挂号）
+    },
     skipErrorMsg: true // 跳过错误提示，由组件处理
-  }).catch(() => {
-    // 返回一个 rejected promise，让组件可以捕获
-    return Promise.reject(new Error('API未实现'))
   })
 }
 
-// 获取智能队列（当前队列）
+// 获取智能队列（使用门诊挂号当日已挂号接口）
 export function getQueueList(params) {
   return request({
-    url: '/triage/queue/list',
+    url: '/charge-manage/register/current-day-encounter',
     method: 'get',
-    params: params,
+    params: {
+      pageNo: params?.pageNo || 1,
+      pageSize: params?.pageSize || 10000,
+      searchKey: params?.searchKey || '',
+      statusEnum: params?.statusEnum || -1 // -1表示排除退号记录（正常挂号）
+    },
     skipErrorMsg: true // 跳过错误提示，由组件处理
-  }).catch(() => {
-    // 返回一个 rejected promise，让组件可以捕获
-    return Promise.reject(new Error('API未实现'))
   })
 }
 
-// 获取统计信息
+// 获取统计信息（使用门诊挂号当日已挂号接口统计）
 export function getQueueStatistics(params) {
   return request({
-    url: '/triage/queue/statistics',
+    url: '/charge-manage/register/current-day-encounter',
     method: 'get',
-    params: params,
+    params: {
+      pageNo: 1,
+      pageSize: 10000,
+      searchKey: params?.searchKey || '',
+      statusEnum: params?.statusEnum || -1
+    },
     skipErrorMsg: true // 跳过错误提示，由组件处理
-  }).catch(() => {
-    // 返回一个 rejected promise，让组件可以捕获
-    return Promise.reject(new Error('API未实现'))
   })
 }
 
@@ -73,7 +80,26 @@ export function addToQueue(data) {
     method: 'post',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
+}
+
+// 获取队列列表（从数据库读取）
+export function getTriageQueueList(params) {
+  return request({
+    url: '/triage/queue/list',
+    method: 'get',
+    params: params,
+    skipErrorMsg: true
+  })
+}
+
+// 移出队列
+export function removeFromQueue(id) {
+  return request({
+    url: `/triage/queue/remove/${id}`,
+    method: 'delete',
+    skipErrorMsg: true
+  })
 }
 
 // 调整队列顺序
@@ -83,7 +109,7 @@ export function adjustQueueOrder(data) {
     method: 'put',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
 }
 
 // 叫号控制
@@ -93,7 +119,7 @@ export function callPatient(data) {
     method: 'post',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
 }
 
 // 跳过患者
@@ -103,7 +129,7 @@ export function skipPatient(data) {
     method: 'post',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
 }
 
 // 完成叫号
@@ -113,7 +139,7 @@ export function completeCall(data) {
     method: 'post',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
 }
 
 // 过号重排
@@ -123,5 +149,24 @@ export function requeuePatient(data) {
     method: 'post',
     data: data,
     skipErrorMsg: true
-  }).catch(() => Promise.reject(new Error('API未实现')))
+  })
+}
+
+// 下一患者
+export function nextPatient(data) {
+  return request({
+    url: '/triage/queue/next',
+    method: 'post',
+    data: data,
+    skipErrorMsg: true
+  })
+}
+
+// 查询就诊科室列表（从门诊挂号模块复用）
+export function getLocationTree(query) {
+  return request({
+    url: '/charge-manage/register/org-list',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
index ebb9d1aa..e2c1a367 100644
--- a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
+++ b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
@@ -1,378 +1,2230 @@
 <template>
-  <div class="cardiology-queue">
-    <div class="app-container">
-      <el-card>
-        <template #header>
-          <div class="card-header">
-            <span class="title">心内科分诊排队管理</span>
-            <div class="header-actions">
-              <el-button type="primary" @click="refreshData" :loading="loading">
-                <el-icon><Refresh /></el-icon>
-                刷新
-              </el-button>
-            </div>
-          </div>
-        </template>
+  <div class="smart-triage-queue">
+    <!-- 顶部标题栏 -->
+    <div class="header-section">
+      <div class="header-left">
+            <span class="title">智能分诊排队管理 - 心内科</span>
+      </div>
+      <div class="header-right">
+        <el-button type="primary" @click="handleRefresh">
+          <el-icon><Refresh /></el-icon>
+          刷新
+        </el-button>
+        <el-button @click="handleExit">退出</el-button>
+        <el-button @click="handleConfig">后台配置</el-button>
+      </div>
+    </div>
 
-        <!-- 当前呼叫区 -->
-        <div class="current-call-section">
-          <div class="call-box">
-            <div class="call-text">
-              请 <span class="highlight">{{ currentCall?.number || '-' }}</span> 号 
-              <span class="highlight">{{ currentCall?.name || '-' }}</span> 
-              到 <span class="highlight">{{ currentCall?.room || '-' }}</span> 诊室就诊
-            </div>
-          </div>
+    <!-- 主要内容区域 -->
+    <div class="main-content">
+      <!-- 左侧：智能候选池 -->
+      <div class="left-panel">
+        <div class="panel-header">
+          <span class="panel-title">① 智能候选池 (已签到未入队)</span>
         </div>
-
-        <!-- 候诊队列 -->
-        <div class="queue-section">
-          <h3 class="section-title">候诊队列</h3>
+        <div class="table-container">
           <el-table
-            :data="queueList"
-            v-loading="loading"
+            :data="filteredCandidatePoolList"
             stripe
             border
+            height="100%"
             style="width: 100%"
-            :default-sort="{ prop: 'displayOrder', order: 'ascending' }"
+            @selection-change="handleCandidateSelectionChange"
           >
-            <el-table-column type="index" label="序号" width="60" align="center" />
-            <el-table-column prop="patientName" label="患者姓名" width="120" align="center">
-              <template #default="scope">
-                {{ formatPatientName(scope.row.patientName) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="practitionerName" label="医生" width="120" align="center" />
-            <el-table-column prop="room" label="诊室" width="100" align="center" />
-            <el-table-column prop="displayOrder" label="流水号" width="120" align="center">
-              <template #default="scope">
-                {{ formatSerialNo(scope.row) }}
-              </template>
-            </el-table-column>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column prop="sequenceNo" label="序号" width="80" align="center" />
+            <el-table-column prop="patientName" label="患者" width="100" align="center" />
+            <el-table-column prop="age" label="年龄" width="80" align="center" />
+            <el-table-column prop="appointmentType" label="号别" width="100" align="center" />
+            <el-table-column prop="room" label="诊室" width="120" align="center" />
+            <el-table-column prop="doctor" label="医生" width="120" align="center" />
+            <el-table-column prop="matchingRule" label="命中规则" min-width="150" align="center" />
+          </el-table>
+        </div>
+        <div class="candidate-actions">
+          <el-button 
+            type="primary" 
+            @click="handleAddToQueue"
+            :disabled="selectedCandidates.length === 0"
+          >
+            加入队列 >>
+          </el-button>
+          <el-button 
+            type="primary" 
+            @click="handleAddAllToQueue"
+            :disabled="filteredCandidatePoolList.length === 0"
+          >
+            一键加入队列
+          </el-button>
+        </div>
+      </div>
+
+      <!-- 右侧：智能队列 -->
+      <div class="right-panel">
+        <div class="panel-header">
+          <span class="panel-title">② 智能队列 (全科)</span>
+        </div>
+        <div class="table-container">
+          <el-table
+            :data="filteredQueueList"
+            stripe
+            border
+            height="100%"
+            style="width: 100%"
+            :row-class-name="getRowClassName"
+            highlight-current-row
+            @row-click="handleQueueRowClick"
+          >
+            <el-table-column prop="queueOrder" label="队序" width="80" align="center" />
+            <el-table-column prop="patientName" label="患者" width="100" align="center" />
+            <el-table-column prop="appointmentType" label="号别" width="100" align="center" />
+            <el-table-column prop="room" label="诊室" width="120" align="center" />
+            <el-table-column prop="doctor" label="医生" width="120" align="center" />
+            <el-table-column prop="waitingTime" label="等待" width="100" align="center" />
             <el-table-column prop="status" label="状态" width="100" align="center">
               <template #default="scope">
-                <el-tag :type="getStatusType(scope.row.status)">
-                  {{ getStatusText(scope.row.status) }}
+                <el-tag :type="getStatusTagType(scope.row.status)">
+                  {{ scope.row.status }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column prop="registerTime" label="挂号时间" width="180" align="center">
-              <template #default="scope">
-                {{ formatTime(scope.row.registerTime) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="150" align="center" fixed="right">
-              <template #default="scope">
-                <el-button
-                  type="primary"
-                  size="small"
-                  @click="handleCall(scope.row)"
-                  :disabled="scope.row.status === 'CALLED'"
-                >
-                  叫号
-                </el-button>
-              </template>
-            </el-table-column>
           </el-table>
-
-          <!-- 分页 -->
-          <div class="pagination-wrapper">
-            <el-pagination
-              v-model:current-page="queryParams.pageNo"
-              v-model:page-size="queryParams.pageSize"
-              :page-sizes="[10, 20, 50, 100]"
-              :total="total"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange"
-              @current-change="handlePageChange"
-            />
+        </div>
+        <div class="display-options">
+          <div class="queue-actions-left">
+            <el-button 
+              type="danger" 
+              @click="handleRemoveFromQueue"
+              :disabled="!selectedQueueRow"
+              size="small"
+            >
+              << 移出队列
+            </el-button>
+            <el-button 
+              type="info" 
+              @click="handleMoveUp"
+              :disabled="!selectedQueueRow || !canMoveUp"
+              size="small"
+            >
+              ↑
+            </el-button>
+            <el-button 
+              type="info" 
+              @click="handleMoveDown"
+              :disabled="!selectedQueueRow || !canMoveDown"
+              size="small"
+            >
+              ↓
+            </el-button>
+          </div>
+          <div class="queue-actions-right">
+            <el-button 
+              :type="showOnlyWaiting ? 'primary' : ''" 
+              @click="showOnlyWaiting = true"
+              size="small"
+            >
+              只显示等待
+            </el-button>
+            <el-button 
+              :type="!showOnlyWaiting ? 'primary' : ''" 
+              @click="showOnlyWaiting = false"
+              size="small"
+            >
+              显示全部状态
+            </el-button>
           </div>
         </div>
-      </el-card>
+      </div>
     </div>
+
+    <!-- 底部控制面板 -->
+    <div class="footer-section">
+      <!-- 就诊科室快速过滤栏 -->
+      <div class="filter-section">
+        <div class="filter-label">③ 就诊科室快速过滤栏</div>
+        <div class="filter-select-wrapper">
+          <el-select
+            v-model="selectedDept"
+            placeholder="请选择就诊科室"
+            clearable
+            filterable
+            style="width: 100%"
+            size="default"
+          >
+            <el-option
+              label="全部"
+              value="all"
+            />
+            <el-option
+              v-for="dept in departmentList"
+              :key="dept.id"
+              :label="dept.name"
+              :value="dept.id"
+            />
+          </el-select>
+        </div>
+      </div>
+
+      <!-- 叫号控制板 -->
+      <div class="call-control-section">
+        <div class="call-control-label">④ 叫号控制板</div>
+        <div class="call-control-content">
+          <div class="current-call-display">
+            当前呼叫: {{ currentCall.number }} {{ currentCall.name }} 诊室: {{ currentCall.room }}
+          </div>
+          <div class="control-buttons">
+            <el-button type="primary" @click="handleSelectCall">选呼</el-button>
+            <el-button type="success" @click="handleNextPatient">下一患者</el-button>
+            <el-button type="warning" @click="handleSkip">跳过</el-button>
+            <el-button type="primary" @click="handleComplete">完成</el-button>
+            <el-button type="info" @click="handleRequeue">过号重排</el-button>
+          </div>
+        </div>
+      </div>
+
+      <!-- LED显示 -->
+      <div class="led-section">
+        <div class="led-label">⑤ LED:</div>
+        <div class="led-display">
+          [{{ currentCall.number }}]{{ currentCall.name }}请到{{ currentCall.room }}({{ callType }})
+        </div>
+      </div>
+
+      <!-- 语音提示 -->
+      <div class="voice-section">
+        <span class="voice-label">语音:</span>
+        <span class="voice-text">请{{ currentCall.number }}号{{ currentCall.name }}到{{ currentCall.room }}({{ callType }})</span>
+      </div>
+    </div>
+
+  <!-- 后台配置弹窗 -->
+  <el-dialog
+    v-model="configDialogVisible"
+    width="90%"
+    top="5vh"
+  >
+    <template #header>
+      <div class="config-dialog-header">
+        <div class="config-dialog-title">智能分诊规则引擎配置 - 心内科</div>
+        <div class="config-topbar-actions">
+          <el-button type="primary" @click="handleAddRule">新增规则</el-button>
+          <el-button type="primary" @click="handleSaveAllRules">保存全部</el-button>
+          <el-button @click="handleTestRule">测试规则</el-button>
+        </div>
+      </div>
+    </template>
+
+    <div class="config-container">
+      <div class="config-left">
+        <el-scrollbar height="560px">
+          <div
+            v-for="(item, idx) in rules"
+            :key="idx"
+            class="rule-card"
+            :class="{ active: idx === editingIndex }"
+            @click="handleSelectRule(idx)"
+          >
+            <div class="rule-title">规则{{ idx + 1 }}</div>
+            <div class="rule-sub">prio={{ item.priority }}</div>
+            <div class="rule-sub">{{ item.name }}</div>
+            <div class="rule-actions">
+              <el-button size="small" @click.stop="handleSelectRule(idx)">编辑</el-button>
+              <el-button size="small" @click.stop="handleDeleteRule(idx)">删除</el-button>
+              <el-button size="small" @click.stop="handleRuleMoveUp(idx)" :disabled="idx === 0">↑</el-button>
+              <el-button size="small" @click.stop="handleRuleMoveDown(idx)" :disabled="idx === rules.length - 1">↓</el-button>
+            </div>
+          </div>
+        </el-scrollbar>
+      </div>
+
+      <div class="config-right">
+        <el-form label-width="110px" class="config-form">
+          <el-form-item label="规则名称:" required>
+            <el-input v-model="ruleForm.name" placeholder="请输入规则名称" />
+          </el-form-item>
+
+          <el-form-item label="科室:">
+            <el-select v-model="ruleForm.dept" class="config-fullwidth" disabled>
+              <el-option label="心内科" value="心内科" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="规则描述:">
+            <el-input v-model="ruleForm.desc" placeholder="请输入规则描述" />
+          </el-form-item>
+
+          <el-form-item label="优先级:" required>
+            <el-input v-model="ruleForm.priority" />
+          </el-form-item>
+
+          <el-form-item label="周几生效:">
+            <el-checkbox-group v-model="ruleForm.weeks">
+              <el-checkbox v-for="w in weekOptions" :key="w.value" :label="w.value">
+                {{ w.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item label="条件表达式(JSON):">
+            <el-input
+              v-model="ruleForm.expr"
+              type="textarea"
+              :rows="8"
+              placeholder='{"age":">=60","regType":"专家"}'
+            />
+          </el-form-item>
+
+          <div class="config-inline-actions">
+            <el-button @click="handleQuickGenerate">快速生成器</el-button>
+            <el-button @click="handleValidateRule">语法检查</el-button>
+          </div>
+        </el-form>
+      </div>
+    </div>
+
+    <template #footer>
+      <div class="config-footer">
+        <el-button type="primary" @click="handleSaveCurrentRule">保存</el-button>
+        <el-button @click="configDialogVisible = false">取消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 快速生成器对话框 -->
+  <el-dialog
+    v-model="quickGeneratorDialogVisible"
+    title="快速生成器"
+    width="600px"
+    :close-on-click-modal="false"
+  >
+    <el-form :model="quickGeneratorForm" label-width="120px">
+      <el-form-item label="年龄条件:">
+        <div style="display: flex; align-items: center; gap: 10px;">
+          <el-select v-model="quickGeneratorForm.ageOperator" style="width: 100px;">
+            <el-option label=">=" value=">=" />
+            <el-option label="<=" value="<=" />
+            <el-option label="=" value="=" />
+            <el-option label=">" value=">" />
+            <el-option label="<" value="<" />
+          </el-select>
+          <el-input-number
+            v-model="quickGeneratorForm.ageValue"
+            :min="0"
+            :max="150"
+            :precision="0"
+            placeholder="年龄"
+            style="width: 150px;"
+          />
+          <el-button
+            type="text"
+            @click="quickGeneratorForm.ageOperator = null; quickGeneratorForm.ageValue = null"
+          >
+            清除
+          </el-button>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="号别/类型:">
+        <el-select
+          v-model="quickGeneratorForm.regType"
+          placeholder="请选择号别"
+          clearable
+          style="width: 100%"
+        >
+          <el-option label="专家" value="专家" />
+          <el-option label="普通" value="普通" />
+          <el-option label="特需" value="特需" />
+          <el-option label="急诊" value="急诊" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="科室:">
+        <el-select
+          v-model="quickGeneratorForm.dept"
+          placeholder="请选择科室"
+          clearable
+          style="width: 100%"
+        >
+          <el-option label="心内科" value="心内科" />
+          <el-option label="心外科" value="心外科" />
+          <el-option label="神经内科" value="神经内科" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="医生:">
+        <el-input
+          v-model="quickGeneratorForm.doctor"
+          placeholder="请输入医生姓名（支持模糊匹配）"
+          clearable
+        />
+      </el-form-item>
+
+      <el-form-item label="自定义条件:">
+        <el-input
+          v-model="quickGeneratorForm.customKey"
+          placeholder="字段名（如：gender）"
+          style="width: 150px; margin-right: 10px;"
+        />
+        <el-input
+          v-model="quickGeneratorForm.customValue"
+          placeholder="字段值（如：男）"
+          style="width: 200px;"
+        />
+        <el-button
+          type="text"
+          @click="quickGeneratorForm.customKey = ''; quickGeneratorForm.customValue = ''"
+        >
+          清除
+        </el-button>
+      </el-form-item>
+
+      <el-form-item label="预览JSON:">
+        <el-input
+          :value="previewJson"
+          type="textarea"
+          :rows="4"
+          readonly
+          style="font-family: monospace;"
+        />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <div style="text-align: right;">
+        <el-button @click="quickGeneratorDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleApplyQuickGenerate">应用</el-button>
+      </div>
+    </template>
+  </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
 import { Refresh } from '@element-plus/icons-vue'
-import { parseTime } from '@/utils/his'
-import { getOutpatientRegistrationCurrent } from '@/views/charge/outpatientregistration/components/outpatientregistration'
+import { ElMessage } from 'element-plus'
+import {
+  getCandidatePool,
+  getLocationTree,
+  getTriageQueueList,
+  addToQueue,
+  removeFromQueue,
+  adjustQueueOrder,
+  callPatient,
+  skipPatient,
+  completeCall,
+  requeuePatient,
+  nextPatient
+} from '../api'
 
-// 响应式数据
-const loading = ref(false)
-const queueList = ref([])
-const total = ref(0)
+// 当前日期 & 统计信息（总已签到/在队列中）
+const currentDate = ref('2025/12/22 上午')
+const totalSignedIn = ref(0)
+const totalInQueue = ref(0)
+
+// 当前呼叫信息
 const currentCall = ref({
-  number: '-',
-  name: '-',
-  room: '-'
+  number: '1',
+  name: '郑华',
+  room: '4号诊室'
 })
 
-// 查询参数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 20,
-  searchKey: '',
-  organizationId: null // 心内科科室ID，可以从路由参数或配置中获取
+// 当前选中的队列行（用于选呼）
+const selectedQueueRow = ref(null)
+
+// 选中的候选池患者（多选）
+const selectedCandidates = ref([])
+
+// 显示选项
+const showOnlyWaiting = ref(false)
+
+// 科室过滤（改为使用就诊科室）
+const selectedDept = ref('all')
+// 就诊科室列表
+const departmentList = ref([])
+
+// 后台配置对话框
+const configDialogVisible = ref(false)
+const rules = ref([
+  {
+    name: '老年专家优先',
+    dept: '心内科',
+    desc: '老年专家优先',
+    priority: 10,
+    weeks: ['1', '2', '3', '4', '5'],
+    expr: '{"age":">=60","regType":"专家"}'
+  },
+  {
+    name: '少年优先',
+    dept: '心内科',
+    desc: '少年优先',
+    priority: 20,
+    weeks: ['1', '2', '3', '4', '5'],
+    expr: '{"age":"<18"}'
+  },
+  {
+    name: '默认',
+    dept: '心内科',
+    desc: '默认',
+    priority: 50,
+    weeks: ['1', '2', '3', '4', '5', '6', '0'],
+    expr: '{}'
+  }
+])
+const editingIndex = ref(0)
+const ruleForm = reactive({
+  name: '',
+  dept: '心内科',
+  desc: '',
+  priority: 10,
+  weeks: ['1', '2', '3', '4', '5'],
+  expr: ''
 })
 
-// 计算流水号：直接使用挂号记录表的主键ID（encounterId）
-function formatSerialNo(row) {
-  if (!row) return '-'
-  
-  // 直接使用主键ID作为流水号
-  if (row.encounterId != null && row.encounterId !== undefined) {
-    return String(row.encounterId)
-  } else if (row.id != null && row.id !== undefined) {
-    // 兼容其他可能的ID字段名
-    return String(row.id)
-  } else {
-    return '-'
+// 快速生成器对话框
+const quickGeneratorDialogVisible = ref(false)
+const quickGeneratorForm = reactive({
+  ageOperator: null, // >=, <=, =, >, <
+  ageValue: null,
+  regType: null, // 号别
+  dept: null, // 科室
+  doctor: null, // 医生
+  customKey: '', // 自定义字段名
+  customValue: '' // 自定义字段值
+})
+const weekOptions = [
+  { label: '一', value: '1' },
+  { label: '二', value: '2' },
+  { label: '三', value: '3' },
+  { label: '四', value: '4' },
+  { label: '五', value: '5' },
+  { label: '六', value: '6' },
+  { label: '日', value: '0' }
+]
+
+// 叫号类型
+const callType = ref('选呼')
+
+// ============ 数据初始化/刷新（前端模拟） ============
+const getInitialCandidatePoolList = () => ([
+  {
+    sequenceNo: 12,
+    patientName: '陈明',
+    age: 65,
+    appointmentType: '专家',
+    room: '3号诊室',
+    doctor: '张医生',
+    matchingRule: '年龄≥60'
+  },
+  {
+    sequenceNo: 13,
+    patientName: '刘芳',
+    age: 58,
+    appointmentType: '普通',
+    room: '4号诊室',
+    doctor: '李医生',
+    matchingRule: '-'
+  },
+  {
+    sequenceNo: 14,
+    patientName: '周强',
+    age: 45,
+    appointmentType: '普通',
+    room: '5号诊室',
+    doctor: '王医生',
+    matchingRule: '-'
+  },
+  {
+    sequenceNo: 15,
+    patientName: '吴伟',
+    age: 72,
+    appointmentType: '专家',
+    room: '3号诊室',
+    doctor: '张医生',
+    matchingRule: '年龄≥70'
+  }
+])
+
+const getInitialQueueList = () => ([
+  {
+    queueOrder: 1,
+    patientName: '林静',
+    appointmentType: '专家',
+    room: '3号诊室',
+    doctor: '张医生',
+    waitingTime: '05:00',
+    status: '等待'
+  },
+  {
+    queueOrder: 2,
+    patientName: '郑华',
+    appointmentType: '普通',
+    room: '4号诊室',
+    doctor: '李医生',
+    waitingTime: '00:00',
+    status: '叫号中'
+  },
+  {
+    queueOrder: 3,
+    patientName: '王丽',
+    appointmentType: '普通',
+    room: '5号诊室',
+    doctor: '王医生',
+    waitingTime: '08:00',
+    status: '等待'
+  },
+  {
+    queueOrder: 4,
+    patientName: '张伟',
+    appointmentType: '专家',
+    room: '3号诊室',
+    doctor: '张医生',
+    waitingTime: '12:00',
+    status: '等待'
+  }
+])
+
+const syncCurrentCallFromQueue = () => {
+  const calling = originalQueueList.value.find((i) => i.status === '叫号中')
+  if (!calling) {
+    currentCall.value = { number: '-', name: '-', room: '-' }
+    selectedQueueRow.value = null
+    return
+  }
+  currentCall.value = {
+    number: String(calling.queueOrder),
+    name: calling.patientName,
+    room: calling.room
+  }
+  selectedQueueRow.value = calling
+}
+
+// ============ 与后端接口联动 ============
+// 注意：后端未实现或出错时会自动退回本地假数据
+// 将分钟数转换为 MM:SS 格式
+const formatMinutesToMmSs = (minutes) => {
+  if (minutes == null || minutes < 0) return '00:00'
+  const hours = Math.floor(minutes / 60)
+  const mins = minutes % 60
+  const hoursStr = String(hours).padStart(2, '0')
+  const minsStr = String(mins).padStart(2, '0')
+  return `${hoursStr}:${minsStr}`
+}
+
+// 将年龄字符串转换为数字（处理 "20岁"、"1小时" 等格式）
+const parseAge = (ageStr) => {
+  if (!ageStr) return 0
+  const match = ageStr.match(/(\d+)/)
+  return match ? parseInt(match[1], 10) : 0
+}
+
+// 后端队列状态 -> 前端展示状态
+const mapBackendStatusToFrontend = (status) => {
+  if (!status) {
+    console.warn('【心内科】状态映射：收到空状态值')
+    return '等待'
+  }
+  // 转换为大写并去除空格，确保匹配
+  const normalizedStatus = String(status).trim().toUpperCase()
+  if (normalizedStatus === 'CALLING') return '叫号中'
+  if (normalizedStatus === 'WAITING') return '等待'
+  if (normalizedStatus === 'SKIPPED') return '跳过'
+  if (normalizedStatus === 'COMPLETED') return '已完成'
+  console.warn('【心内科】状态映射：未知状态值', status, '-> 默认返回"等待"')
+  return '等待'
+}
+
+// 前端状态 -> 后端状态（目前仅展示用）
+const mapFrontendStatusToBackend = (status) => {
+  if (!status) return 'WAITING'
+  if (status === '叫号中') return 'CALLING'
+  if (status === '等待') return 'WAITING'
+  if (status === '跳过') return 'SKIPPED'
+  if (status === '已完成') return 'COMPLETED'
+  return 'WAITING'
+}
+
+// 从数据库加载队列
+const loadQueueFromDb = async () => {
+  try {
+    // 如果选择了具体科室，就按科室加载；否则加载当前登录人科室（后端默认）
+    const organizationId = selectedDept.value !== 'all' ? selectedDept.value : undefined
+    // 只查询今天的患者
+    const today = new Date()
+    const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`
+    console.log('【心内科】loadQueueFromDb 开始：organizationId=', organizationId, 'date=', todayStr, 'selectedDept=', selectedDept.value)
+    const res = await getTriageQueueList({ organizationId, date: todayStr }).catch((err) => {
+      console.error('【心内科】loadQueueFromDb 请求异常：', err)
+      return { code: 500, msg: err?.message || '请求失败', data: null }
+    })
+    console.log('【心内科】loadQueueFromDb 后端响应：', res)
+    
+    // 检查响应是否成功
+    if (res?.code !== 200 && res?.code !== undefined) {
+      console.error('【心内科】loadQueueFromDb 后端返回错误：', res?.code, res?.msg)
+      // 即使后端返回错误，也不清空队列，避免误删数据
+      // originalQueueList.value 保持原值
+      return
+    }
+    
+    const list = Array.isArray(res?.data) ? res.data : []
+    console.log('【心内科】loadQueueFromDb 从后端获取到', list.length, '条队列数据')
+    if (list.length === 0) {
+      console.log('【心内科】提示：队列数据为空（可能是今天还没有患者加入队列）')
+    }
+
+    originalQueueList.value = list
+      .map((it) => {
+        const frontendStatus = mapBackendStatusToFrontend(it.status)
+        // 调试日志：检查状态映射
+        if (list.length <= 5) {
+          console.log('【心内科】状态映射：后端状态=', it.status, '-> 前端状态=', frontendStatus, '患者=', it.patientName)
+        }
+        // 计算等待时间：基于创建时间（createTime）
+        let waitingTime = '00:00'
+        if (it.createTime) {
+          try {
+            const createTime = new Date(it.createTime)
+            // 检查日期是否有效
+            if (!isNaN(createTime.getTime())) {
+              const now = new Date()
+              const diffSeconds = Math.floor((now - createTime) / 1000)
+              waitingTime = formatSecondsToMmSs(Math.max(0, diffSeconds))
+            } else {
+              console.warn('【心内科】无效的创建时间:', it.createTime, '患者:', it.patientName)
+            }
+          } catch (e) {
+            console.error('【心内科】解析创建时间失败:', it.createTime, '患者:', it.patientName, e)
+          }
+        }
+        
+        return {
+          id: it.id,
+          queueOrder: it.queueOrder,
+          patientName: it.patientName ?? '-',
+          appointmentType: it.healthcareName ?? '普通',
+          room: it.organizationName ?? '-',
+          doctor: it.practitionerName ?? '-',
+          waitingTime: waitingTime,
+          createTime: it.createTime, // 保存创建时间，用于定时器计算
+          status: frontendStatus,
+          // 关联字段（用于去重/追溯）
+          encounterId: it.encounterId,
+          organizationId: it.organizationId
+        }
+      })
+      .filter((item) => {
+        // 过滤掉"已完成"状态的患者，不显示在队列中
+        if (item.status === '已完成') {
+          console.log('【心内科】过滤掉已完成状态的患者：', item.patientName)
+          return false
+        }
+        return true
+      })
+    
+    // 调试日志：检查查找结果
+    const callingCount = originalQueueList.value.filter(i => i.status === '叫号中').length
+    const waitingCount = originalQueueList.value.filter(i => i.status === '等待').length
+    console.log('【心内科】队列状态统计：总数=', originalQueueList.value.length, '叫号中=', callingCount, '等待=', waitingCount)
+    if (originalQueueList.value.length > 0) {
+      console.log('【心内科】队列中的 encounterIds:', originalQueueList.value.map(q => ({ name: q.patientName, encounterId: q.encounterId })))
+    }
+
+    // 统计
+    totalInQueue.value = originalQueueList.value.length
+    syncCurrentCallFromQueue()
+  } catch (e) {
+    console.error('【心内科】loadQueueFromDb 异常：', e)
+    // 不回退本地假数据，避免“看起来有数据但实际没落库”的误导
+    originalQueueList.value = []
+    totalInQueue.value = 0
+    syncCurrentCallFromQueue()
   }
 }
 
-// 格式化患者姓名（脱敏）
-function formatPatientName(name) {
-  if (!name || typeof name !== 'string') return '-'
-  if (name.length <= 2) return name.charAt(0) + '*'
-  return name.charAt(0) + '*' + name.slice(-1)
+// 根据状态枚举文本转换为前端状态
+const mapStatusToFrontend = (statusEnumText) => {
+  if (!statusEnumText) return '等待'
+  // 状态映射：就诊中 -> 叫号中，其他 -> 等待
+  if (statusEnumText.includes('就诊中') || statusEnumText.includes('在诊')) {
+    return '叫号中'
+  } else if (statusEnumText.includes('已完成') || statusEnumText.includes('已出院')) {
+    return '已完成'
+  } else if (statusEnumText.includes('已取消') || statusEnumText.includes('退号')) {
+    return '已取消'
+  }
+  return '等待'
 }
 
-// 格式化时间
-function formatTime(time) {
-  if (!time) return '-'
-  return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
+// 判断日期是否是今天
+const isToday = (date) => {
+  if (!date) return false
+  const targetDate = new Date(date)
+  const today = new Date()
+  return targetDate.getFullYear() === today.getFullYear() &&
+         targetDate.getMonth() === today.getMonth() &&
+         targetDate.getDate() === today.getDate()
 }
 
-// 获取状态类型
-function getStatusType(status) {
+// 过滤今天的数据
+const filterTodayData = (data) => {
+  if (!Array.isArray(data)) return []
+  const today = new Date()
+  today.setHours(0, 0, 0, 0)
+  const tomorrow = new Date(today)
+  tomorrow.setDate(tomorrow.getDate() + 1)
+  
+  return data.filter(item => {
+    if (!item.registerTime) return false
+    const registerDate = new Date(item.registerTime)
+    return registerDate >= today && registerDate < tomorrow
+  })
+}
+
+const loadDataFromApi = async () => {
+  // 明确打日志，方便你在浏览器 Console 里看到是否调用到了这里
+  console.log('【心内科】loadDataFromApi 被调用了：候选池=门诊挂号接口，队列=数据库接口')
+  try {
+    const baseParams = {}
+
+    // 1) 候选池（使用门诊挂号当日已挂号接口）
+
+    const candidateRes = await getCandidatePool(baseParams).catch((err) => {
+
+      return null
+    })
+
+    if (candidateRes && candidateRes.data != null) {
+      // 门诊挂号接口返回的是分页数据 { records: [], total: 0 }
+      const records = candidateRes.data.records || candidateRes.data
+      const data = Array.isArray(records) ? records : (Array.isArray(candidateRes.data) ? candidateRes.data : [])
+      console.log('【心内科】候选池数据：', data, '类型：', typeof data, '是否为数组：', Array.isArray(data), '数量：', data.length)
+      if (Array.isArray(data) && data.length > 0) {
+        // 过滤今天的数据
+        const todayData = filterTodayData(data)
+        console.log('【心内科】过滤后的今天数据：', todayData.length, '条（原始：', data.length, '条）')
+        // 门诊挂号 CurrentDayEncounterDto → 候选池
+        originalCandidatePoolList.value = todayData.map((item, idx) => ({
+          sequenceNo: idx + 1,
+          encounterId: item.encounterId,
+          patientId: item.patientId,
+          organizationId: item.organizationId,
+          organizationName: item.organizationName,
+          patientName: item.patientName ?? '-',
+          age: parseAge(item.age),
+          appointmentType: item.healthcareName ?? '普通',
+          room: item.organizationName ? `${item.organizationName}` : '-',
+          doctor: item.practitionerName ?? '-',
+          matchingRule: '-' // 这里先不做智能规则匹配
+        }))
+        console.log('【心内科】候选池已加载', originalCandidatePoolList.value.length, '条今天的数据')
+      } else {
+        console.log('【心内科】候选池数据为空数组或非数组，使用默认数据')
+        originalCandidatePoolList.value = getInitialCandidatePoolList()
+      }
+    } else {
+      console.log('【心内科】候选池响应为空或格式错误，使用默认数据')
+      originalCandidatePoolList.value = getInitialCandidatePoolList()
+    }
+
+    // 2) 队列列表：从数据库读取（可刷新、可恢复）
+    await loadQueueFromDb()
+
+    // 3) 候选池去重：已经在队列里的患者（按 encounterId）不再出现在候选池
+    // 注意：确保 encounterId 类型一致（统一转换为字符串进行比较，避免数字和字符串不匹配）
+    const queueEncounterIds = new Set(
+      originalQueueList.value
+        .map((q) => q.encounterId)
+        .filter((id) => id != null && id !== undefined && id !== '')
+        .map((id) => String(id)) // 统一转换为字符串
+    )
+    console.log('【心内科】去重前：候选池', originalCandidatePoolList.value.length, '条，队列', originalQueueList.value.length, '条，队列encounterIds=', Array.from(queueEncounterIds))
+    if (queueEncounterIds.size > 0) {
+      const beforeCount = originalCandidatePoolList.value.length
+      originalCandidatePoolList.value = originalCandidatePoolList.value.filter((c) => {
+        const candidateId = c.encounterId != null ? String(c.encounterId) : null
+        return candidateId == null || !queueEncounterIds.has(candidateId)
+      })
+      console.log('【心内科】去重后：候选池', originalCandidatePoolList.value.length, '条（移除了', beforeCount - originalCandidatePoolList.value.length, '条）')
+      // 如果去重后数量没有变化，可能是类型不匹配问题
+      if (beforeCount === originalCandidatePoolList.value.length && beforeCount > 0) {
+        console.warn('【心内科】警告：去重前后数量未变化，可能是 encounterId 类型不匹配！')
+        console.warn('  候选池中的 encounterIds:', originalCandidatePoolList.value.slice(0, 3).map(c => ({ name: c.patientName, id: c.encounterId, type: typeof c.encounterId })))
+        console.warn('  队列中的 encounterIds:', originalQueueList.value.slice(0, 3).map(q => ({ name: q.patientName, id: q.encounterId, type: typeof q.encounterId })))
+      }
+    } else {
+      console.warn('【心内科】警告：队列中没有 encounterId，无法进行去重！')
+      if (originalQueueList.value.length > 0) {
+        console.warn('  队列数据详情:', originalQueueList.value.slice(0, 3).map(q => ({ name: q.patientName, encounterId: q.encounterId })))
+      }
+    }
+
+    // 4) 统计信息（只统计候选池和队列的数据）
+    totalSignedIn.value = originalCandidatePoolList.value.length
+    console.log('【心内科】统计信息：候选池', totalSignedIn.value, '条，队列', totalInQueue.value, '条')
+
+    // 当前日期展示（简单用本机时间）
+    const now = new Date()
+    currentDate.value = `${now.getFullYear()}/${now.getMonth() + 1}/${now.getDate()}`
+
+    // 同步当前呼叫（队列从 DB 加载后已同步；这里再兜底一次）
+    syncCurrentCallFromQueue()
+    console.log('【心内科】数据加载完成：候选池', originalCandidatePoolList.value.length, '条，队列', originalQueueList.value.length, '条')
+    ElMessage.success('【心内科】已从门诊挂号接口加载数据')
+  } catch (e) {
+    console.error('【心内科】loadDataFromApi 执行异常，使用本地假数据：', e)
+    // 任何异常：回退本地假数据
+    originalCandidatePoolList.value = getInitialCandidatePoolList()
+    // 队列不再回退假数据，避免误导
+    originalQueueList.value = []
+    totalSignedIn.value = originalCandidatePoolList.value.length
+    totalInQueue.value = originalQueueList.value.length
+    syncCurrentCallFromQueue()
+  }
+}
+
+// 原始数据存储（用于过滤）
+const originalCandidatePoolList = ref(getInitialCandidatePoolList())
+
+// 辅助函数：扁平化科室树形结构
+const flattenDepartmentTree = (tree, result = []) => {
+  if (!Array.isArray(tree)) return result
+  tree.forEach(node => {
+    if (node.id && node.name) {
+      result.push({ id: node.id, name: node.name })
+    }
+    if (node.children && Array.isArray(node.children)) {
+      flattenDepartmentTree(node.children, result)
+    }
+  })
+  return result
+}
+
+// 加载就诊科室列表
+const loadDepartmentList = async () => {
+  try {
+    const response = await getLocationTree()
+    if (response && response.data) {
+      // 扁平化树形结构
+      departmentList.value = flattenDepartmentTree(response.data)
+      console.log('【心内科】已加载就诊科室列表：', departmentList.value.length, '个科室')
+    }
+  } catch (error) {
+    console.error('【心内科】加载就诊科室列表失败：', error)
+    ElMessage.warning('加载就诊科室列表失败，使用默认数据')
+  }
+}
+
+// 获取选中科室的名称
+const getSelectedDeptName = () => {
+  if (selectedDept.value === 'all') return null
+  const dept = departmentList.value.find(d => d.id === selectedDept.value)
+  return dept ? dept.name : null
+}
+
+// 过滤后的智能候选池数据
+const filteredCandidatePoolList = computed(() => {
+  if (selectedDept.value === 'all') {
+    return originalCandidatePoolList.value
+  }
+  const deptName = getSelectedDeptName()
+  if (!deptName) return originalCandidatePoolList.value
+  return originalCandidatePoolList.value.filter(item => item.room === deptName)
+})
+
+// 原始队列数据存储（用于过滤）
+const originalQueueList = ref(getInitialQueueList())
+
+const parseMmSsToSeconds = (mmss) => {
+  if (!mmss || typeof mmss !== 'string') return 0
+  const [mm, ss] = mmss.split(':')
+  const m = Number(mm)
+  const s = Number(ss)
+  if (Number.isNaN(m) || Number.isNaN(s)) return 0
+  return m * 60 + s
+}
+
+const formatSecondsToMmSs = (totalSeconds) => {
+  const safe = Math.max(0, Math.floor(totalSeconds || 0))
+  const mm = String(Math.floor(safe / 60)).padStart(2, '0')
+  const ss = String(safe % 60).padStart(2, '0')
+  return `${mm}:${ss}`
+}
+
+// 过滤后的智能队列数据（同时考虑科室过滤和状态过滤）
+const filteredQueueList = computed(() => {
+  let filtered = originalQueueList.value
+
+  // 先过滤掉"已完成"状态的患者（无论什么情况都不显示）
+  filtered = filtered.filter(item => item.status !== '已完成')
+
+  // 再按科室过滤
+  if (selectedDept.value !== 'all') {
+    const deptName = getSelectedDeptName()
+    if (deptName) {
+      filtered = filtered.filter(item => item.room === deptName)
+    }
+  }
+
+  // 再按状态过滤（只显示等待）
+  if (showOnlyWaiting.value) {
+    filtered = filtered.filter(item => item.status === '等待')
+  }
+
+  return filtered
+})
+
+const handleQueueRowClick = (row) => {
+  selectedQueueRow.value = row
+}
+
+// 候选池选择变化
+const handleCandidateSelectionChange = (selection) => {
+  selectedCandidates.value = selection
+}
+
+// 获取下一个队序号
+const getNextQueueOrder = () => {
+  if (originalQueueList.value.length === 0) return 1
+  const maxOrder = Math.max(...originalQueueList.value.map(item => item.queueOrder))
+  return maxOrder + 1
+}
+
+// 重新计算队序号（保持连续）
+const recalculateQueueOrders = () => {
+  originalQueueList.value.forEach((item, index) => {
+    item.queueOrder = index + 1
+  })
+}
+
+// 加入队列（选中的候选池患者）——落库
+const handleAddToQueue = async () => {
+  if (selectedCandidates.value.length === 0) {
+    ElMessage.warning('请先选择要加入队列的患者')
+    return
+  }
+  
+  // 记录要加入的患者 encounterId（用于后续删除）
+  const toAddEncounterIds = new Set()
+  selectedCandidates.value.forEach((c) => {
+    if (c.encounterId != null) {
+      toAddEncounterIds.add(String(c.encounterId))
+    }
+  })
+  
+  const beforeCount = originalCandidatePoolList.value.length
+  console.log('【心内科】handleAddToQueue 开始：选中', selectedCandidates.value.length, '位患者，候选池当前', beforeCount, '条')
+  
+  try {
+    const groups = new Map()
+    selectedCandidates.value.forEach((c) => {
+      if (!c.organizationId) return
+      if (!groups.has(c.organizationId)) {
+        groups.set(c.organizationId, {
+          organizationId: c.organizationId,
+          organizationName: c.organizationName || c.room,
+          items: []
+        })
+      }
+      groups.get(c.organizationId).items.push({
+        encounterId: c.encounterId,
+        patientId: c.patientId,
+        patientName: c.patientName,
+        healthcareName: c.appointmentType,
+        practitionerName: c.doctor
+      })
+    })
+
+    let added = 0
+    const addedEncounterIds = new Set()
+    for (const [, payload] of groups) {
+      try {
+        const res = await addToQueue(payload)
+        if (typeof res?.data === 'number') added += res.data
+        // 不论后端是否判重，只要尝试加入过的 encounterId，一律从候选池移除
+        payload.items.forEach(it => {
+          if (it.encounterId != null) {
+            addedEncounterIds.add(String(it.encounterId))
+          }
+        })
+      } catch (err) {
+        console.error('【心内科】单个分组加入队列失败：', err)
+        // 即使失败，也记录 encounterId，后续尝试删除（避免重复尝试）
+        payload.items.forEach(it => {
+          if (it.encounterId != null) {
+            addedEncounterIds.add(String(it.encounterId))
+          }
+        })
+      }
+    }
+
+    // 立即从候选池中删除已加入的患者（无论API是否成功，只要尝试过就删除）
+    // 确保 encounterId 类型一致（统一转换为字符串）
+    if (addedEncounterIds.size > 0) {
+      const beforeDeleteCount = originalCandidatePoolList.value.length
+      originalCandidatePoolList.value = originalCandidatePoolList.value.filter(
+        c => {
+          const candidateId = c.encounterId != null ? String(c.encounterId) : null
+          const shouldKeep = candidateId == null || !addedEncounterIds.has(candidateId)
+          return shouldKeep
+        }
+      )
+      const deletedCount = beforeDeleteCount - originalCandidatePoolList.value.length
+      console.log('【心内科】从候选池删除', deletedCount, '位患者（尝试加入的', addedEncounterIds.size, '位）')
+      
+      // 同时清空选中状态
+      selectedCandidates.value = []
+    }
+
+    // 刷新队列数据（从数据库读取最新队列）
+    await loadQueueFromDb()
+    totalSignedIn.value = originalCandidatePoolList.value.length
+    
+    const afterCount = originalCandidatePoolList.value.length
+    console.log('【心内科】handleAddToQueue 完成：候选池从', beforeCount, '条减少到', afterCount, '条，成功加入', added, '位')
+
+    if (added > 0) {
+      ElMessage.success(`成功将 ${added} 位患者加入队列（已保存）`)
+    } else if (addedEncounterIds.size > 0) {
+      ElMessage.warning('所选患者已在队列中，已从候选池移除')
+    } else {
+      ElMessage.warning('加入队列失败，请重试')
+    }
+  } catch (e) {
+    console.error('【心内科】handleAddToQueue 异常：', e)
+    // 即使出错，也尝试删除已尝试加入的患者（避免重复操作）
+    if (toAddEncounterIds.size > 0) {
+      const beforeDeleteCount = originalCandidatePoolList.value.length
+      originalCandidatePoolList.value = originalCandidatePoolList.value.filter(
+        c => {
+          const candidateId = c.encounterId != null ? String(c.encounterId) : null
+          return candidateId == null || !toAddEncounterIds.has(candidateId)
+        }
+      )
+      const deletedCount = beforeDeleteCount - originalCandidatePoolList.value.length
+      console.log('【心内科】异常情况下从候选池删除', deletedCount, '位患者')
+      totalSignedIn.value = originalCandidatePoolList.value.length
+      selectedCandidates.value = []
+    }
+    ElMessage.error('加入队列失败（未保存）')
+  }
+}
+
+// 一键加入队列（所有候选池患者）——落库
+const handleAddAllToQueue = async () => {
+  if (filteredCandidatePoolList.value.length === 0) {
+    ElMessage.warning('候选池中没有患者')
+    return
+  }
+  
+  // 记录要加入的所有患者 encounterId（用于后续删除）
+  const toAddEncounterIds = new Set()
+  filteredCandidatePoolList.value.forEach((c) => {
+    if (c.encounterId != null) {
+      toAddEncounterIds.add(String(c.encounterId))
+    }
+  })
+  
+  const beforeCount = originalCandidatePoolList.value.length
+  console.log('【心内科】handleAddAllToQueue 开始：候选池当前', beforeCount, '条，过滤后', filteredCandidatePoolList.value.length, '条')
+  
+  try {
+    const groups = new Map()
+    filteredCandidatePoolList.value.forEach((c) => {
+      if (!c.organizationId) return
+      if (!groups.has(c.organizationId)) {
+        groups.set(c.organizationId, {
+          organizationId: c.organizationId,
+          organizationName: c.organizationName || c.room,
+          items: []
+        })
+      }
+      groups.get(c.organizationId).items.push({
+        encounterId: c.encounterId,
+        patientId: c.patientId,
+        patientName: c.patientName,
+        healthcareName: c.appointmentType,
+        practitionerName: c.doctor
+      })
+    })
+
+    let added = 0
+    const addedEncounterIds = new Set()
+    for (const [, payload] of groups) {
+      try {
+        const res = await addToQueue(payload)
+        if (typeof res?.data === 'number') added += res.data
+        // 不论后端是否判重，只要尝试加入过的 encounterId，一律从候选池移除
+        payload.items.forEach(it => {
+          if (it.encounterId != null) {
+            addedEncounterIds.add(String(it.encounterId))
+          }
+        })
+      } catch (err) {
+        console.error('【心内科】单个分组一键加入队列失败：', err)
+        // 即使失败，也记录 encounterId，后续尝试删除（避免重复尝试）
+        payload.items.forEach(it => {
+          if (it.encounterId != null) {
+            addedEncounterIds.add(String(it.encounterId))
+          }
+        })
+      }
+    }
+
+    // 立即从候选池中删除已加入的患者（无论API是否成功，只要尝试过就删除）
+    // 确保 encounterId 类型一致（统一转换为字符串）
+    if (addedEncounterIds.size > 0) {
+      const beforeDeleteCount = originalCandidatePoolList.value.length
+      originalCandidatePoolList.value = originalCandidatePoolList.value.filter(
+        c => {
+          const candidateId = c.encounterId != null ? String(c.encounterId) : null
+          const shouldKeep = candidateId == null || !addedEncounterIds.has(candidateId)
+          return shouldKeep
+        }
+      )
+      const deletedCount = beforeDeleteCount - originalCandidatePoolList.value.length
+      console.log('【心内科】从候选池删除', deletedCount, '位患者（尝试加入的', addedEncounterIds.size, '位）')
+      
+      // 同时清空选中状态
+      selectedCandidates.value = []
+    }
+    
+    // 刷新队列数据（从数据库读取最新队列）
+    await loadQueueFromDb()
+    totalSignedIn.value = originalCandidatePoolList.value.length
+    
+    const afterCount = originalCandidatePoolList.value.length
+    console.log('【心内科】handleAddAllToQueue 完成：候选池从', beforeCount, '条减少到', afterCount, '条，成功加入', added, '位')
+
+    if (added > 0) {
+      ElMessage.success(`成功将 ${added} 位患者加入队列（已保存）`)
+    } else if (addedEncounterIds.size > 0) {
+      ElMessage.warning('所有候选池患者已在队列中，已从候选池移除')
+    } else {
+      ElMessage.warning('一键加入失败，请重试')
+    }
+  } catch (e) {
+    console.error('【心内科】handleAddAllToQueue 异常：', e)
+    // 即使出错，也尝试删除已尝试加入的患者（避免重复操作）
+    if (toAddEncounterIds.size > 0) {
+      const beforeDeleteCount = originalCandidatePoolList.value.length
+      originalCandidatePoolList.value = originalCandidatePoolList.value.filter(
+        c => {
+          const candidateId = c.encounterId != null ? String(c.encounterId) : null
+          return candidateId == null || !toAddEncounterIds.has(candidateId)
+        }
+      )
+      const deletedCount = beforeDeleteCount - originalCandidatePoolList.value.length
+      console.log('【心内科】异常情况下从候选池删除', deletedCount, '位患者')
+      totalSignedIn.value = originalCandidatePoolList.value.length
+      selectedCandidates.value = []
+    }
+    ElMessage.error('一键加入失败（未保存）')
+  }
+}
+
+// 移出队列——落库
+const handleRemoveFromQueue = async () => {
+  if (!selectedQueueRow.value) {
+    ElMessage.warning('请先选择要移出队列的患者')
+    return
+  }
+
+  try {
+    const row = selectedQueueRow.value
+    if (!row.id) {
+      ElMessage.warning('该队列项缺少ID，无法保存删除，请先刷新页面')
+      return
+    }
+    
+    const patientName = row.patientName || '患者'
+    console.log('【心内科】开始移出队列：', patientName, 'encounterId:', row.encounterId)
+    
+    await removeFromQueue(row.id)
+    selectedQueueRow.value = null
+    
+    // 刷新数据（候选池和队列）
+    await loadDataFromApi()
+    
+    console.log('【心内科】移出队列完成，患者应已重新出现在候选池中')
+    ElMessage.success(`已将 ${patientName} 移出队列，患者已重新出现在候选池中（已保存）`)
+  } catch (e) {
+    console.error('【心内科】handleRemoveFromQueue 异常：', e)
+    ElMessage.error('移出队列失败（未保存）')
+  }
+}
+
+// 是否可以上移
+const canMoveUp = computed(() => {
+  if (!selectedQueueRow.value) return false
+  const index = originalQueueList.value.findIndex(
+    item => item.queueOrder === selectedQueueRow.value.queueOrder
+  )
+  return index > 0
+})
+
+// 是否可以下移
+const canMoveDown = computed(() => {
+  if (!selectedQueueRow.value) return false
+  const index = originalQueueList.value.findIndex(
+    item => item.queueOrder === selectedQueueRow.value.queueOrder
+  )
+  return index >= 0 && index < originalQueueList.value.length - 1
+})
+
+// 上移——落库
+const handleMoveUp = async () => {
+  if (!selectedQueueRow.value || !canMoveUp.value) return
+  if (!selectedQueueRow.value.id) {
+    ElMessage.warning('该队列项缺少ID，无法保存排序，请先刷新页面')
+    return
+  }
+  try {
+    await adjustQueueOrder({ id: selectedQueueRow.value.id, direction: 'up' })
+    await loadDataFromApi()
+    ElMessage.success('队列顺序已调整（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleMoveUp 异常：', e)
+    ElMessage.error('队列顺序调整失败（未保存）')
+  }
+}
+
+// 下移——落库
+const handleMoveDown = async () => {
+  if (!selectedQueueRow.value || !canMoveDown.value) return
+  if (!selectedQueueRow.value.id) {
+    ElMessage.warning('该队列项缺少ID，无法保存排序，请先刷新页面')
+    return
+  }
+  try {
+    await adjustQueueOrder({ id: selectedQueueRow.value.id, direction: 'down' })
+    await loadDataFromApi()
+    ElMessage.success('队列顺序已调整（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleMoveDown 异常：', e)
+    ElMessage.error('队列顺序调整失败（未保存）')
+  }
+}
+
+let waitingTimer = null
+const startWaitingTimer = () => {
+  if (waitingTimer) return
+  waitingTimer = window.setInterval(() => {
+    // 仅"等待"状态计算等待时间（基于创建时间）
+    const now = new Date()
+    originalQueueList.value.forEach((item) => {
+      if (item.status !== '等待') return
+      // 如果有创建时间，基于创建时间计算；否则累加（兼容旧数据）
+      if (item.createTime) {
+        try {
+          const createTime = new Date(item.createTime)
+          // 检查日期是否有效
+          if (!isNaN(createTime.getTime())) {
+            const diffSeconds = Math.floor((now - createTime) / 1000)
+            item.waitingTime = formatSecondsToMmSs(Math.max(0, diffSeconds))
+          }
+        } catch (e) {
+          // 解析失败时使用累加方式（兼容旧数据）
+          const seconds = parseMmSsToSeconds(item.waitingTime)
+          item.waitingTime = formatSecondsToMmSs(seconds + 1)
+        }
+      } else {
+        // 兼容旧数据：累加方式
+        const seconds = parseMmSsToSeconds(item.waitingTime)
+        item.waitingTime = formatSecondsToMmSs(seconds + 1)
+      }
+    })
+  }, 1000)
+}
+
+const stopWaitingTimer = () => {
+  if (!waitingTimer) return
+  window.clearInterval(waitingTimer)
+  waitingTimer = null
+}
+
+// 获取行样式类名（用于高亮当前叫号）
+const getRowClassName = ({ row }) => {
+  const classes = []
+  if (row.status === '叫号中') classes.push('calling-row')
+  if (selectedQueueRow.value && row.queueOrder === selectedQueueRow.value.queueOrder) {
+    classes.push('selected-row')
+  }
+  return classes.join(' ')
+}
+
+// 获取状态标签类型
+const getStatusTagType = (status) => {
   const statusMap = {
-    'WAITING': 'info',
-    'CALLED': 'warning',
-    'IN_PROGRESS': 'success',
-    'COMPLETED': ''
+    '等待': 'info',
+    '叫号中': 'warning',
+    '就诊中': 'success',
+    '跳过': 'danger',
+    '已完成': ''
   }
   return statusMap[status] || ''
 }
 
-// 获取状态文本
-function getStatusText(status) {
-  const statusMap = {
-    'WAITING': '等待',
-    'CALLED': '已叫号',
-    'IN_PROGRESS': '就诊中',
-    'COMPLETED': '已完成'
-  }
-  return statusMap[status] || '未知'
+// 刷新数据（候选池=门诊挂号接口，队列=数据库接口）
+const handleRefresh = async () => {
+  callType.value = '刷新'
+  console.log('【心内科】点击了刷新按钮，开始重新加载数据（候选池+队列）')
+  selectedCandidates.value = []
+  await loadDataFromApi()
+
+  // 确保等待计时器只有一个
+  stopWaitingTimer()
+  startWaitingTimer()
+
+  ElMessage.success('已刷新（已从数据库恢复队列）')
 }
 
-// 获取队列数据
-async function fetchQueueData() {
-  try {
-    loading.value = true
-    
-    // 调用API获取当日就诊数据
-    const response = await getOutpatientRegistrationCurrent({
-      searchKey: queryParams.searchKey,
-      pageNo: queryParams.pageNo,
-      pageSize: queryParams.pageSize
+// 退出
+const handleExit = () => {
+  ElMessage.info('退出功能待实现')
+  // TODO: 实现退出逻辑
+}
+
+// 后台配置
+const handleConfig = () => {
+  // 打开配置弹窗并加载当前选中规则
+  if (rules.value.length > 0) {
+    editingIndex.value = 0
+    Object.assign(ruleForm, rules.value[0])
+  } else {
+    editingIndex.value = -1
+    Object.assign(ruleForm, {
+      name: '',
+      dept: '心内科',
+      desc: '',
+      priority: 10,
+      weeks: ['1', '2', '3', '4', '5'],
+      expr: '{}'
     })
-    
-    if (response && response.code === 200) {
-      // 获取记录数据
-      const records = response.data?.records || response.data || []
-      
-      // 过滤心内科的数据（如果有organizationId）
-      let filteredData = records
-      if (queryParams.organizationId) {
-        filteredData = records.filter(item => item.organizationId === queryParams.organizationId)
-      }
-      
-      // 转换为队列数据格式
-      queueList.value = filteredData.map(item => ({
-        id: item.encounterId,
-        patientName: item.patientName,
-        practitionerName: item.practitionerName || '-',
-        organizationName: item.organizationName,
-        room: item.organizationName || '-', // 使用科室名称作为诊室
-        displayOrder: item.displayOrder,
-        registerTime: item.registerTime,
-        status: 'WAITING' // 默认状态，实际应该从后端获取
-      }))
-      
-      total.value = response.data?.total || filteredData.length || 0
-    } else {
-      queueList.value = []
-      total.value = 0
-      if (response && response.msg) {
-        ElMessage.warning('获取数据失败: ' + response.msg)
-      }
-    }
-  } catch (error) {
-    console.error('获取队列数据失败:', error)
-    ElMessage.error('获取队列数据失败: ' + (error.message || '未知错误'))
-    queueList.value = []
-    total.value = 0
-  } finally {
-    loading.value = false
   }
+  configDialogVisible.value = true
 }
 
-// 刷新数据
-function refreshData() {
-  queryParams.pageNo = 1
-  fetchQueueData()
-}
+// 选呼——落库
+const handleSelectCall = async () => {
+  if (!selectedQueueRow.value) {
+    ElMessage.warning('请先在右侧队列中选择一个患者')
+    return
+  }
 
-// 叫号
-async function handleCall(row) {
   try {
-    await ElMessageBox.confirm(
-      `确认叫号：${formatPatientName(row.patientName)}（${formatSerialNo(row)}）？`,
-      '确认叫号',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning'
+    callType.value = '选呼'
+    if (!selectedQueueRow.value.id) {
+      ElMessage.warning('该队列项缺少ID，无法保存选呼，请先刷新页面')
+      return
+    }
+    
+    // 检查患者状态，只有"等待"状态才能选呼
+    if (selectedQueueRow.value.status !== '等待') {
+      if (selectedQueueRow.value.status === '叫号中') {
+        ElMessage.info('该患者已经是"叫号中"状态')
+        return
+      } else {
+        ElMessage.warning('只能选呼"等待"状态的患者，当前患者状态为："' + selectedQueueRow.value.status + '"')
+        return
       }
-    )
-    
-    // TODO: 调用叫号API
-    // await callPatient(row.id)
-    
-    // 更新当前呼叫信息
-    currentCall.value = {
-      number: row.displayOrder || '-',
-      name: formatPatientName(row.patientName),
-      room: row.room
     }
     
-    // 更新状态
-    row.status = 'CALLED'
-    
-    ElMessage.success('叫号成功')
-    
-    // 刷新数据
-    await fetchQueueData()
-  } catch (error) {
-    if (error !== 'cancel') {
-      console.error('叫号失败:', error)
-      ElMessage.error('叫号失败: ' + (error.message || '未知错误'))
+    await callPatient({ id: selectedQueueRow.value.id, organizationId: selectedQueueRow.value.organizationId })
+    // 只刷新队列数据，不重新加载候选池（避免候选池数据被重置）
+    await loadQueueFromDb()
+    const latest = originalQueueList.value.find((i) => i.id === selectedQueueRow.value.id)
+    if (latest) {
+      selectedQueueRow.value = latest
+      // 如果有多个"叫号中"的患者，显示当前选中的这个
+      currentCall.value = { number: String(latest.queueOrder), name: latest.patientName, room: latest.room }
     }
+    
+    // 统计当前"叫号中"的患者数量
+    const callingCount = originalQueueList.value.filter(i => i.status === '叫号中').length
+    if (callingCount > 1) {
+      ElMessage.success(`已选呼（已保存），当前共有 ${callingCount} 位患者处于"叫号中"状态`)
+    } else {
+      ElMessage.success('已选呼（已保存）')
+    }
+  } catch (e) {
+    console.error('【心内科】handleSelectCall 异常：', e)
+    ElMessage.error('选呼失败（未保存）')
   }
 }
 
-// 分页大小改变
-function handleSizeChange(val) {
-  queryParams.pageSize = val
-  queryParams.pageNo = 1
-  fetchQueueData()
+// 下一患者——落库
+const handleNextPatient = async () => {
+  try {
+    callType.value = '下一患者'
+    // 关键改进：如果用户选中了患者，优先使用选中患者的ID（像 call 方法一样）
+    let reqData = {}
+    if (selectedQueueRow.value?.id) {
+      // 如果选中了患者，直接使用其ID（后端会通过ID直接获取，不依赖查询条件）
+      reqData.id = selectedQueueRow.value.id
+      reqData.organizationId = selectedQueueRow.value.organizationId
+    } else {
+      // 如果没有选中患者，使用查询条件（兼容旧逻辑）
+      let orgId = selectedDept.value !== 'all' ? selectedDept.value : undefined
+      // "全科"模式：优先用"当前叫号中/第一个等待"所在科室
+      if (orgId == null) {
+        const calling = originalQueueList.value.find((i) => i.status === '叫号中')
+        const waiting = originalQueueList.value.find((i) => i.status === '等待')
+        console.log('【心内科】handleNextPatient 查找：叫号中=', calling?.patientName, '等待=', waiting?.patientName)
+        orgId = calling?.organizationId ?? waiting?.organizationId
+        console.log('【心内科】handleNextPatient 确定的 orgId=', orgId)
+      }
+      if (orgId != null) {
+        reqData.organizationId = orgId
+      }
+    }
+    // 如果还是找不到，后端会自己找全科第一个叫号中/等待的
+    await nextPatient(reqData)
+    selectedQueueRow.value = null
+    await loadDataFromApi()
+    ElMessage.success('已呼叫下一位（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleNextPatient 异常：', e)
+    // 从错误对象中提取错误消息
+    const errorMsg = e?.message || e?.response?.data?.msg || '当前范围内没有"等待"的患者'
+    ElMessage.warning(errorMsg)
+  }
 }
 
-// 页码改变
-function handlePageChange(val) {
-  queryParams.pageNo = val
-  fetchQueueData()
+// 跳过——落库（当前等同于“过号重排”）
+const handleSkip = async () => {
+  try {
+    callType.value = '跳过'
+    // 关键改进：如果用户选中了患者，优先使用选中患者的ID（像 call 方法一样）
+    let reqData = {}
+    if (selectedQueueRow.value?.id) {
+      // 如果选中了患者，直接使用其ID（后端会通过ID直接获取，不依赖查询条件）
+      reqData.id = selectedQueueRow.value.id
+      reqData.organizationId = selectedQueueRow.value.organizationId
+    } else {
+      // 如果没有选中患者，使用查询条件（兼容旧逻辑）
+      let orgId = selectedDept.value !== 'all' ? selectedDept.value : undefined
+      // “全科”模式：优先用“当前叫号中”所在科室
+      if (orgId == null) {
+        const calling = originalQueueList.value.find((i) => i.status === '叫号中')
+        orgId = calling?.organizationId
+      }
+      if (orgId != null) {
+        reqData.organizationId = orgId
+      }
+    }
+    await skipPatient(reqData)
+    selectedQueueRow.value = null
+    await loadDataFromApi()
+    ElMessage.success('已跳过（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleSkip 异常：', e)
+    // 从错误对象中提取错误消息
+    const errorMsg = e?.message || e?.response?.data?.msg || '当前没有"叫号中"的患者'
+    ElMessage.warning(errorMsg)
+  }
 }
 
-// 组件挂载时获取数据
+// 完成——落库
+const handleComplete = async () => {
+  try {
+    callType.value = '完成'
+    // 关键改进：如果用户选中了患者，优先使用选中患者的ID（像 call 方法一样）
+    let reqData = {}
+    if (selectedQueueRow.value?.id) {
+      // 如果选中了患者，直接使用其ID（后端会通过ID直接获取，不依赖查询条件）
+      reqData.id = selectedQueueRow.value.id
+      reqData.organizationId = selectedQueueRow.value.organizationId
+    } else {
+      // 如果没有选中患者，使用查询条件（兼容旧逻辑）
+      let orgId = selectedDept.value !== 'all' ? selectedDept.value : undefined
+      // “全科”模式：优先用“当前叫号中”所在科室
+      if (orgId == null) {
+        const calling = originalQueueList.value.find((i) => i.status === '叫号中')
+        orgId = calling?.organizationId
+      }
+      if (orgId != null) {
+        reqData.organizationId = orgId
+      }
+    }
+    await completeCall(reqData)
+    selectedQueueRow.value = null
+    await loadDataFromApi()
+    ElMessage.success('已完成（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleComplete 异常：', e)
+    // 从错误对象中提取错误消息
+    const errorMsg = e?.message || e?.response?.data?.msg || '当前没有"叫号中"的患者'
+    ElMessage.warning(errorMsg)
+  }
+}
+
+// 过号重排——落库
+const handleRequeue = async () => {
+  try {
+    callType.value = '过号重排'
+    // 关键改进：如果用户选中了患者，优先使用选中患者的ID（像 call 方法一样）
+    let reqData = {}
+    if (selectedQueueRow.value?.id) {
+      // 如果选中了患者，直接使用其ID（后端会通过ID直接获取，不依赖查询条件）
+      reqData.id = selectedQueueRow.value.id
+      reqData.organizationId = selectedQueueRow.value.organizationId
+    } else {
+      // 如果没有选中患者，使用查询条件（兼容旧逻辑）
+      let orgId = selectedDept.value !== 'all' ? selectedDept.value : undefined
+      // “全科”模式：优先用“当前叫号中”所在科室
+      if (orgId == null) {
+        const calling = originalQueueList.value.find((i) => i.status === '叫号中')
+        orgId = calling?.organizationId
+      }
+      if (orgId != null) {
+        reqData.organizationId = orgId
+      }
+    }
+    await requeuePatient(reqData)
+    // 如果执行到这里，说明操作成功
+    selectedQueueRow.value = null
+    await loadDataFromApi()
+    ElMessage.success('已过号重排（已保存）')
+  } catch (e) {
+    console.error('【心内科】handleRequeue 异常：', e)
+    // 从错误对象中提取错误消息
+    // 注意：当后端返回 R.fail() 时，code=500，响应拦截器会 Promise.reject(new Error(msg))
+    // 所以错误消息在 e.message 中
+    const errorMsg = e?.message || e?.response?.data?.msg || '当前没有等待中的患者'
+    ElMessage.warning(errorMsg)
+    // 失败时不要刷新数据，避免显示错误的状态
+    // await loadDataFromApi() // 注释掉，避免刷新数据
+  }
+}
+
+// 后台配置：选择规则
+const handleSelectRule = (index) => {
+  editingIndex.value = index
+  Object.assign(ruleForm, rules.value[index])
+}
+
+// 后台配置：保存当前规则到列表
+const persistRuleForm = () => {
+  if (!ruleForm.name || !ruleForm.priority) {
+    ElMessage.warning('请填写规则名称和优先级')
+    return false
+  }
+  if (!Array.isArray(ruleForm.weeks) || ruleForm.weeks.length === 0) {
+    ElMessage.warning('请选择生效周几')
+    return false
+  }
+  const parsed = tryParseExpr(ruleForm.expr)
+  if (parsed === null) return false
+
+  const target = {
+    name: ruleForm.name,
+    dept: ruleForm.dept || '心内科',
+    desc: ruleForm.desc || '',
+    priority: Number(ruleForm.priority) || 0,
+    weeks: [...ruleForm.weeks],
+    expr: ruleForm.expr
+  }
+
+  if (editingIndex.value >= 0 && editingIndex.value < rules.value.length) {
+    rules.value.splice(editingIndex.value, 1, target)
+  } else {
+    rules.value.push(target)
+    editingIndex.value = rules.value.length - 1
+  }
+  return true
+}
+
+// JSON 语法检查
+const tryParseExpr = (expr) => {
+  try {
+    JSON.parse(expr || '{}')
+    return true
+  } catch (e) {
+    ElMessage.error('条件表达式 JSON 语法错误')
+    return null
+  }
+}
+
+// 后台配置：新增规则
+const handleAddRule = () => {
+  const ok = persistRuleForm()
+  if (!ok) return
+  const newRule = {
+    name: '新规则',
+    dept: '心内科',
+    desc: '',
+    priority: rules.value.length * 10 + 10,
+    weeks: ['1', '2', '3', '4', '5'],
+    expr: '{}'
+  }
+  rules.value.push(newRule)
+  editingIndex.value = rules.value.length - 1
+  Object.assign(ruleForm, newRule)
+}
+
+// 后台配置：删除规则
+const handleDeleteRule = (index) => {
+  rules.value.splice(index, 1)
+  if (rules.value.length === 0) {
+    editingIndex.value = -1
+    Object.assign(ruleForm, {
+      name: '',
+      dept: '心内科',
+      desc: '',
+      priority: 10,
+      weeks: ['1', '2', '3', '4', '5'],
+      expr: '{}'
+    })
+    return
+  }
+  const newIndex = Math.max(0, Math.min(index, rules.value.length - 1))
+  editingIndex.value = newIndex
+  Object.assign(ruleForm, rules.value[newIndex])
+}
+
+// 后台配置：上移
+const handleRuleMoveUp = (index) => {
+  if (index <= 0) return
+  ;[rules.value[index - 1], rules.value[index]] = [rules.value[index], rules.value[index - 1]]
+  editingIndex.value = index - 1
+}
+
+// 后台配置：下移
+const handleRuleMoveDown = (index) => {
+  if (index >= rules.value.length - 1) return
+  ;[rules.value[index + 1], rules.value[index]] = [rules.value[index], rules.value[index + 1]]
+  editingIndex.value = index + 1
+}
+
+// 后台配置：保存当前规则
+const handleSaveCurrentRule = () => {
+  const ok = persistRuleForm()
+  if (ok) {
+    ElMessage.success('当前规则已保存')
+  }
+}
+
+// 后台配置：保存全部（本地模拟）
+const handleSaveAllRules = () => {
+  const ok = persistRuleForm()
+  if (!ok) return
+  // TODO: 调用后端保存接口
+  ElMessage.success('全部规则已保存（前端模拟）')
+}
+
+// 后台配置：语法检查
+const handleValidateRule = () => {
+  const ok = tryParseExpr(ruleForm.expr)
+  if (ok) {
+    ElMessage.success('语法检查通过')
+  }
+}
+
+// 构建条件对象（公共函数）
+const buildConditions = () => {
+  const conditions = {}
+  
+  // 年龄条件
+  if (quickGeneratorForm.ageOperator && quickGeneratorForm.ageValue !== null) {
+    conditions.age = `${quickGeneratorForm.ageOperator}${quickGeneratorForm.ageValue}`
+  }
+  
+  // 号别
+  if (quickGeneratorForm.regType) {
+    conditions.regType = quickGeneratorForm.regType
+  }
+  
+  // 科室
+  if (quickGeneratorForm.dept) {
+    conditions.dept = quickGeneratorForm.dept
+  }
+  
+  // 医生
+  if (quickGeneratorForm.doctor) {
+    conditions.doctor = quickGeneratorForm.doctor
+  }
+  
+  // 自定义条件
+  if (quickGeneratorForm.customKey && quickGeneratorForm.customValue) {
+    conditions[quickGeneratorForm.customKey] = quickGeneratorForm.customValue
+  }
+  
+  return conditions
+}
+
+// 预览JSON（计算属性）
+const previewJson = computed(() => {
+  return JSON.stringify(buildConditions(), null, 2)
+})
+
+// 后台配置：快速生成器
+const handleQuickGenerate = () => {
+  // 如果当前表达式不为空，尝试解析并填充表单
+  if (ruleForm.expr) {
+    try {
+      const parsed = JSON.parse(ruleForm.expr)
+      
+      // 解析年龄条件
+      if (parsed.age) {
+        const ageMatch = parsed.age.match(/^(>=|<=|=|>|<)(\d+)$/)
+        if (ageMatch) {
+          quickGeneratorForm.ageOperator = ageMatch[1]
+          quickGeneratorForm.ageValue = parseInt(ageMatch[2])
+        }
+      }
+      
+      // 填充其他字段
+      if (parsed.regType) quickGeneratorForm.regType = parsed.regType
+      if (parsed.dept) quickGeneratorForm.dept = parsed.dept
+      if (parsed.doctor) quickGeneratorForm.doctor = parsed.doctor
+      
+      // 填充自定义字段（排除已知字段）
+      const knownFields = ['age', 'regType', 'dept', 'doctor']
+      for (const key in parsed) {
+        if (!knownFields.includes(key)) {
+          quickGeneratorForm.customKey = key
+          quickGeneratorForm.customValue = parsed[key]
+          break
+        }
+      }
+    } catch (e) {
+      // 如果解析失败，清空表单
+      resetQuickGeneratorForm()
+    }
+  } else {
+    // 如果表达式为空，重置表单
+    resetQuickGeneratorForm()
+  }
+  
+  quickGeneratorDialogVisible.value = true
+}
+
+// 重置快速生成器表单
+const resetQuickGeneratorForm = () => {
+  quickGeneratorForm.ageOperator = null
+  quickGeneratorForm.ageValue = null
+  quickGeneratorForm.regType = null
+  quickGeneratorForm.dept = null
+  quickGeneratorForm.doctor = null
+  quickGeneratorForm.customKey = ''
+  quickGeneratorForm.customValue = ''
+}
+
+// 应用快速生成器生成的JSON
+const handleApplyQuickGenerate = () => {
+  const conditions = buildConditions()
+  
+  // 检查是否至少有一个条件
+  if (Object.keys(conditions).length === 0) {
+    ElMessage.warning('请至少设置一个条件')
+    return
+  }
+  
+  // 应用到规则表单
+  ruleForm.expr = JSON.stringify(conditions, null, 2)
+  
+  // 关闭对话框
+  quickGeneratorDialogVisible.value = false
+  
+  ElMessage.success('条件表达式已生成并应用')
+}
+
+// 后台配置：测试规则（占位）
+const handleTestRule = () => {
+  const ok = tryParseExpr(ruleForm.expr)
+  if (!ok) return
+  ElMessage.info('测试规则功能待接入后端，当前为占位')
+}
+
+// 组件挂载
 onMounted(() => {
-  fetchQueueData()
-  
-  // 定时刷新数据（每30秒）
-  const refreshInterval = setInterval(() => {
-    fetchQueueData()
-  }, 30000)
-  
-  // 组件卸载时清理定时器
-  return () => {
-    clearInterval(refreshInterval)
-  }
+  // 加载就诊科室列表
+  loadDepartmentList()
+  // 初始化：优先从后端加载，失败则回退本地假数据
+  loadDataFromApi()
+  startWaitingTimer()
+})
+
+onUnmounted(() => {
+  stopWaitingTimer()
 })
 </script>
 
 <style lang="scss" scoped>
-.cardiology-queue {
-  .app-container {
-    padding: 20px;
-  }
+.smart-triage-queue {
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f5f5;
+  padding: 20px;
+  box-sizing: border-box;
+  overflow: hidden;
 
-  .card-header {
+  // 顶部标题栏
+  .header-section {
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: flex-start;
+    background-color: #fff;
+    padding: 20px;
+    border-radius: 8px;
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 
-    .title {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333;
+    .header-left {
+      flex: 1;
+      display: flex;
+      align-items: center;
+
+      .title {
+        font-size: 24px;
+        font-weight: bold;
+        color: #333;
+      }
+
+      .header-info {
+        display: flex;
+        gap: 20px;
+        margin-bottom: 10px;
+        font-size: 14px;
+        color: #666;
+
+        .date-info {
+          font-weight: 500;
+        }
+
+        .stat-info {
+          color: #409eff;
+        }
+      }
+
+      .current-call-info {
+        font-size: 16px;
+        color: #333;
+        font-weight: 500;
+      }
     }
 
-    .header-actions {
+    .header-right {
       display: flex;
       gap: 10px;
     }
   }
 
-  .current-call-section {
-    margin: 20px 0;
-    text-align: center;
+  // 主要内容区域
+  .main-content {
+    flex: 1;
+    display: flex;
+    gap: 20px;
+    margin-bottom: 20px;
+    min-height: 0;
 
-    .call-box {
-      display: inline-block;
-      padding: 20px 40px;
-      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-      border-radius: 12px;
-      box-shadow: 0 8px 20px rgba(102, 126, 234, 0.3);
-      animation: pulse 2s infinite;
+    .left-panel,
+    .right-panel {
+      flex: 1;
+      background-color: #fff;
+      border-radius: 8px;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
 
-      .call-text {
-        font-size: 24px;
-        font-weight: bold;
-        color: white;
-        letter-spacing: 2px;
+      .panel-header {
+        padding: 15px 20px;
+        border-bottom: 2px solid #409eff;
+        background-color: #f8f9fa;
 
-        .highlight {
-          color: #ffd700;
-          font-size: 28px;
-          text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
+        .panel-title {
+          font-size: 16px;
+          font-weight: bold;
+          color: #333;
         }
       }
+
+      .table-container {
+        flex: 1;
+        overflow: hidden;
+        padding: 10px;
+      }
+
+      .display-options {
+        padding: 10px 20px;
+        border-top: 1px solid #ebeef5;
+        display: flex;
+        gap: 10px;
+        justify-content: space-between;
+        align-items: center;
+
+        .queue-actions-left {
+          display: flex;
+          gap: 10px;
+        }
+
+        .queue-actions-right {
+          display: flex;
+          gap: 10px;
+        }
+      }
+
+      .candidate-actions {
+        padding: 10px 20px;
+        border-top: 1px solid #ebeef5;
+        display: flex;
+        gap: 10px;
+        justify-content: flex-start;
+      }
     }
   }
 
-  .queue-section {
-    margin-top: 20px;
+  // 底部控制面板
+  .footer-section {
+    background-color: #fff;
+    border-radius: 8px;
+    padding: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 
-    .section-title {
-      font-size: 16px;
-      font-weight: bold;
-      color: #333;
+    .filter-section {
+      margin-bottom: 20px;
+
+      .filter-label {
+        font-size: 14px;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 10px;
+      }
+
+      .filter-select-wrapper {
+        width: 100%;
+      }
+    }
+
+    .call-control-section {
+      margin-bottom: 20px;
+      padding: 15px;
+      background-color: #f8f9fa;
+      border-radius: 6px;
+
+      .call-control-label {
+        font-size: 14px;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 10px;
+      }
+
+      .call-control-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .current-call-display {
+          font-size: 16px;
+          color: #333;
+          font-weight: 500;
+        }
+
+        .control-buttons {
+          display: flex;
+          gap: 10px;
+        }
+      }
+    }
+
+    .led-section {
       margin-bottom: 15px;
-      padding-left: 10px;
-      border-left: 4px solid #667eea;
+      padding: 15px;
+      background-color: #1a1a1a;
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+
+      .led-label {
+        font-size: 14px;
+        color: #fff;
+        font-weight: bold;
+      }
+
+      .led-display {
+        flex: 1;
+        font-size: 20px;
+        color: #00ff00;
+        font-weight: bold;
+        font-family: 'Courier New', monospace;
+        text-shadow: 0 0 10px rgba(0, 255, 0, 0.5);
+      }
     }
 
-    .pagination-wrapper {
-      margin-top: 20px;
+    .voice-section {
       display: flex;
-      justify-content: flex-end;
+      align-items: center;
+      gap: 10px;
+      padding: 10px;
+      background-color: #f0f0f0;
+      border-radius: 6px;
+
+      .voice-label {
+        font-size: 14px;
+        color: #666;
+        font-weight: bold;
+      }
+
+      .voice-text {
+        font-size: 14px;
+        color: #333;
+      }
     }
+
+// 配置弹窗样式
+.config-container {
+  display: flex;
+  gap: 20px;
+  min-height: 500px;
+}
+
+.config-topbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0 12px 0;
+}
+
+.config-topbar-actions {
+  display: flex;
+  gap: 12px;
+}
+
+.config-dialog-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.config-dialog-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333;
+}
+
+.config-left {
+  width: 30%;
+  background: #f8f9fb;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  padding: 12px;
+  box-sizing: border-box;
+}
+
+.rule-card {
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  padding: 14px 14px 12px;
+  margin: 0 6px 14px;
+  background: #fff;
+  cursor: pointer;
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.06);
+  position: relative;
+}
+
+.rule-card.active {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px #409eff22;
+}
+
+.rule-card.active::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 10px;
+  bottom: 10px;
+  width: 4px;
+  background: #409eff;
+  border-radius: 0 4px 4px 0;
+}
+
+.rule-card:hover {
+  border-color: #b3d8ff;
+}
+
+.rule-title {
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+
+.rule-sub {
+  font-size: 12px;
+  color: #666;
+  margin-bottom: 4px;
+}
+
+.rule-actions {
+  display: flex;
+  gap: 6px;
+  margin-top: 6px;
+  padding-top: 8px;
+  border-top: 1px dashed #ebeef5;
+}
+
+.config-right {
+  flex: 1;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  padding: 16px;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.config-form-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+  font-weight: 600;
+}
+
+.config-form-buttons {
+  display: flex;
+  gap: 8px;
+}
+
+.config-inline-actions {
+  display: flex;
+  gap: 12px;
+  padding-left: 110px; // 对齐 label-width
+  margin-top: -6px;
+}
+
+.config-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
+
+.config-fullwidth {
+  width: 100%;
+}
   }
 }
 
-@keyframes pulse {
-  0% {
-    box-shadow: 0 0 0 0 rgba(102, 126, 234, 0.4);
-  }
-  70% {
-    box-shadow: 0 0 0 15px rgba(102, 126, 234, 0);
-  }
-  100% {
-    box-shadow: 0 0 0 0 rgba(102, 126, 234, 0);
+// 表格行样式
+:deep(.calling-row) {
+  background-color: #fffbe6 !important;
+}
+
+:deep(.selected-row) {
+  background-color: #e8f4ff !important;
+}
+
+:deep(.el-table) {
+  .el-table__body {
+    tr.calling-row {
+      background-color: #fffbe6;
+    }
+    tr.selected-row {
+      background-color: #e8f4ff;
+    }
   }
 }
 </style>
-
diff --git a/query_serial_number.sql b/query_serial_number.sql
new file mode 100644
index 00000000..570379f5
--- /dev/null
+++ b/query_serial_number.sql
@@ -0,0 +1,121 @@
+-- ============================================
+-- 查询流水号相关SQL语句
+-- ============================================
+
+-- 1. 查询所有挂号记录的流水号（主键ID）及相关信息
+SELECT 
+    id AS 流水号,
+    display_order AS 就诊序号,
+    bus_no AS 就诊编码,
+    patient_id AS 患者ID,
+    organization_id AS 科室ID,
+    create_time AS 挂号时间,
+    status_enum AS 状态
+FROM adm_encounter
+WHERE delete_flag = '0'
+ORDER BY create_time DESC;
+
+-- 2. 根据流水号（主键ID）查询某条挂号记录的详细信息
+SELECT 
+    e.id AS 流水号,
+    e.display_order AS 就诊序号,
+    e.bus_no AS 就诊编码,
+    p.name AS 患者姓名,
+    p.id_card AS 身份证号,
+    p.phone AS 联系电话,
+    o.name AS 科室名称,
+    pr.name AS 医生姓名,
+    e.create_time AS 挂号时间,
+    e.status_enum AS 状态
+FROM adm_encounter e
+LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
+LEFT JOIN adm_organization o ON e.organization_id = o.id AND o.delete_flag = '0'
+LEFT JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.delete_flag = '0' AND ep.type_code = 'PRF'
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+WHERE e.id = 1234567890123456789  -- 替换为实际的流水号（主键ID）
+  AND e.delete_flag = '0';
+
+-- 3. 根据患者姓名或身份证号查询流水号
+SELECT 
+    e.id AS 流水号,
+    e.display_order AS 就诊序号,
+    p.name AS 患者姓名,
+    p.id_card AS 身份证号,
+    e.create_time AS 挂号时间,
+    o.name AS 科室名称
+FROM adm_encounter e
+LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
+LEFT JOIN adm_organization o ON e.organization_id = o.id AND o.delete_flag = '0'
+WHERE e.delete_flag = '0'
+  AND (p.name LIKE '%张三%' OR p.id_card = '110101199001011234')  -- 替换为实际的患者姓名或身份证号
+ORDER BY e.create_time DESC;
+
+-- 4. 查询当日的挂号记录及流水号
+SELECT 
+    e.id AS 流水号,
+    e.display_order AS 就诊序号,
+    e.bus_no AS 就诊编码,
+    p.name AS 患者姓名,
+    p.id_card AS 身份证号,
+    o.name AS 科室名称,
+    pr.name AS 医生姓名,
+    e.create_time AS 挂号时间,
+    e.status_enum AS 状态
+FROM adm_encounter e
+LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
+LEFT JOIN adm_organization o ON e.organization_id = o.id AND o.delete_flag = '0'
+LEFT JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.delete_flag = '0' AND ep.type_code = 'PRF'
+LEFT JOIN adm_practitioner pr ON ep.practitioner_id = pr.id AND pr.delete_flag = '0'
+WHERE e.delete_flag = '0'
+  AND DATE(e.create_time) = CURRENT_DATE  -- 查询当日
+ORDER BY e.display_order ASC, e.create_time ASC;
+
+-- 5. 查询指定日期范围的挂号记录及流水号
+SELECT 
+    e.id AS 流水号,
+    e.display_order AS 就诊序号,
+    e.bus_no AS 就诊编码,
+    p.name AS 患者姓名,
+    p.id_card AS 身份证号,
+    o.name AS 科室名称,
+    e.create_time AS 挂号时间
+FROM adm_encounter e
+LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
+LEFT JOIN adm_organization o ON e.organization_id = o.id AND o.delete_flag = '0'
+WHERE e.delete_flag = '0'
+  AND e.create_time >= '2024-01-01 00:00:00'  -- 开始时间
+  AND e.create_time <= '2024-01-31 23:59:59'  -- 结束时间
+ORDER BY e.create_time DESC;
+
+-- 6. 查询指定科室的挂号记录及流水号
+SELECT 
+    e.id AS 流水号,
+    e.display_order AS 就诊序号,
+    p.name AS 患者姓名,
+    o.name AS 科室名称,
+    e.create_time AS 挂号时间
+FROM adm_encounter e
+LEFT JOIN adm_patient p ON e.patient_id = p.id AND p.delete_flag = '0'
+LEFT JOIN adm_organization o ON e.organization_id = o.id AND o.delete_flag = '0'
+WHERE e.delete_flag = '0'
+  AND o.name LIKE '%心内科%'  -- 替换为实际的科室名称
+  AND DATE(e.create_time) = CURRENT_DATE
+ORDER BY e.display_order ASC;
+
+-- 7. 统计每日挂号数量及流水号范围
+SELECT 
+    DATE(create_time) AS 日期,
+    COUNT(*) AS 挂号数量,
+    MIN(id) AS 最小流水号,
+    MAX(id) AS 最大流水号,
+    MIN(display_order) AS 最小就诊序号,
+    MAX(display_order) AS 最大就诊序号
+FROM adm_encounter
+WHERE delete_flag = '0'
+GROUP BY DATE(create_time)
+ORDER BY 日期 DESC
+LIMIT 30;  -- 最近30天
+
+
+
+
diff --git a/sql/query_today_outpatient_patients.sql b/sql/query_today_outpatient_patients.sql
new file mode 100644
index 00000000..5aac3e13
--- /dev/null
+++ b/sql/query_today_outpatient_patients.sql
@@ -0,0 +1,224 @@
+-- ============================================
+-- 查询今日门诊患者数据（用于调试分诊排队页面）
+-- 简化版：直接查询，不考虑登录和租户
+-- ============================================
+
+-- 1. 最简单查询：查看今天所有的挂号记录（不关联患者表）
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    enc.start_time AS registerTime,
+    enc.status_enum AS statusEnum,
+    enc.organization_id AS departmentId,
+    enc.tenant_id AS tenantId,
+    enc.delete_flag AS deleteFlag,
+    enc.bus_no AS encounterBusNo
+FROM adm_encounter enc
+WHERE enc.delete_flag = '0'
+  AND enc.start_time::DATE = CURRENT_DATE
+ORDER BY enc.start_time DESC
+LIMIT 100;
+
+-- ============================================
+-- 2. 完整查询：直接查询患者信息（简化版，不考虑租户）
+-- ============================================
+SELECT 
+    enc.id AS encounterId,
+    enc.patient_id AS patientId,
+    pt.name AS patientName,
+    pt.gender_enum AS genderEnum,
+    pt.birth_date AS birthDate,
+    pt.id_card AS idCard,
+    pt.phone AS phone,
+    enc.bus_no AS encounterBusNo,
+    enc.start_time AS registerTime,
+    enc.reception_time AS receptionTime,
+    enc.status_enum AS statusEnum,
+    enc.subject_status_enum AS subjectStatusEnum,
+    CASE 
+        WHEN enc.reception_time IS NOT NULL 
+        THEN EXTRACT(EPOCH FROM (enc.reception_time - enc.start_time)) / 60 
+        ELSE EXTRACT(EPOCH FROM (NOW() - enc.start_time)) / 60 
+    END AS waitingDuration,
+    CASE 
+        WHEN enc.end_time IS NOT NULL AND enc.reception_time IS NOT NULL 
+        THEN EXTRACT(EPOCH FROM (enc.end_time - enc.reception_time)) / 60 
+        ELSE NULL 
+    END AS visitDuration,
+    pt.type_code AS typeCode,
+    enc.important_flag AS importantFlag,
+    -- 医生信息（左关联）
+    ep.practitioner_id AS doctorId
+FROM adm_encounter enc
+INNER JOIN adm_patient pt 
+    ON enc.patient_id = pt.id 
+    AND pt.delete_flag = '0'
+LEFT JOIN adm_encounter_participant ep 
+    ON enc.id = ep.encounter_id 
+    AND ep.type_code = 'admitter' 
+    AND ep.delete_flag = '0'
+WHERE enc.delete_flag = '0'
+  AND enc.start_time::DATE = CURRENT_DATE
+ORDER BY enc.start_time DESC
+LIMIT 10000;
+
+-- ============================================
+-- 3. 检查数据条件：查看可能影响查询结果的数据
+-- ============================================
+
+-- 3.1 检查今天的挂号记录总数
+SELECT 
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS not_deleted_count,
+    COUNT(CASE WHEN delete_flag = '1' THEN 1 END) AS deleted_count
+FROM adm_encounter
+WHERE start_time::DATE = CURRENT_DATE;
+
+-- 3.2 检查不同租户的数据分布
+SELECT 
+    tenant_id,
+    COUNT(*) AS count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS not_deleted_count
+FROM adm_encounter
+WHERE start_time::DATE = CURRENT_DATE
+GROUP BY tenant_id
+ORDER BY tenant_id;
+
+-- 3.3 检查不同状态的数据分布
+SELECT 
+    status_enum,
+    COUNT(*) AS count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS not_deleted_count
+FROM adm_encounter
+WHERE start_time::DATE = CURRENT_DATE
+  AND delete_flag = '0'
+GROUP BY status_enum
+ORDER BY status_enum;
+
+-- 3.4 检查是否有患者数据关联
+SELECT 
+    COUNT(DISTINCT enc.id) AS encounter_count,
+    COUNT(DISTINCT pt.id) AS patient_count,
+    COUNT(DISTINCT CASE WHEN pt.delete_flag = '0' THEN pt.id END) AS patient_not_deleted_count
+FROM adm_encounter enc
+LEFT JOIN adm_patient pt ON enc.patient_id = pt.id
+WHERE enc.start_time::DATE = CURRENT_DATE
+  AND enc.delete_flag = '0';
+
+-- 3.5 检查医生参与信息
+SELECT 
+    COUNT(DISTINCT enc.id) AS encounter_count,
+    COUNT(DISTINCT ep.encounter_id) AS has_doctor_count,
+    COUNT(DISTINCT ep.practitioner_id) AS doctor_count
+FROM adm_encounter enc
+LEFT JOIN adm_encounter_participant ep 
+    ON enc.id = ep.encounter_id 
+    AND ep.type_code = 'admitter' 
+    AND ep.delete_flag = '0'
+WHERE enc.start_time::DATE = CURRENT_DATE
+  AND enc.delete_flag = '0';
+
+-- ============================================
+-- 4. 快速查询：直接查看患者姓名和挂号信息（最简单）
+-- ============================================
+SELECT 
+    enc.id AS 就诊记录ID,
+    pt.name AS 患者姓名,
+    pt.id_card AS 身份证号,
+    pt.phone AS 联系电话,
+    enc.start_time AS 挂号时间,
+    enc.create_time AS 创建时间,
+    enc.status_enum AS 状态,
+    enc.bus_no AS 就诊流水号
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id
+WHERE enc.delete_flag = '0'
+  AND pt.delete_flag = '0'
+  AND enc.start_time::DATE = CURRENT_DATE
+ORDER BY enc.start_time DESC;
+
+-- ============================================
+-- 4.1 使用 create_time 查询（和门诊挂号页面一致）
+-- ============================================
+SELECT 
+    enc.id AS 就诊记录ID,
+    pt.name AS 患者姓名,
+    pt.id_card AS 身份证号,
+    pt.phone AS 联系电话,
+    enc.create_time AS 创建时间,
+    enc.start_time AS 开始时间,
+    enc.status_enum AS 状态,
+    enc.bus_no AS 就诊流水号
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id
+WHERE enc.delete_flag = '0'
+  AND pt.delete_flag = '0'
+  AND enc.create_time::DATE = CURRENT_DATE
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 4.2 完全模拟门诊挂号页面的查询（包含支付状态）
+-- ============================================
+SELECT 
+    enc.id AS 就诊记录ID,
+    pt.name AS 患者姓名,
+    pt.id_card AS 身份证号,
+    pt.phone AS 联系电话,
+    enc.create_time AS 挂号时间,
+    enc.status_enum AS 状态,
+    enc.bus_no AS 就诊流水号,
+    ci.total_price AS 挂号金额,
+    pr.status_enum AS 支付状态
+FROM adm_encounter enc
+INNER JOIN adm_patient pt ON enc.patient_id = pt.id AND pt.delete_flag = '0'
+LEFT JOIN adm_charge_item ci ON enc.id = ci.encounter_id AND ci.delete_flag = '0' AND ci.context_enum = 1
+LEFT JOIN fin_payment_reconciliation pr ON ci.id::TEXT = ANY(string_to_array(pr.charge_item_ids,','))
+    AND pr.delete_flag = '0'
+    AND pr.status_enum = 1
+WHERE enc.delete_flag = '0'
+  AND enc.class_enum = 1  -- 门诊
+  AND enc.create_time::DATE = CURRENT_DATE
+ORDER BY enc.create_time DESC;
+
+-- ============================================
+-- 5. 快速检查：查看最近7天的挂号记录数量（使用 start_time）
+-- ============================================
+SELECT 
+    start_time::DATE AS register_date,
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS not_deleted_count
+FROM adm_encounter
+WHERE start_time::DATE >= CURRENT_DATE - INTERVAL '7 days'
+GROUP BY start_time::DATE
+ORDER BY start_time::DATE DESC;
+
+-- ============================================
+-- 5.1 快速检查：查看最近7天的挂号记录数量（使用 create_time）
+-- ============================================
+SELECT 
+    create_time::DATE AS register_date,
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS not_deleted_count
+FROM adm_encounter
+WHERE create_time::DATE >= CURRENT_DATE - INTERVAL '7 days'
+  AND class_enum = 1  -- 门诊
+GROUP BY create_time::DATE
+ORDER BY create_time::DATE DESC;
+
+-- ============================================
+-- 6. 对比 start_time 和 create_time 的差异
+-- ============================================
+SELECT 
+    id AS 就诊记录ID,
+    start_time AS 开始时间,
+    create_time AS 创建时间,
+    (start_time::DATE) AS 开始日期,
+    (create_time::DATE) AS 创建日期,
+    status_enum AS 状态,
+    delete_flag AS 是否删除
+FROM adm_encounter
+WHERE (start_time::DATE = CURRENT_DATE OR create_time::DATE = CURRENT_DATE)
+  AND delete_flag = '0'
+ORDER BY create_time DESC
+LIMIT 20;
+
diff --git a/排查指南-字段查询问题.md b/排查指南-字段查询问题.md
new file mode 100644
index 00000000..ddebfb9e
--- /dev/null
+++ b/排查指南-字段查询问题.md
@@ -0,0 +1,284 @@
+# 排查指南：字段查询不到数据的问题
+
+## 问题类型
+**症状**：SQL 查询条件使用了某个字段，但查询结果为空，而数据库中明明有数据。
+
+**根本原因**：查询条件使用的字段在数据插入/更新时没有被设置（为 NULL 或默认值）。
+
+---
+
+## 排查步骤
+
+### 第一步：确认字段是否存在
+```sql
+-- 检查表结构，确认字段是否存在
+SELECT column_name, data_type, is_nullable, column_default
+FROM information_schema.columns
+WHERE table_name = 'adm_encounter'
+  AND column_name = 'start_time';
+```
+
+**检查点**：
+- ✅ 字段确实存在
+- ❌ 字段不存在 → 检查字段名拼写、大小写
+
+---
+
+### 第二步：检查字段是否有值
+```sql
+-- 检查字段的实际值
+SELECT 
+    id,
+    start_time,        -- 检查这个字段
+    create_time,       -- 对比其他时间字段
+    status_enum
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND create_time::DATE = CURRENT_DATE  -- 用能查到数据的条件
+LIMIT 10;
+```
+
+**检查点**：
+- ✅ `start_time` 有值 → 继续排查查询条件
+- ❌ `start_time` 为 NULL → **问题确认**：字段没有被设置
+
+---
+
+### 第三步：检查插入/更新代码
+找到创建/更新数据的 Service 方法，检查是否设置了该字段。
+
+**检查位置**：
+1. **Service 实现类**：查找 `save`、`insert`、`update` 相关方法
+2. **Mapper XML**：检查 INSERT/UPDATE 语句
+3. **Entity 类**：检查字段定义和默认值
+
+**示例检查**：
+```java
+// ❌ 错误示例：没有设置 start_time
+Encounter encounter = new Encounter();
+encounter.setBusNo("xxx");
+encounter.setPatientId(123L);
+// 没有 encounter.setStartTime(...)
+iEncounterService.save(encounter);
+
+// ✅ 正确示例：设置了 start_time
+Encounter encounter = new Encounter();
+encounter.setBusNo("xxx");
+encounter.setPatientId(123L);
+encounter.setStartTime(new Date());  // 设置了字段
+iEncounterService.save(encounter);
+```
+
+---
+
+### 第四步：对比能查到数据的方法
+找到系统中**能查到数据**的类似查询，对比差异。
+
+**对比维度**：
+1. **使用的字段**：`start_time` vs `create_time`
+2. **查询条件**：WHERE 子句的差异
+3. **关联表**：是否 JOIN 了其他表
+4. **业务逻辑**：是否过滤了特定状态
+
+**示例对比**：
+```sql
+-- ❌ 查不到数据的方法
+SELECT * FROM adm_encounter
+WHERE start_time::DATE = CURRENT_DATE;  -- start_time 为 NULL
+
+-- ✅ 能查到数据的方法
+SELECT * FROM adm_encounter
+WHERE create_time::DATE = CURRENT_DATE;  -- create_time 有值
+```
+
+---
+
+### 第五步：检查字段的业务含义
+确认字段的**业务含义**和**使用场景**。
+
+**常见情况**：
+- `create_time`：记录创建时间（自动设置）
+- `update_time`：记录更新时间（自动设置）
+- `start_time`：业务开始时间（需要手动设置）
+- `end_time`：业务结束时间（需要手动设置）
+
+**判断规则**：
+- 如果字段是**业务字段**（如 `start_time`），需要手动设置
+- 如果字段是**系统字段**（如 `create_time`），通常自动设置
+
+---
+
+## 调试技巧
+
+### 技巧1：打印 SQL 和参数
+在 Service 方法中添加日志，查看实际执行的 SQL：
+
+```java
+@Override
+public IPage<TodayOutpatientPatientDto> getTodayOutpatientPatients(...) {
+    // 打印查询条件
+    log.info("查询条件: queryDate={}, doctorId={}, departmentId={}", 
+             queryDate, doctorId, departmentId);
+    
+    // 执行查询
+    IPage<TodayOutpatientPatientDto> result = mapper.getTodayOutpatientPatients(...);
+    
+    // 打印结果
+    log.info("查询结果: 总数={}, 记录数={}", 
+             result.getTotal(), result.getRecords().size());
+    
+    return result;
+}
+```
+
+### 技巧2：直接执行 SQL 验证
+在数据库客户端直接执行 SQL，验证查询条件是否正确：
+
+```sql
+-- 1. 先查看数据
+SELECT id, start_time, create_time, status_enum
+FROM adm_encounter
+WHERE delete_flag = '0'
+LIMIT 10;
+
+-- 2. 测试查询条件
+SELECT COUNT(*) 
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND start_time::DATE = CURRENT_DATE;  -- 测试这个条件
+
+-- 3. 对比其他条件
+SELECT COUNT(*) 
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND create_time::DATE = CURRENT_DATE;  -- 对比这个条件
+```
+
+### 技巧3：使用数据库工具检查
+使用数据库管理工具（如 pgAdmin、DBeaver）：
+1. 查看表结构
+2. 查看数据样本
+3. 执行测试查询
+4. 检查字段的 NULL 值比例
+
+---
+
+## 预防措施
+
+### 1. 代码审查检查清单
+在代码审查时，检查以下内容：
+
+- [ ] **插入数据时**：是否设置了所有必要的业务字段？
+- [ ] **查询条件时**：使用的字段是否在插入时被设置？
+- [ ] **字段命名**：是否遵循命名规范（`create_time` vs `start_time`）？
+- [ ] **文档注释**：字段的业务含义是否清晰？
+
+### 2. 单元测试
+编写单元测试，验证字段设置：
+
+```java
+@Test
+public void testSaveEncounter() {
+    Encounter encounter = new Encounter();
+    encounter.setPatientId(123L);
+    encounter.setBusNo("TEST001");
+    // 检查是否设置了 start_time
+    assertNotNull(encounter.getStartTime(), "start_time 应该被设置");
+    
+    Long id = encounterService.saveEncounterByRegister(encounter);
+    
+    // 验证数据库中的值
+    Encounter saved = encounterService.getById(id);
+    assertNotNull(saved.getStartTime(), "数据库中的 start_time 不应该为 NULL");
+}
+```
+
+### 3. 数据库约束
+在数据库层面添加约束，防止 NULL 值：
+
+```sql
+-- 如果 start_time 是必填字段，添加 NOT NULL 约束
+ALTER TABLE adm_encounter 
+ALTER COLUMN start_time SET NOT NULL;
+
+-- 或者添加默认值
+ALTER TABLE adm_encounter 
+ALTER COLUMN start_time SET DEFAULT CURRENT_TIMESTAMP;
+```
+
+### 4. 代码规范
+建立代码规范，明确字段使用规则：
+
+```java
+/**
+ * 保存就诊信息（门诊挂号）
+ * 
+ * 注意：
+ * - create_time: 自动设置（系统字段）
+ * - start_time: 需要手动设置（业务字段，表示就诊开始时间）
+ * - 如果 start_time 为 NULL，查询时使用 create_time 作为挂号时间
+ */
+public Long saveEncounterByRegister(Encounter encounter) {
+    // 如果没有设置 start_time，使用当前时间
+    if (encounter.getStartTime() == null) {
+        encounter.setStartTime(new Date());
+    }
+    // ...
+}
+```
+
+---
+
+## 常见问题模式
+
+### 模式1：时间字段混淆
+- **问题**：使用 `start_time` 查询，但插入时没有设置
+- **解决**：使用 `create_time` 或确保插入时设置 `start_time`
+
+### 模式2：状态字段未设置
+- **问题**：使用 `status_enum` 查询，但插入时使用默认值
+- **解决**：明确设置状态值
+
+### 模式3：关联字段未设置
+- **问题**：使用 `organization_id` 查询，但插入时为 NULL
+- **解决**：确保插入时设置关联字段
+
+---
+
+## 快速排查清单
+
+遇到"查询不到数据"问题时，按以下顺序检查：
+
+1. ✅ **数据库中有数据吗？**
+   ```sql
+   SELECT COUNT(*) FROM adm_encounter WHERE delete_flag = '0';
+   ```
+
+2. ✅ **查询条件使用的字段有值吗？**
+   ```sql
+   SELECT start_time FROM adm_encounter WHERE delete_flag = '0' LIMIT 10;
+   ```
+
+3. ✅ **插入代码设置了该字段吗？**
+   - 查看 Service 的 save/insert 方法
+   - 检查是否调用了 setter 方法
+
+4. ✅ **字段的业务含义是什么？**
+   - 是系统字段（自动设置）还是业务字段（手动设置）？
+
+5. ✅ **有类似功能能查到数据吗？**
+   - 对比能查到数据的方法，找出差异
+
+---
+
+## 总结
+
+**核心原则**：
+1. **先看数据**：检查字段是否有值
+2. **再看代码**：检查插入时是否设置
+3. **对比差异**：找出能查到数据的方法
+4. **验证修复**：修改后验证数据
+
+**记住**：查询条件使用的字段，必须在数据插入/更新时被设置！
+
+

From 3ad32fac9fca51c6a2de1bcbbed633fa7845371a Mon Sep 17 00:00:00 2001
From: huhuihua <huihuahu369@gmail.com>
Date: Tue, 20 Jan 2026 10:02:48 +0800
Subject: [PATCH 10/14] =?UTF-8?q?46=20=E9=97=A8=E8=AF=8A=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E7=AB=99=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-ui-vue3/src/api/system/lisConfig.js   |  33 +
 openhis-ui-vue3/src/api/system/observation.js |  48 ++
 .../src/views/system/user copy/authRole.vue   | 112 ++++
 .../src/views/system/user copy/index.vue      | 621 ++++++++++++++++++
 .../views/system/user copy/profile/index.vue  |  87 +++
 .../system/user copy/profile/resetPwd.vue     |  65 ++
 .../system/user copy/profile/userAvatar.vue   | 171 +++++
 .../system/user copy/profile/userInfo.vue     |  67 ++
 openhis-ui-vue3/test-util-extend.js           |  25 +
 9 files changed, 1229 insertions(+)
 create mode 100644 openhis-ui-vue3/src/api/system/lisConfig.js
 create mode 100644 openhis-ui-vue3/src/api/system/observation.js
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/authRole.vue
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/index.vue
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/profile/index.vue
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue
 create mode 100644 openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue
 create mode 100644 openhis-ui-vue3/test-util-extend.js

diff --git a/openhis-ui-vue3/src/api/system/lisConfig.js b/openhis-ui-vue3/src/api/system/lisConfig.js
new file mode 100644
index 00000000..801a4e04
--- /dev/null
+++ b/openhis-ui-vue3/src/api/system/lisConfig.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function getLisConfigPage(query) {
+  return request({
+    url: '/inspection/lisConfig/init-page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getLisConfigDetail(id) {
+  return request({
+    url: '/inspection/lisConfig/info-detail',
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function getLisConfigList(searchKey, type) {
+  return request({
+    url: '/inspection/lisConfig/init-list',
+    method: 'get',
+    params: { searchKey, type }
+  })
+}
+
+export function saveLisConfig(data) {
+  return request({
+    url: '/inspection/lisConfig/saveAll',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/openhis-ui-vue3/src/api/system/observation.js b/openhis-ui-vue3/src/api/system/observation.js
new file mode 100644
index 00000000..7c1443b2
--- /dev/null
+++ b/openhis-ui-vue3/src/api/system/observation.js
@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+export function getObservationInit() {
+  return request({
+    url: '/inspection/observation/init',
+    method: 'get'
+  })
+}
+
+export function getObservationPage(query) {
+  return request({
+    url: '/inspection/observation/information-page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getObservationOne(id) {
+  return request({
+    url: '/inspection/observation/information-one',
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function addObservation(data) {
+  return request({
+    url: '/inspection/observation/information',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateObservation(data) {
+  return request({
+    url: '/inspection/observation/information',
+    method: 'post',
+    data: data
+  })
+}
+
+export function deleteObservation(ids) {
+  return request({
+    url: '/inspection/observation/information-status',
+    method: 'post',
+    data: { ids, type: '停用' }
+  })
+}
diff --git a/openhis-ui-vue3/src/views/system/user copy/authRole.vue b/openhis-ui-vue3/src/views/system/user copy/authRole.vue
new file mode 100644
index 00000000..6a6cf302
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/authRole.vue	
@@ -0,0 +1,112 @@
+<template>
+   <div class="app-container">
+      <h4 class="form-header h4">基本信息</h4>
+      <el-form :model="form" label-width="80px">
+         <el-row>
+            <el-col :span="8" :offset="2">
+               <el-form-item label="用户昵称" prop="nickName">
+                  <el-input v-model="form.nickName" disabled />
+               </el-form-item>
+            </el-col>
+            <el-col :span="8" :offset="2">
+               <el-form-item label="登录账号" prop="userName">
+                  <el-input v-model="form.userName" disabled />
+               </el-form-item>
+            </el-col>
+         </el-row>
+      </el-form>
+
+      <h4 class="form-header h4">角色信息</h4>
+      <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
+         <el-table-column label="序号" width="55" type="index" align="center">
+            <template #default="scope">
+               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+            </template>
+         </el-table-column>
+         <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+         <el-table-column label="角色编号" align="center" prop="roleId" />
+         <el-table-column label="角色名称" align="center" prop="roleName" />
+         <el-table-column label="权限字符" align="center" prop="roleKey" />
+         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template #default="scope">
+               <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+         </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+
+      <el-form label-width="100px">
+         <div style="text-align: center;margin-left:-120px;margin-top:30px;">
+            <el-button type="primary" @click="submitForm()">提交</el-button>
+            <el-button @click="close()">返回</el-button>
+         </div>
+      </el-form>
+   </div>
+</template>
+
+<script setup name="AuthRole">
+import {getAuthRole, updateAuthRole} from "@/api/system/user copy";
+
+const route = useRoute();
+const { proxy } = getCurrentInstance();
+
+const loading = ref(true);
+const total = ref(0);
+const pageNum = ref(1);
+const pageSize = ref(10);
+const roleIds = ref([]);
+const roles = ref([]);
+const form = ref({
+  nickName: undefined,
+  userName: undefined,
+  userId: undefined
+});
+
+/** 单击选中行数据 */
+function clickRow(row) {
+  proxy.$refs["roleRef"].toggleRowSelection(row);
+};
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  roleIds.value = selection.map(item => item.roleId);
+};
+/** 保存选中的数据编号 */
+function getRowKey(row) {
+  return row.roleId;
+};
+/** 关闭按钮 */
+function close() {
+  const obj = { path: "/system/user" };
+  proxy.$tab.closeOpenPage(obj);
+};
+/** 提交按钮 */
+function submitForm() {
+  const userId = form.value.userId;
+  const rIds = roleIds.value.join(",");
+  updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
+    proxy.$modal.msgSuccess("授权成功");
+    close();
+  });
+};
+
+(() => {
+  const userId = route.params && route.params.userId;
+  if (userId) {
+    loading.value = true;
+    getAuthRole(userId).then(response => {
+      form.value = response.user;
+      roles.value = response.roles;
+      total.value = roles.value.length;
+      nextTick(() => {
+        roles.value.forEach(row => {
+          if (row.flag) {
+            proxy.$refs["roleRef"].toggleRowSelection(row);
+          }
+        });
+      });
+      loading.value = false;
+    });
+  }
+})();
+</script>
diff --git a/openhis-ui-vue3/src/views/system/user copy/index.vue b/openhis-ui-vue3/src/views/system/user copy/index.vue
new file mode 100644
index 00000000..45c6f039
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/index.vue	
@@ -0,0 +1,621 @@
+<template>
+   <div class="app-container">
+      <el-row :gutter="20">
+         <!--部门数据-->
+         <el-col :span="4" :xs="24">
+            <div class="head-container">
+               <el-input
+                  v-model="deptName"
+                  placeholder="请输入部门名称"
+                  clearable
+                  prefix-icon="Search"
+                  style="margin-bottom: 20px"
+               />
+            </div>
+            <div class="head-container">
+               <el-tree
+                  :data="deptOptions"
+                  :props="{ label: 'label', children: 'children' }"
+                  :expand-on-click-node="false"
+                  :filter-node-method="filterNode"
+                  ref="deptTreeRef"
+                  node-key="id"
+                  highlight-current
+                  default-expand-all
+                  @node-click="handleNodeClick"
+               />
+            </div>
+         </el-col>
+         <!--用户数据-->
+         <el-col :span="20" :xs="24">
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+               <el-form-item label="用户名称" prop="userName">
+                  <el-input
+                     v-model="queryParams.userName"
+                     placeholder="请输入用户名称"
+                     clearable
+                     style="width: 240px"
+                     @keyup.enter="handleQuery"
+                  />
+               </el-form-item>
+               <el-form-item label="手机号码" prop="phonenumber">
+                  <el-input
+                     v-model="queryParams.phonenumber"
+                     placeholder="请输入手机号码"
+                     clearable
+                     style="width: 240px"
+                     @keyup.enter="handleQuery"
+                  />
+               </el-form-item>
+               <el-form-item label="状态" prop="status">
+                  <el-select
+                     v-model="queryParams.status"
+                     placeholder="用户状态"
+                     clearable
+                     style="width: 240px"
+                  >
+                     <el-option
+                        v-for="dict in sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                     />
+                  </el-select>
+               </el-form-item>
+               <el-form-item label="创建时间" style="width: 308px;">
+                  <el-date-picker
+                     v-model="dateRange"
+                     value-format="YYYY-MM-DD"
+                     type="daterange"
+                     range-separator="-"
+                     start-placeholder="开始日期"
+                     end-placeholder="结束日期"
+                  ></el-date-picker>
+               </el-form-item>
+               <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+               </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+               <el-col :span="1.5">
+                  <el-button
+                     type="primary"
+                     plain
+                     icon="Plus"
+                     @click="handleAdd"
+                     v-hasPermi="['system:user:add']"
+                  >新增</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button
+                     type="success"
+                     plain
+                     icon="Edit"
+                     :disabled="single"
+                     @click="handleUpdate"
+                     v-hasPermi="['system:user:edit']"
+                  >修改</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button
+                     type="danger"
+                     plain
+                     icon="Delete"
+                     :disabled="multiple"
+                     @click="handleDelete"
+                     v-hasPermi="['system:user:remove']"
+                  >删除</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button
+                     type="info"
+                     plain
+                     icon="Upload"
+                     @click="handleImport"
+                     v-hasPermi="['system:user:import']"
+                  >导入</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button
+                     type="warning"
+                     plain
+                     icon="Download"
+                     @click="handleExport"
+                     v-hasPermi="['system:user:export']"
+                  >导出</el-button>
+               </el-col>
+               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+            </el-row>
+
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+               <el-table-column type="selection" width="50" align="center" />
+               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                  <template #default="scope">
+                     <el-switch
+                        v-model="scope.row.status"
+                        active-value="0"
+                        inactive-value="1"
+                        @change="handleStatusChange(scope.row)"
+                     ></el-switch>
+                  </template>
+               </el-table-column>
+               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+                  <template #default="scope">
+                     <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+               </el-table-column>
+               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+                  <template #default="scope">
+                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+                         <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                     </el-tooltip>
+                  </template>
+               </el-table-column>
+            </el-table>
+            <pagination
+               v-show="total > 0"
+               :total="total"
+               v-model:page="queryParams.pageNum"
+               v-model:limit="queryParams.pageSize"
+               @pagination="getList"
+            />
+         </el-col>
+      </el-row>
+
+      <!-- 添加或修改用户配置对话框 -->
+      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+         <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="用户昵称" prop="nickName">
+                     <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="归属部门" prop="deptId">
+                     <el-tree-select
+                        v-model="form.deptId"
+                        :data="deptOptions"
+                        :props="{ value: 'id', label: 'label', children: 'children' }"
+                        value-key="id"
+                        placeholder="请选择归属部门"
+                        check-strictly
+                     />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="手机号码" prop="phonenumber">
+                     <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="邮箱" prop="email">
+                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="用户性别">
+                     <el-select v-model="form.sex" placeholder="请选择">
+                        <el-option
+                           v-for="dict in sys_user_sex"
+                           :key="dict.value"
+                           :label="dict.label"
+                           :value="dict.value"
+                        ></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="状态">
+                     <el-radio-group v-model="form.status">
+                        <el-radio
+                           v-for="dict in sys_normal_disable"
+                           :key="dict.value"
+                           :label="dict.value"
+                        >{{ dict.label }}</el-radio>
+                     </el-radio-group>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="岗位">
+                     <el-select v-model="form.postIds" multiple placeholder="请选择">
+                        <el-option
+                           v-for="item in postOptions"
+                           :key="item.postId"
+                           :label="item.postName"
+                           :value="item.postId"
+                           :disabled="item.status == 1"
+                        ></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="角色">
+                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                        <el-option
+                           v-for="item in roleOptions"
+                           :key="item.roleId"
+                           :label="item.roleName"
+                           :value="item.roleId"
+                           :disabled="item.status == 1"
+                        ></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="24">
+                  <el-form-item label="备注">
+                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+         </el-form>
+         <template #footer>
+            <div class="dialog-footer">
+               <el-button type="primary" @click="submitForm">确 定</el-button>
+               <el-button @click="cancel">取 消</el-button>
+            </div>
+         </template>
+      </el-dialog>
+
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+         <el-upload
+            ref="uploadRef"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+         >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <template #tip>
+               <div class="el-upload__tip text-center">
+                  <div class="el-upload__tip">
+                     <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  </div>
+                  <span>仅允许导入xls、xlsx格式文件。</span>
+                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+               </div>
+            </template>
+         </el-upload>
+         <template #footer>
+            <div class="dialog-footer">
+               <el-button type="primary" @click="submitFileForm">确 定</el-button>
+               <el-button @click="upload.open = false">取 消</el-button>
+            </div>
+         </template>
+      </el-dialog>
+   </div>
+</template>
+
+<script setup name="User">
+import {getToken} from "@/utils/auth";
+import {
+  addUser,
+  changeUserStatus,
+  delUser,
+  deptTreeSelect,
+  getUser,
+  listUser,
+  resetUserPwd,
+  updateUser
+} from "@/api/system/user copy";
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+
+const userList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const deptName = ref("");
+const deptOptions = ref(undefined);
+const initPassword = ref(undefined);
+const postOptions = ref([]);
+const roleOptions = ref([]);
+/*** 用户导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+});
+// 列显隐信息
+const columns = ref([
+  { key: 0, label: `用户编号`, visible: true },
+  { key: 1, label: `用户名称`, visible: true },
+  { key: 2, label: `用户昵称`, visible: true },
+  { key: 3, label: `部门`, visible: true },
+  { key: 4, label: `手机号码`, visible: true },
+  { key: 5, label: `状态`, visible: true },
+  { key: 6, label: `创建时间`, visible: true }
+]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: undefined,
+    phonenumber: undefined,
+    status: undefined,
+    deptId: undefined
+  },
+  rules: {
+    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
+    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 通过条件过滤节点  */
+const filterNode = (value, data) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+/** 根据名称筛选部门树 */
+watch(deptName, val => {
+  proxy.$refs["deptTreeRef"].filter(val);
+});
+/** 查询部门下拉树结构 */
+function getDeptTree() {
+  deptTreeSelect().then(response => {
+    deptOptions.value = response.data;
+  });
+};
+/** 查询用户列表 */
+function getList() {
+  loading.value = true;
+  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+    loading.value = false;
+    userList.value = res.rows;
+    total.value = res.total;
+  });
+};
+/** 节点单击事件 */
+function handleNodeClick(data) {
+  queryParams.value.deptId = data.id;
+  handleQuery();
+};
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  queryParams.value.deptId = undefined;
+  proxy.$refs.deptTreeRef.setCurrentKey(null);
+  handleQuery();
+};
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const userIds = row.userId || ids.value;
+  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+    return delUser(userIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+};
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("system/user/export", {
+    ...queryParams.value,
+  },`user_${new Date().getTime()}.xlsx`);
+};
+/** 用户状态修改  */
+function handleStatusChange(row) {
+  let text = row.status === "0" ? "启用" : "停用";
+  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+    return changeUserStatus(row.userId, row.status);
+  }).then(() => {
+    proxy.$modal.msgSuccess(text + "成功");
+  }).catch(function () {
+    row.status = row.status === "0" ? "1" : "0";
+  });
+};
+/** 更多操作 */
+function handleCommand(command, row) {
+  switch (command) {
+    case "handleResetPwd":
+      handleResetPwd(row);
+      break;
+    case "handleAuthRole":
+      handleAuthRole(row);
+      break;
+    default:
+      break;
+  }
+};
+/** 跳转角色分配 */
+function handleAuthRole(row) {
+  const userId = row.userId;
+  router.push("/system/user-auth/role/" + userId);
+};
+/** 重置密码按钮操作 */
+function handleResetPwd(row) {
+  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    closeOnClickModal: false,
+    inputPattern: /^.{5,20}$/,
+    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputValidator: (value) => {
+      if (/<|>|"|'|\||\\/.test(value)) {
+        return "不能包含非法字符：< > \" ' \\\ |"
+      }
+    },
+  }).then(({ value }) => {
+    resetUserPwd(row.userId, value).then(response => {
+      proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
+    });
+  }).catch(() => {});
+};
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "用户导入";
+  upload.open = true;
+};
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download("system/user/importTemplate", {
+  }, `user_template_${new Date().getTime()}.xlsx`);
+};
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false;
+  upload.isUploading = false;
+  proxy.$refs["uploadRef"].handleRemove(file);
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+  getList();
+};
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs["uploadRef"].submit();
+};
+/** 重置操作表单 */
+function reset() {
+  form.value = {
+    userId: undefined,
+    deptId: undefined,
+    userName: undefined,
+    nickName: undefined,
+    password: undefined,
+    phonenumber: undefined,
+    email: undefined,
+    sex: undefined,
+    status: "0",
+    remark: undefined,
+    postIds: [],
+    roleIds: []
+  };
+  proxy.resetForm("userRef");
+};
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+};
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  getUser().then(response => {
+    postOptions.value = response.posts;
+    roleOptions.value = response.roles;
+    open.value = true;
+    title.value = "添加用户";
+    form.value.password = initPassword.value;
+  });
+};
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const userId = row.userId || ids.value;
+  getUser(userId).then(response => {
+    form.value = response.data;
+    postOptions.value = response.posts;
+    roleOptions.value = response.roles;
+    form.value.postIds = response.postIds;
+    form.value.roleIds = response.roleIds;
+    open.value = true;
+    title.value = "修改用户";
+    form.password = "";
+  });
+};
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["userRef"].validate(valid => {
+    if (valid) {
+      if (form.value.userId != undefined) {
+        updateUser(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addUser(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+};
+
+getDeptTree();
+getList();
+</script>
diff --git a/openhis-ui-vue3/src/views/system/user copy/profile/index.vue b/openhis-ui-vue3/src/views/system/user copy/profile/index.vue
new file mode 100644
index 00000000..23c6b0e1
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/profile/index.vue	
@@ -0,0 +1,87 @@
+<template>
+   <div class="app-container">
+      <el-row :gutter="20">
+         <el-col :span="6" :xs="24">
+            <el-card class="box-card">
+               <template v-slot:header>
+                 <div class="clearfix">
+                   <span>个人信息</span>
+                 </div>
+               </template>
+               <div>
+                  <div class="text-center">
+                     <userAvatar />
+                  </div>
+                  <ul class="list-group list-group-striped">
+                     <li class="list-group-item">
+                        <svg-icon icon-class="user" />用户名称
+                        <div class="pull-right">{{ state.user.userName }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <svg-icon icon-class="phone" />手机号码
+                        <div class="pull-right">{{ state.user.phonenumber }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <svg-icon icon-class="email" />用户邮箱
+                        <div class="pull-right">{{ state.user.email }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <svg-icon icon-class="tree" />所属部门
+                        <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <svg-icon icon-class="peoples" />所属角色
+                        <div class="pull-right">{{ state.roleGroup }}</div>
+                     </li>
+                     <li class="list-group-item">
+                        <svg-icon icon-class="date" />创建日期
+                        <div class="pull-right">{{ state.user.createTime }}</div>
+                     </li>
+                  </ul>
+               </div>
+            </el-card>
+         </el-col>
+         <el-col :span="18" :xs="24">
+            <el-card>
+               <template v-slot:header>
+                 <div class="clearfix">
+                   <span>基本资料</span>
+                 </div>
+               </template>
+               <el-tabs v-model="activeTab">
+                  <el-tab-pane label="基本资料" name="userinfo">
+                     <userInfo :user="state.user" />
+                  </el-tab-pane>
+                  <el-tab-pane label="修改密码" name="resetPwd">
+                     <resetPwd />
+                  </el-tab-pane>
+               </el-tabs>
+            </el-card>
+         </el-col>
+      </el-row>
+   </div>
+</template>
+
+<script setup name="Profile">
+import userAvatar from "./userAvatar";
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import {getUserProfile} from "@/api/system/user copy";
+
+const activeTab = ref("userinfo");
+const state = reactive({
+  user: {},
+  roleGroup: {},
+  postGroup: {}
+});
+
+function getUser() {
+  getUserProfile().then(response => {
+    state.user = response.data;
+    state.roleGroup = response.roleGroup;
+    state.postGroup = response.postGroup;
+  });
+};
+
+getUser();
+</script>
diff --git a/openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue b/openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue
new file mode 100644
index 00000000..f122bd09
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/profile/resetPwd.vue	
@@ -0,0 +1,65 @@
+<!--
+ * @Author: 徐靖博 xujb@ccjb.com.cn
+ * @Date: 2025-03-26 10:49:30
+ * @LastEditTime: 2025-03-26 13:57:02
+ * @LastEditors: 徐靖博 xujb@ccjb.com.cn
+ * @Description: 
+ * @FilePath: \openhis-ui-vue3\src\views\system\user copy\profile\resetPwd.vue
+-->
+<template>
+   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
+      <el-form-item label="旧密码" prop="oldPassword">
+         <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
+      </el-form-item>
+      <el-form-item label="新密码" prop="newPassword">
+         <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
+      </el-form-item>
+      <el-form-item label="确认密码" prop="confirmPassword">
+         <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      </el-form-item>
+      <el-form-item>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
+      </el-form-item>
+   </el-form>
+</template>
+
+<script setup>
+import {updateUserPwd} from "@/api/system/user copy";
+
+const { proxy } = getCurrentInstance();
+
+const user = reactive({
+  oldPassword: undefined,
+  newPassword: undefined,
+  confirmPassword: undefined
+});
+
+const equalToPassword = (rule, value, callback) => {
+  if (user.newPassword !== value) {
+    callback(new Error("两次输入的密码不一致"));
+  } else {
+    callback();
+  }
+};
+const rules = ref({
+  oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
+  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
+  confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
+});
+
+/** 提交按钮 */
+function submit() {
+  proxy.$refs.pwdRef.validate(valid => {
+    if (valid) {
+      updateUserPwd(user.oldPassword, user.newPassword).then(response => {
+        proxy.$modal.msgSuccess("修改成功");
+      });
+    }
+  });
+};
+/** 关闭按钮 */
+function close() {
+  proxy.$tab.closePage();
+};
+</script>
diff --git a/openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue b/openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue
new file mode 100644
index 00000000..23fe3b9d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/profile/userAvatar.vue	
@@ -0,0 +1,171 @@
+<template>
+  <div class="user-info-head" @click="editCropper()">
+    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            :outputType="options.outputType"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
+          <div class="avatar-upload-preview">
+            <img :src="options.previews.url" :style="options.previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :md="2">
+          <el-upload
+            action="#"
+            :http-request="requestUpload"
+            :show-file-list="false"
+            :before-upload="beforeUpload"
+          >
+            <el-button>
+              选择
+              <el-icon class="el-icon--right"><Upload /></el-icon>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 2 }" :md="2">
+          <el-button icon="Plus" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="Minus" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
+          <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{ span: 2, offset: 6 }" :md="2">
+          <el-button type="primary" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import "vue-cropper/dist/index.css";
+import {VueCropper} from "vue-cropper";
+import {uploadAvatar} from "@/api/system/user copy";
+import useUserStore from "@/store/modules/user";
+
+const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
+
+const open = ref(false);
+const visible = ref(false);
+const title = ref("修改头像");
+
+//图片裁剪数据
+const options = reactive({
+  img: userStore.avatar,     // 裁剪图片的地址
+  autoCrop: true,            // 是否默认生成截图框
+  autoCropWidth: 200,        // 默认生成截图框宽度
+  autoCropHeight: 200,       // 默认生成截图框高度
+  fixedBox: true,            // 固定截图框大小 不允许改变
+  outputType: "png",         // 默认生成截图为PNG格式
+  filename: 'avatar',        // 文件名称
+  previews: {}               //预览数据
+});
+
+/** 编辑头像 */
+function editCropper() {
+  open.value = true;
+}
+/** 打开弹出层结束时的回调 */
+function modalOpened() {
+  visible.value = true;
+}
+/** 覆盖默认上传行为 */
+function requestUpload() {}
+/** 向左旋转 */
+function rotateLeft() {
+  proxy.$refs.cropper.rotateLeft();
+}
+/** 向右旋转 */
+function rotateRight() {
+  proxy.$refs.cropper.rotateRight();
+}
+/** 图片缩放 */
+function changeScale(num) {
+  num = num || 1;
+  proxy.$refs.cropper.changeScale(num);
+}
+/** 上传预处理 */
+function beforeUpload(file) {
+  if (file.type.indexOf("image/") == -1) {
+    proxy.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+  } else {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => {
+      options.img = reader.result;
+      options.filename = file.name;
+    };
+  }
+}
+/** 上传图片 */
+function uploadImg() {
+  proxy.$refs.cropper.getCropBlob(data => {
+    let formData = new FormData();
+    formData.append("avatarfile", data, options.filename);
+    uploadAvatar(formData).then(response => {
+      open.value = false;
+      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
+      userStore.avatar = options.img;
+      proxy.$modal.msgSuccess("修改成功");
+      visible.value = false;
+    });
+  });
+}
+/** 实时预览 */
+function realTime(data) {
+  options.previews = data;
+}
+/** 关闭窗口 */
+function closeDialog() {
+  options.img = userStore.avatar;
+  options.visible = false;
+}
+</script>
+
+<style lang='scss' scoped>
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: "+";
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue b/openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue
new file mode 100644
index 00000000..1710582c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/system/user copy/profile/userInfo.vue	
@@ -0,0 +1,67 @@
+<template>
+   <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="用户昵称" prop="nickName">
+         <el-input v-model="form.nickName" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+         <el-input v-model="form.phonenumber" maxlength="11" />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="email">
+         <el-input v-model="form.email" maxlength="50" />
+      </el-form-item>
+      <el-form-item label="性别">
+         <el-radio-group v-model="form.sex">
+            <el-radio label="0">男</el-radio>
+            <el-radio label="1">女</el-radio>
+         </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
+      </el-form-item>
+   </el-form>
+</template>
+
+<script setup>
+import {updateUserProfile} from "@/api/system/user copy";
+
+const props = defineProps({
+  user: {
+    type: Object
+  }
+});
+
+const { proxy } = getCurrentInstance();
+
+const form = ref({});
+const rules = ref({
+  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+  email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+  phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+});
+
+/** 提交按钮 */
+function submit() {
+  proxy.$refs.userRef.validate(valid => {
+    if (valid) {
+      updateUserProfile(form.value).then(response => {
+        proxy.$modal.msgSuccess("修改成功");
+        props.user.phonenumber = form.value.phonenumber;
+        props.user.email = form.value.email;
+      });
+    }
+  });
+};
+
+/** 关闭按钮 */
+function close() {
+  proxy.$tab.closePage();
+};
+
+// 回显当前登录用户信息
+watch(() => props.user, user => {
+  if (user) {
+    form.value = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
+  }
+},{ immediate: true });
+</script>
diff --git a/openhis-ui-vue3/test-util-extend.js b/openhis-ui-vue3/test-util-extend.js
new file mode 100644
index 00000000..559d5521
--- /dev/null
+++ b/openhis-ui-vue3/test-util-extend.js
@@ -0,0 +1,25 @@
+// 测试util._extend是否存在
+if (typeof process !== 'undefined' && process.versions && process.versions.node) {
+  try {
+    const util = require('util');
+    console.log('util._extend存在吗？', typeof util._extend);
+    if (typeof util._extend === 'function') {
+      console.log('util._extend是一个函数');
+    } else {
+      console.log('util._extend不是一个函数，添加兼容实现');
+      util._extend = function(destination, source) {
+        for (var key in source) {
+          if (source.hasOwnProperty(key)) {
+            destination[key] = source[key];
+          }
+        }
+        return destination;
+      };
+      console.log('兼容实现添加成功');
+    }
+  } catch (e) {
+    console.error('util模块加载失败:', e);
+  }
+} else {
+  console.log('不在Node.js环境中');
+}
\ No newline at end of file

From 46145ff636b531da01eeeb2c4434e885b685f8ec Mon Sep 17 00:00:00 2001
From: sindir <sindirhuang@gmail.com>
Date: Tue, 20 Jan 2026 16:19:54 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-ui-vue3/src/router/index.js           |  26 +++
 .../src/views/system/dict/index.vue           | 160 ++++--------------
 2 files changed, 58 insertions(+), 128 deletions(-)

diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index dada00a9..6092f6d2 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -96,6 +96,32 @@ export const dynamicRoutes = [
             },
         ],
     },
+        // 字典类型路由（直接复制这段）
+    {
+        path: '/system/dict',
+        component: Layout,
+        alwaysShow: true,
+        name: 'DictType',
+        meta: {
+            title: '字典类型管理',
+            icon: 'list' // 图标随便选一个，比如list、dict，不影响跳转
+        },
+        children: [
+            {
+                path: '',
+                component: () => import('@/views/system/dict/index.vue'),
+                name: 'DictTypeList',
+                meta: {title: '字典类型', noCache: false}
+            },
+            {
+                path: 'data/:dictId?', // 带字典ID参数，?表示可选
+                component: () => import('@/views/system/dict/data.vue'), // 你的data.vue路径
+                name: 'DictData',
+                hidden: true, // 不在侧边栏显示（子页面）
+                meta: {title: '字典数据', activeMenu: '/system/dict'} // 保持侧边栏高亮
+            }
+        ]
+    },
 ];
 
 // 合并常量路由和动态路由，确保所有路由都能被访问
diff --git a/openhis-ui-vue3/src/views/system/dict/index.vue b/openhis-ui-vue3/src/views/system/dict/index.vue
index c02555f8..a6db2ff1 100644
--- a/openhis-ui-vue3/src/views/system/dict/index.vue
+++ b/openhis-ui-vue3/src/views/system/dict/index.vue
@@ -1,55 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-      class="query-form"
-    >
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"
+      class="query-form">
       <el-form-item label="字典名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入字典名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="字典类型" prop="dictType">
-        <el-input
-          v-model="queryParams.dictType"
-          placeholder="请输入字典类型"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="字典状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.status" placeholder="字典状态" clearable style="width: 240px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker
-          v-model="dateRange"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item class="search-buttons">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -59,76 +27,34 @@
 
     <el-row :gutter="10" class="button-group">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:dict:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:dict:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:dict:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['system:dict:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['system:dict:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Refresh"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:dict:remove']"
-          >刷新缓存</el-button
-        >
+        <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache"
+          v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div class="table-wrapper">
-      <el-table
-        v-loading="loading"
-        :data="typeList"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字典编号" align="center" prop="dictId" />
-        <el-table-column
-          label="字典名称"
-          align="center"
-          prop="dictName"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
         <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
           <template #default="scope">
-            <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+            <router-link :to="'/system/dict/data/' + scope.row.dictId" class="link-type">
               <span>{{ scope.row.dictType }}</span>
             </router-link>
           </template>
@@ -144,40 +70,18 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          width="160"
-          class-name="small-padding fixed-width"
-        >
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button
-              link
-              type="primary"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:dict:edit']"
-              class="action-button">修改</el-button
-            >
-            <el-button
-              link
-              type="primary"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:dict:remove']"
-              class="action-button">删除</el-button
-            >
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:dict:edit']" class="action-button">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:dict:remove']" class="action-button">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="pagination-container">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
       </div>
     </div>
 
@@ -194,7 +98,7 @@
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
               dict.label
-            }}</el-radio>
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -213,7 +117,7 @@
 
 <script setup name="Dict">
 import useDictStore from '@/store/modules/dict';
-import {addType, delType, getType, listType, refreshCache, updateType,} from '@/api/system/dict/type';
+import { addType, delType, getType, listType, refreshCache, updateType, } from '@/api/system/dict/type';
 
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict('sys_normal_disable');
@@ -336,7 +240,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess('删除成功');
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {

From bc92b9aa629e535999ee8d3d3cccf742f8bda8c4 Mon Sep 17 00:00:00 2001
From: sindir <sindirhuang@gmail.com>
Date: Tue, 20 Jan 2026 16:29:30 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openhis-ui-vue3/src/views/system/dict/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openhis-ui-vue3/src/views/system/dict/index.vue b/openhis-ui-vue3/src/views/system/dict/index.vue
index a6db2ff1..fe0ae606 100644
--- a/openhis-ui-vue3/src/views/system/dict/index.vue
+++ b/openhis-ui-vue3/src/views/system/dict/index.vue
@@ -98,7 +98,7 @@
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
               dict.label
-              }}</el-radio>
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -195,7 +195,7 @@ function handleAdd() {
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.dictId);
-  single.value = selection.length != 1;
+  single.value = selection.length !== 1;
   multiple.value = !selection.length;
 }
 /** 修改按钮操作 */
@@ -212,14 +212,14 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs['dictRef'].validate((valid) => {
     if (valid) {
-      if (form.value.dictId != undefined) {
-        updateType(form.value).then((response) => {
+      if (form.value.dictId !== undefined) {
+        updateType(form.value).then(() => {
           proxy.$modal.msgSuccess('修改成功');
           open.value = false;
           getList();
         });
       } else {
-        addType(form.value).then((response) => {
+        addType(form.value).then(() => {
           proxy.$modal.msgSuccess('新增成功');
           open.value = false;
           getList();

From f6403fa05933147fae93b46c4952b65d5444445e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E7=8B=BB=E7=8C=8A?= <sarem_w@sina.com>
Date: Tue, 20 Jan 2026 17:12:26 +0800
Subject: [PATCH 13/14] =?UTF-8?q?Fix=20=20=E7=A6=85=E9=81=93=20108=20=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E3=80=8B=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE-=E3=80=8B?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=A7=91=E5=AE=A4=E9=85=8D=E7=BD=AE=EF=BC=9A?=
 =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=A1=B9=E7=9B=AE=E3=80=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/basicmanage/implementDepartment/index.vue     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
index 421bb342..aa16cfa1 100644
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -427,11 +427,7 @@ function handleNodeClick(res, node) {
 // 实际的节点点击处理逻辑
 function continueHandleNodeClick(node) {
   // 新增按钮是否 disable
-  if (node.parent === null || node.level === 1) {
-    isAddDisable.value = true;
-  } else {
-    isAddDisable.value = false;
-  }
+  isAddDisable.value = false;
   // 检查节点是否有子节点
   if (node.data.children && node.data.children.length > 0) {
     // proxy.$message.warning("不能选择父节点");

From 6b868e378fb4225f0f3321f0fed20edf57eafd7b Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 20 Jan 2026 17:30:42 +0800
Subject: [PATCH 14/14] =?UTF-8?q?feat(router):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加套餐管理相关路由到公共路由，确保始终可用
- 新增基础管理模块，包含发票管理功能
- 添加系统监控模块，包含操作日志、登录日志、定时任务功能
- 新增系统工具模块，包含代码生成功能
- 扩展系统管理模块，增加租户用户、合同管理、用户角色授权等功能
- 添加字典数据、任务日志、代码生成编辑等隐藏路由
- 统一修复代码格式，调整对象属性间的空格格式
- 完善路由元信息配置，添加权限控制和图标支持
---
 openhis-ui-vue3/src/router/index.js | 180 +++++++++++++++++++++++++++-
 1 file changed, 175 insertions(+), 5 deletions(-)

diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index dada00a9..84a884a8 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -1,4 +1,4 @@
-import {createWebHistory, createRouter} from 'vue-router'
+import { createWebHistory, createRouter } from 'vue-router'
 /* Layout */
 import Layout from '@/layout'
 
@@ -61,7 +61,7 @@ export const constantRoutes = [
                 path: '/index',
                 component: () => import('@/views/index'),
                 name: 'Index',
-                meta: {title: '首页', icon: 'dashboard', affix: true}
+                meta: { title: '首页', icon: 'dashboard', affix: true }
             }
         ]
     },
@@ -75,7 +75,21 @@ export const constantRoutes = [
                 path: 'profile',
                 component: () => import('@/views/system/user/profile/index'),
                 name: 'Profile',
-                meta: {title: '个人中心', icon: 'user'}
+                meta: { title: '个人中心', icon: 'user' }
+            }
+        ]
+    },
+    // 添加套餐管理相关路由到公共路由，确保始终可用
+    {
+        path: '/maintainSystem/Inspection/PackageManagement',
+        component: Layout,
+        hidden: true,
+        children: [
+            {
+                path: '',
+                component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
+                name: 'DirectPackageManagement',
+                meta: { title: '套餐管理' }
             }
         ]
     }
@@ -83,6 +97,162 @@ export const constantRoutes = [
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
+    {
+        path: '/basicmanage',
+        component: Layout,
+        redirect: '/basicmanage/invoice-management',
+        name: 'BasicManage',
+        meta: { title: '基础管理', icon: 'component' },
+        children: [
+            {
+                path: 'invoice-management',
+                component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
+                name: 'invoice-management',
+                meta: { title: '发票管理' }
+            }
+        ]
+    },
+
+    {
+        path: '/system/tenant-user',
+        component: Layout,
+        hidden: true,
+        permissions: ['*:*:*'],
+        children: [
+            {
+                path: 'set/:tenantId(\\d+)',
+                component: () => import('@/views/system/tenant/setUser'),
+                name: 'SetUser',
+                meta: { title: '所属用户', activeMenu: '/system/tenant' }
+            }
+        ]
+    },
+    {
+        path: '/system/tenant-contract',
+        component: Layout,
+        hidden: true,
+        permissions: ['*:*:*'],
+        children: [
+            {
+                path: 'set/:tenantId(\\d+)',
+                component: () => import('@/views/system/tenant/setContract'),
+                name: 'SetContract',
+                meta: { title: '合同管理', activeMenu: '/system/tenant' }
+            }
+        ]
+    },
+    {
+        path: '/system/user-auth',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:user:edit'],
+        children: [
+            {
+                path: 'role/:userId(\\d+)',
+                component: () => import('@/views/system/user/authRole'),
+                name: 'AuthRole',
+                meta: { title: '分配角色', activeMenu: '/system/user' }
+            }
+        ]
+    },
+    {
+        path: '/system/role-auth',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:role:edit'],
+        children: [
+            {
+                path: 'user/:roleId(\\d+)',
+                component: () => import('@/views/system/role/authUser'),
+                name: 'AuthUser',
+                meta: { title: '分配用户', activeMenu: '/system/role' }
+            }
+        ]
+    },
+    {
+        path: '/system/dict-data',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:dict:list'],
+        children: [
+            {
+                path: 'index/:dictId(\\d+)',
+                component: () => import('@/views/system/dict/data'),
+                name: 'Data',
+                meta: { title: '字典数据', activeMenu: '/system/dict' }
+            }
+        ]
+    },
+    {
+        path: '/monitor',
+        component: Layout,
+        redirect: '/monitor/operlog',
+        name: 'Monitor',
+        meta: { title: '系统监控', icon: 'monitor' },
+        children: [
+            {
+                path: 'operlog',
+                component: () => import('@/views/monitor/operlog/index.vue'),
+                name: 'Operlog',
+                meta: { title: '操作日志', icon: 'operlog', permissions: ['monitor:operlog:list'] }
+            },
+            {
+                path: 'logininfor',
+                component: () => import('@/views/monitor/logininfor/index.vue'),
+                name: 'Logininfor',
+                meta: { title: '登录日志', icon: 'logininfor', permissions: ['monitor:logininfor:list'] }
+            },
+            {
+                path: 'job',
+                component: () => import('@/views/monitor/job/index.vue'),
+                name: 'Job',
+                meta: { title: '定时任务', icon: 'job', permissions: ['monitor:job:list'] }
+            }
+        ]
+    },
+    {
+        path: '/tool',
+        component: Layout,
+        redirect: '/tool/gen',
+        name: 'Tool',
+        meta: { title: '系统工具', icon: 'tool' },
+        children: [
+            {
+                path: 'gen',
+                component: () => import('@/views/tool/gen/index.vue'),
+                name: 'Gen',
+                meta: { title: '代码生成', icon: 'gen', permissions: ['tool:gen:list'] }
+            }
+        ]
+    },
+    {
+        path: '/monitor/job-log',
+        component: Layout,
+        hidden: true,
+        permissions: ['monitor:job:list'],
+        children: [
+            {
+                path: 'index/:jobId(\\d+)',
+                component: () => import('@/views/monitor/job/log'),
+                name: 'JobLog',
+                meta: { title: '调度日志', activeMenu: '/monitor/job' }
+            }
+        ]
+    },
+    {
+        path: '/tool/gen-edit',
+        component: Layout,
+        hidden: true,
+        permissions: ['tool:gen:edit'],
+        children: [
+            {
+                path: 'index/:tableId(\\d+)',
+                component: () => import('@/views/tool/gen/editTable'),
+                name: 'GenEdit',
+                meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+            }
+        ]
+    },
     {
         path: '/help-center',
         component: Layout,
@@ -92,7 +262,7 @@ export const dynamicRoutes = [
                 path: '',
                 component: () => import('@/views/helpcenter/index.vue'),
                 name: 'HelpCenter',
-                meta: {title: '帮助中心'},
+                meta: { title: '帮助中心'},
             },
         ],
     },
@@ -115,7 +285,7 @@ const router = createRouter({
         if (savedPosition) {
             return savedPosition
         } else {
-            return {top: 0}
+            return { top: 0 }
         }
     },
 });