From fb9f85e9676fa6314b979cb4099c36b194d867f7 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Thu, 8 Jan 2026 14:52:22 +0800
Subject: [PATCH 1/7] =?UTF-8?q?chore(router):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加患者档案管理路由配置代码
- 注释掉租户用户设置路由部分代码
- 新增patientmgr路由项配置
- 配置路由组件和元信息
- 设置路由隐藏属性
- 完善路由路径和名称定义
---
 openhis-ui-vue3/src/router/index.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index 4bbfba04..806091ac 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -188,6 +188,19 @@ export const dynamicRoutes = [
   //   ]
   // },
   // 租户用户设置路由
+  //{
+  //   path: '/patient',
+  //   component: Layout,
+  //   hidden: true,
+  //   children: [
+  //     {
+  //       path: 'patientmgr',
+  //       component: () => import('@/views/patientmanagement/patientmanagement/index.vue'),
+  //       name: 'Patientmgr',
+  //       meta: { title: '患者档案管理', icon: 'user' }
+  //     }
+  //   ]
+  // },
   {
     path: '/system/tenant-user',
     component: Layout,

From 062c4a92b8bab9a1526fd5818244c374a099746b Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Thu, 8 Jan 2026 14:52:28 +0800
Subject: [PATCH 2/7] =?UTF-8?q?chore(router):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加患者档案管理路由配置代码
- 注释掉租户用户设置路由部分代码
- 新增patientmgr路由项配置
- 配置路由组件和元信息
- 设置路由隐藏属性
- 完善路由路径和名称定义
---
 .../TodayOutpatientPatientList.vue            |  2 +-
 .../todayOutpatient/TodayOutpatientStats.vue  |  2 +-
 .../components/intOperRecordSheet.vue         |  2 +-
 .../inpatientNurse/components/patientList.vue |  2 +-
 openhis-ui-vue3/test-util-extend.js           | 25 -------------------
 5 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 openhis-ui-vue3/test-util-extend.js

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientPatientList.vue b/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientPatientList.vue
index e562e9dc..d69bba5f 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientPatientList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientPatientList.vue
@@ -205,7 +205,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, defineEmits, defineExpose } from 'vue'
+import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { 
   VideoPlay, CircleCheck, Close, View, Delete 
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientStats.vue b/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientStats.vue
index d74cad86..0b7525b3 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientStats.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientStats.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, defineEmits, defineExpose } from 'vue'
+import { ref, onMounted } from 'vue'
 import { User, Clock, VideoPlay, CircleCheck, Timer, Watch } from '@element-plus/icons-vue'
 import { getTodayOutpatientStats } from './api.js'
 
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/intOperRecordSheet.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/intOperRecordSheet.vue
index 416fc596..c1de82fc 100644
--- a/openhis-ui-vue3/src/views/hospitalRecord/components/intOperRecordSheet.vue
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/intOperRecordSheet.vue
@@ -822,7 +822,7 @@
 </template>
 
 <script setup>
-import {defineExpose, reactive, ref} from 'vue';
+import {reactive, ref} from 'vue';
 
 const bodyRef = ref();
 // 响应式表单数据
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue
index 765e350b..0921da1f 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue
@@ -34,7 +34,7 @@
 <script setup>
 import {getPatientList, getWardList} from './api';
 import {updatePatientInfoList} from './store/patient';
-import {defineExpose, inject, nextTick, ref} from 'vue';
+import {inject, nextTick, ref} from 'vue';
 
 const treeRef = ref(null);
 const searchKey = ref('');
diff --git a/openhis-ui-vue3/test-util-extend.js b/openhis-ui-vue3/test-util-extend.js
deleted file mode 100644
index 559d5521..00000000
--- a/openhis-ui-vue3/test-util-extend.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// 测试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 58936c957d4abf2b63349f3d1737dccc607ad729 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Thu, 8 Jan 2026 16:32:45 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix(doctorstation):=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E5=BC=80=E5=85=B7=E5=92=8C=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复医嘱开具时诊断验证警告显示逻辑，支持可选的警告提示
- 修复中医医嘱库存检查条件判断逻辑
- 修复中医医嘱表单验证后数据处理逻辑，添加剂量单位字典值设置
- 优化报告查询处理，独立处理检查和检验报告查询，避免相互影响
- 修复LIS和PACS报告地址配置缺失时的处理逻辑，改为警告而非异常抛出
---
 .../DoctorStationAdviceAppServiceImpl.java    | 12 +++--
 .../prescription/prescriptionlist.vue         | 12 ++---
 .../doctorstation/components/reportQuery.vue  | 22 +++++----
 .../components/tcm/tcmAdvice.vue              | 45 +++++++++++--------
 4 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index 75151c84..282f3fa5 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -959,12 +959,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // LIS查看报告地址
         String lisReportUrl = TenantOptionUtil.getOptionContent(TenantOptionDict.LIS_REPORT_URL);
         if (StringUtils.isEmpty(lisReportUrl)) {
-            throw new ServiceException("租户配置项【LIS查看报告地址】未配置");
+            log.warn("租户配置项【LIS查看报告地址】未配置");
         }
         List<ProofAndTestResultDto> proofResult = doctorStationAdviceAppMapper.getProofAndTestResult(encounterId,
                 RequestStatus.DRAFT.getValue(), ActivityType.PROOF.getValue());
         for (ProofAndTestResultDto proofAndTestResultDto : proofResult) {
-            proofAndTestResultDto.setRequestUrl(lisReportUrl.concat(proofAndTestResultDto.getBusNo()));
+            if (StringUtils.isNotEmpty(lisReportUrl)) {
+                proofAndTestResultDto.setRequestUrl(lisReportUrl.concat(proofAndTestResultDto.getBusNo()));
+            }
         }
 
         return R.ok(proofResult);
@@ -981,12 +983,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // PACS查看报告地址
         String pacsReportUrl = TenantOptionUtil.getOptionContent(TenantOptionDict.PACS_REPORT_URL);
         if (StringUtils.isEmpty(pacsReportUrl)) {
-            throw new ServiceException("租户配置项【PACS查看报告地址】未配置");
+            log.warn("租户配置项【PACS查看报告地址】未配置");
         }
         List<ProofAndTestResultDto> testResult = doctorStationAdviceAppMapper.getProofAndTestResult(encounterId,
                 RequestStatus.DRAFT.getValue(), ActivityType.TEST.getValue());
         for (ProofAndTestResultDto proofAndTestResultDto : testResult) {
-            proofAndTestResultDto.setRequestUrl(pacsReportUrl.concat(proofAndTestResultDto.getBusNo()));
+            if (StringUtils.isNotEmpty(pacsReportUrl)) {
+                proofAndTestResultDto.setRequestUrl(pacsReportUrl.concat(proofAndTestResultDto.getBusNo()));
+            }
         }
         return R.ok(testResult);
     }
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index ee811a9a..6d40b2d2 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1106,7 +1106,7 @@ onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
   // 初始化时自动创建第一个西药处方
   if (westernPrescriptions.value.length === 0) {
-    handleAddPrescription();
+    handleAddPrescription(null, false);
   }
 });
 
@@ -1531,7 +1531,7 @@ function getListInfo(addNewRow) {
       });
       getGroupMarkers(); // 更新标记
       if (props.activeTab == 'prescription' && addNewRow) {
-        handleAddPrescription();
+        handleAddPrescription(null, false);
       }
 
       // 在所有异步操作完成后 resolve Promise
@@ -1595,14 +1595,16 @@ function handleSelectionChange(selection, row) {
 }
 
 // 新增医嘱
-function handleAddPrescription(prescriptionId) {
+function handleAddPrescription(prescriptionId, showWarning = true) {
   // 如果传入了处方ID，先切换到该处方
   if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
     switchToActivePrescription(prescriptionId);
   }
 
   if (diagnosisList.value.length == 0) {
-    proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
+    if (showWarning) {
+      proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
+    }
     return;
   }
   if (isAdding.value) {
@@ -2291,7 +2293,7 @@ function handleSaveSign(row, index, prescriptionId) {
         });
       } else {
         if (prescriptionList.value[0].adviceName) {
-          handleAddPrescription();
+          handleAddPrescription(null, false);
         }
       }
       adviceQueryParams.value.adviceType = undefined;
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue b/openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue
index ea122974..714967b7 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue
@@ -145,14 +145,20 @@ const fetchAll = async () => {
   }
   loadingCheck.value = true;
   loadingInspection.value = true;
-  try {
-    await Promise.all([fetchCheckReport(), fetchInspectionReport()]);
-  } catch (e) {
-    proxy.$modal?.msgError?.(e.message || '查询报告失败');
-  } finally {
-    loadingCheck.value = false;
-    loadingInspection.value = false;
-  }
+  
+  // 独立处理，互不影响
+  const runFetch = async (fn, loadingRef, name) => {
+    try {
+      await fn();
+    } catch (e) {
+      proxy.$modal?.msgError?.(`${name}查询失败: ${e.message || '未知错误'}`);
+    } finally {
+      loadingRef.value = false;
+    }
+  };
+
+  runFetch(fetchCheckReport, loadingCheck, '检查报告');
+  runFetch(fetchInspectionReport, loadingInspection, '检验报告');
 };
 
 const handleRefreshCheck = async () => {
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
index ee7efb64..1d014f9b 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
@@ -893,7 +893,7 @@ function selectAdviceBase(key, row, pIndex) {
   ).chargeItemDefinitionId;
 
   // 库存列表 + 价格列表拼成批次号的下拉框
-  if (row.adviceType != 3) {
+  if (row.adviceType == 1 || row.adviceType == 2) {
     if (row.inventoryList && row.inventoryList.length == 0) {
       prescription.expandOrder = [];
       proxy.$modal.msgWarning('该项目无库存');
@@ -1069,23 +1069,32 @@ function handleSaveSign(row, index, pIndex) {
   const prescription = tcmPrescriptionList.value[pIndex];
   const formRefName = 'formRef' + pIndex + '-' + index;
   proxy.$refs[formRefName][0].validate((valid) => {
-    row.isEdit = false;
-    prescription.isAdding = false;
-    prescription.expandOrder = [];
-    row.contentJson = undefined;
-    row.patientId = props.patientInfo.patientId;
-    row.encounterId = props.patientInfo.encounterId;
-    row.accountId = prescription.accountId;
-    row.quantity = row.minUnitQuantity;
-    row.conditionId = prescription.conditionId;
-    row.unitPrice =
-      row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit'
-        ? row.unitPrice
-        : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2);
-    row.conditionDefinitionId = prescription.conditionDefinitionId;
-    row.encounterDiagnosisId = prescription.encounterDiagnosisId;
-    row.diagnosisName = prescription.diagnosisName;
-    row.contentJson = JSON.stringify(row);
+    if (valid) {
+      row.isEdit = false;
+      prescription.isAdding = false;
+      prescription.expandOrder = [];
+      row.contentJson = undefined;
+      row.patientId = props.patientInfo.patientId;
+      row.encounterId = props.patientInfo.encounterId;
+      row.accountId = prescription.accountId;
+      row.quantity = row.minUnitQuantity;
+      row.chineseHerbsDoseQuantity = prescription.chineseHerbsDoseQuantity;
+      row.unitPrice =
+        row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit'
+          ? row.unitPrice
+          : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2);
+      row.conditionDefinitionId = prescription.conditionDefinitionId;
+      row.encounterDiagnosisId = prescription.encounterDiagnosisId;
+      row.diagnosisName = prescription.diagnosisName;
+
+      // 寻找当前选中的单位字典值
+      const selectedUnit = row.unitCodeList.find((item) => item.value === row.minUnitCode);
+      if (selectedUnit) {
+        row.doseUnitCode_dictText = selectedUnit.label;
+      }
+
+      row.contentJson = JSON.stringify(row);
+    }
   });
 }
 

From 8d62c0461b9d5d607387c1901f2f4390af8fdcd1 Mon Sep 17 00:00:00 2001
From: nanyangbreeze <1955231298@qq.com>
Date: Fri, 9 Jan 2026 10:03:21 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=8C=82=E5=8F=B7=E5=8D=95=E8=A1=A5?=
 =?UTF-8?q?=E6=89=93=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IOutpatientRegistrationAppService.java    |   9 +
 .../OutpatientRegistrationAppServiceImpl.java |  17 +-
 .../OutpatientRegistrationController.java     |  12 +
 .../dto/CurrentDayEncounterDto.java           |   5 +
 .../OutpatientRegistrationAppMapper.xml       |  18 +-
 openhis-ui-vue3/index.html                    |   4 +-
 openhis-ui-vue3/src/main.js                   |   1 +
 .../components/reprintDialog.vue              | 971 ++++++++++++++----
 .../charge/outpatientregistration/index.vue   |  44 +-
 .../components/PackageSettings.vue            |   9 +-
 10 files changed, 857 insertions(+), 233 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
index 528c24d0..2f79e2a8 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
@@ -8,6 +8,7 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 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.paymentmanage.dto.CancelRegPaymentDto;
 
 import javax.servlet.http.HttpServletRequest;
@@ -85,4 +86,12 @@ public interface IOutpatientRegistrationAppService {
      */
     R<?> cancelRegister(Long encounterId);
 
+    /**
+     * 补打挂号
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto);
+
 }
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 17fa7047..e9ddc973 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
@@ -27,6 +27,7 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 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.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
@@ -283,7 +284,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<CurrentDayEncounterDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
+            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name", "identifier_no")),
             request);
 
         // 手动处理 statusEnum 参数（用于过滤退号记录）
@@ -330,4 +331,18 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return R.ok("已取消挂号");
     }
 
+    /**
+     * 补打挂号
+     * 补打挂号不需要修改数据库，只需要返回成功即可，前端已有所有需要的数据用于打印
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    @Override
+    public R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto) {
+        // 补打挂号只是重新打印，不需要修改数据库
+        // 可以在这里添加日志记录补打操作
+        return R.ok(null, "补打挂号成功");
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
index 7733a7f9..7446fe09 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
@@ -8,6 +8,7 @@ import com.openhis.common.enums.PriorityLevel;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto;
+import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 import lombok.AllArgsConstructor;
@@ -151,4 +152,15 @@ public class OutpatientRegistrationController {
         return R.ok(iOutpatientRegistrationAppService.getCurrentDayEncounter(searchKey, pageNo, pageSize, request));
     }
 
+    /**
+     * 补打挂号
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    @PostMapping(value = "/reprint")
+    public R<?> reprintRegistration(@RequestBody ReprintRegistrationDto reprintRegistrationDto) {
+        return iOutpatientRegistrationAppService.reprintRegistration(reprintRegistrationDto);
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
index 6936eb87..d4eee1e3 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
@@ -136,4 +136,9 @@ public class CurrentDayEncounterDto {
      */
     private String phone;
 
+    /**
+     * 就诊卡号
+     */
+    private String identifierNo;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
index b34dea7b..910049ef 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -65,7 +65,8 @@
                T9.charge_item_ids,
                T9.payment_id,
                T9.picture_url,
-               T9.birth_date
+               T9.birth_date,
+               T9.identifier_no
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
@@ -88,7 +89,8 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
-                        T8.birth_date      AS birth_date
+                        T8.birth_date      AS birth_date,
+                        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'
@@ -118,6 +120,18 @@
                                     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'
+                             ) 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'
diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html
index 639db44a..e10c558e 100644
--- a/openhis-ui-vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -13,7 +13,7 @@
     <meta name="author" content="OpenHIS Team" />
     
     <!-- 安全相关 meta 标签 -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://at.alicdn.com; style-src 'self' 'unsafe-inline' https://at.alicdn.com; img-src 'self' data: https: https://at.alicdn.com; font-src 'self' 'unsafe-inline' https://at.alicdn.com data:; connect-src 'self' https://at.alicdn.com http://localhost:* ws://localhost:*;">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://at.alicdn.com; style-src 'self' 'unsafe-inline' https://at.alicdn.com; img-src 'self' data: https: https://at.alicdn.com; font-src 'self' 'unsafe-inline' https://at.alicdn.com data:; connect-src 'self' https://at.alicdn.com http://localhost:* ws://localhost:* ws://127.0.0.1:*;">
     <meta name="referrer" content="no-referrer-when-downgrade">
     
     <!-- 移动端和 PWA 支持 -->
@@ -27,7 +27,7 @@
     <link rel="icon" type="image/png" href="/favicon/favicon-16x16.png" sizes="16x16">
     <link rel="icon" type="image/png" href="/favicon/favicon-32x32.png" sizes="32x32">
     <link rel="icon" type="image/png" href="/favicon/favicon-48x48.png" sizes="48x48">
-    <link rel="manifest" href="/favicon/site.webmanifest">
+    <link rel="manifest" href="/favicon/faviconsite.webmanifest">
     <link rel="icon" type="image/png" href="/favicon/android-chrome-192x192.png" sizes="192x192">
     <link rel="icon" type="image/png" href="/favicon/android-chrome-512x512.png" sizes="512x512">
     <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png">
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index bf9466cd..4b846eee 100644
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -4,6 +4,7 @@ import Cookies from 'js-cookie';
 
 // 导入 hiprint 并挂载到全局 window 对象
 import {hiprint} from 'vue-plugin-hiprint';
+
 import ElementPlus, {ElDialog, ElMessage} from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
 import 'element-plus/dist/index.css';
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
index 529aa9b2..88461f47 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
@@ -1,133 +1,241 @@
 <template>
-  <el-dialog title="补打挂号" v-model="dialogVisible" width="900px" append-to-body destroy-on-close>
-    <div v-loading="loading">
-      <!-- 搜索区域 -->
-      <el-form :model="searchForm" :inline="true" style="margin-bottom: 20px">
-        <el-form-item label="就诊卡号：">
-          <el-input
-            v-model="searchForm.cardNo"
-            placeholder="请输入就诊卡号"
-            style="width: 240px"
-            clearable
-            @keyup.enter="handleSearch"
-          >
-            <template #append>
-              <el-button icon="Search" @click="handleSearch" />
-            </template>
-          </el-input>
-        </el-form-item>
-      </el-form>
+  <el-dialog 
+    title="补打挂号单凭证" 
+    v-model="dialogVisible" 
+    width="900px" 
+    append-to-body 
+    destroy-on-close
+    :close-on-click-modal="false"
+  >
+    <div v-loading="loading" style="background-color: #ffffff; padding: 20px; min-height: 400px;">
+      <!-- 标题区域 -->
+      <div style="text-align: center; margin-bottom: 20px;">
+        <h2 style="color: #ff0000; font-size: 24px; font-weight: bold; margin: 0 0 10px 0;">挂号单重打</h2>
+        <p style="color: #ff0000; font-size: 14px; margin: 0;">补打挂号单将作废原有的挂号单据并生成新的挂号单据</p>
+      </div>
 
-      <!-- 挂号记录列表 -->
-      <el-table
-        v-if="registrationList.length > 0"
-        :data="registrationList"
-        border
-        max-height="300"
-        highlight-current-row
-        @row-click="handleRowClick"
-        style="margin-bottom: 20px"
-      >
-        <el-table-column type="index" label="序号" width="60" align="center" />
-        <el-table-column label="患者姓名" prop="patientName" width="120" align="center" />
-        <el-table-column label="就诊卡号" prop="identifierNo" width="150" align="center">
-          <template #default="scope">
-            <!-- 优化就诊卡号显示，尝试多种可能的字段 -->
-            {{ getCardNoDisplay(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="就诊科室" prop="organizationName" align="center" />
-        <el-table-column label="医生" prop="practitionerName" width="120" align="center" />
-        <el-table-column label="挂号费" prop="price" width="100" align="center">
-          <template #default="scope">
-            {{ (scope.row.price || scope.row.registrationFee) ? parseFloat(scope.row.price || scope.row.registrationFee).toFixed(2) + ' 元' : '0.00 元' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="诊疗费" prop="activityPrice" width="100" align="center">
-          <template #default="scope">
-            {{ (scope.row.activityPrice || scope.row.diagnosisFee) ? parseFloat(scope.row.activityPrice || scope.row.diagnosisFee).toFixed(2) + ' 元' : '0.00 元' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" prop="totalPrice" width="100" align="center">
-          <template #default="scope">
-            {{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) + ' 元' : '0.00 元' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="挂号时间" prop="registerTime" width="180" align="center">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.registerTime) }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-empty v-if="!loading && registrationList.length === 0 && hasSearched" description="未找到挂号记录" />
-
-      <!-- 补打挂号表单 -->
-      <el-divider>补打信息</el-divider>
-      <el-form :model="form" :rules="rules" ref="reprintFormRef" label-width="120px">
-        <el-row :gutter="24">
+      <!-- 表单区域 -->
+      <el-form :model="form" ref="reprintFormRef" label-width="120px" style="background-color: #ffffff; padding: 20px; border-radius: 4px;">
+        <el-row :gutter="30">
+          <!-- 左列 -->
           <el-col :span="12">
-            <el-form-item label="就诊卡号：" prop="cardNo">
-              <el-input v-model="form.cardNo" placeholder="就诊卡号" :disabled="true" />
+            <el-form-item label="病人姓名：" prop="name">
+              <el-input v-model="form.name" placeholder="病人姓名" :disabled="true" />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="姓名：" prop="name">
-              <el-input v-model="form.name" placeholder="姓名" :disabled="true" />
+            <el-form-item label="医生姓名：" prop="practitionerName">
+              <el-input v-model="form.practitionerName" placeholder="医生姓名" :disabled="true" />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="就诊科室：" prop="organizationName">
-              <el-input v-model="form.organizationName" placeholder="就诊科室" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="医生：" prop="practitionerName">
-              <el-input v-model="form.practitionerName" placeholder="医生" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="挂号费：" prop="price">
-              <el-input v-model="form.price" placeholder="挂号费" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
             <el-form-item label="诊疗费：" prop="activityPrice">
               <el-input v-model="form.activityPrice" placeholder="诊疗费" :disabled="true" />
             </el-form-item>
+            <el-form-item label="流水号：" prop="serialNo">
+              <el-input v-model="form.serialNo" placeholder="流水号" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="合计：" prop="totalPrice">
+              <el-input v-model="form.totalPrice" placeholder="合计" :disabled="true" />
+            </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="总金额：" prop="totalPrice">
-              <el-input v-model="form.totalPrice" placeholder="总金额" :disabled="true" />
+          
+          <!-- 右列 -->
+          <el-col :span="12">
+            <el-form-item label="挂号科室：" prop="organizationName">
+              <el-input v-model="form.organizationName" placeholder="挂号科室" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="挂号费：" prop="price">
+              <el-input v-model="form.price" placeholder="挂号费" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="病历费：" prop="medicalRecordFee">
+              <el-input v-model="form.medicalRecordFee" placeholder="病历费" :disabled="true" />
+            </el-form-item>
+            <el-form-item label="打印时间：" prop="printTime">
+              <el-input v-model="form.printTime" placeholder="打印时间" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="就诊时间：" prop="visitTime">
-              <el-date-picker
-                v-model="form.visitTime"
-                type="datetime"
-                placeholder="就诊时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
-                :disabled="true"
-              />
+        
+        <!-- 跨两列的字段 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="预约/挂号时间：" prop="visitTime">
+              <el-input v-model="form.visitTime" placeholder="预约/挂号时间" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="handleSubmit" :disabled="loading || !form.cardNo">确 定</el-button>
-        <el-button @click="handleCancel" :disabled="loading">取 消</el-button>
+
+      <!-- 底部搜索和操作区域 -->
+      <div style="margin-top: 20px; padding: 15px; background-color: #ffffff; border-radius: 4px;">
+        <el-form :inline="true" style="margin: 0;">
+          <el-form-item label="就诊卡号：" style="margin-bottom: 0;">
+            <el-input
+              v-model="searchForm.cardNo"
+              placeholder="请输入就诊卡号检索条"
+              style="width: 300px; margin-right: 10px;"
+              clearable
+              @keyup.enter="handleSearch"
+            />
+            <el-button type="primary" @click="handleSearch" :loading="loading">确认(O)</el-button>
+            <el-button @click="handleCancel">取消(C)</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </template>
+    </div>
+
+    <!-- 挂号记录选择对话框 -->
+    <el-dialog
+      title="挂号记录选择"
+      v-model="selectDialogVisible"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-table
+        :data="recordList"
+        highlight-current-row
+        @current-change="handleRecordSelect"
+        style="width: 100%"
+        max-height="400"
+      >
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="挂号时间" prop="registerTime" width="180" align="center">
+          <template #default="scope">
+            {{ scope.row.registerTime ? parseTime(scope.row.registerTime, '{y}.{m}.{d} {h}时{i}分') : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="挂号科室" prop="organizationName" align="center" />
+        <el-table-column label="医生姓名" prop="practitionerName" align="center" />
+        <el-table-column label="流水号" prop="encounterNo" align="center">
+          <template #default="scope">
+            {{ scope.row.encounterNo || scope.row.visitNo || scope.row.serialNo || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="selectDialogVisible = false">取消(C)</el-button>
+          <el-button type="primary" @click="handleConfirmSelect" :disabled="!selectedRecord">确认(O)</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 打印预览对话框 -->
+    <el-dialog
+      title="打印预览"
+      v-model="printPreviewVisible"
+      width="600px"
+      append-to-body
+      :close-on-click-modal="false"
+      class="print-preview-dialog"
+    >
+      <div id="print-content" class="print-content">
+        <!-- 打印内容 -->
+        <div class="print-header">
+          <div class="reprint-label-left">补打</div>
+          <div class="header-content">
+            <div class="document-title">门诊预约挂号凭条</div>
+            <div class="print-time">打印时间: {{ form.printTime }}</div>
+          </div>
+        </div>
+        
+        <div class="print-section">
+          <div class="section-title">患者基本信息</div>
+          <div class="info-row">
+            <span class="label">患者姓名:</span>
+            <span class="value">{{ form.name || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">门诊号:</span>
+            <span class="value">{{ form.serialNo || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">就诊卡号:</span>
+            <span class="value">{{ form.cardNo || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">身份证号:</span>
+            <span class="value">{{ form.idCard || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">联系电话:</span>
+            <span class="value">{{ form.phone || '-' }}</span>
+          </div>
+        </div>
+
+        <div class="print-section">
+          <div class="section-title">预约详情</div>
+          <div class="info-row">
+            <span class="label">就诊科室:</span>
+            <span class="value">{{ form.organizationName || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">医生姓名:</span>
+            <span class="value">{{ form.practitionerName || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">预约时间:</span>
+            <span class="value">{{ form.visitTime || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">就诊地点:</span>
+            <span class="value">{{ form.visitLocation || '-' }}</span>
+          </div>
+          <div class="info-row">
+            <span class="label">预约状态:</span>
+            <span class="value">{{ form.statusText || '-' }}</span>
+          </div>
+        </div>
+
+        <div class="print-section">
+          <div class="section-title">费用信息</div>
+          <table class="fee-table">
+            <thead>
+              <tr>
+                <th>项目</th>
+                <th>数量</th>
+                <th>单价</th>
+                <th>金额</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>挂号费</td>
+                <td>1</td>
+                <td>¥{{ parseFloat(form.price || 0).toFixed(2) }}</td>
+                <td>¥{{ parseFloat(form.price || 0).toFixed(2) }}</td>
+              </tr>
+              <tr v-if="parseFloat(form.activityPrice || 0) > 0">
+                <td>诊疗费</td>
+                <td>1</td>
+                <td>¥{{ parseFloat(form.activityPrice || 0).toFixed(2) }}</td>
+                <td>¥{{ parseFloat(form.activityPrice || 0).toFixed(2) }}</td>
+              </tr>
+              <tr v-if="parseFloat(form.medicalRecordFee || 0) > 0">
+                <td>病历费</td>
+                <td>1</td>
+                <td>¥{{ parseFloat(form.medicalRecordFee || 0).toFixed(2) }}</td>
+                <td>¥{{ parseFloat(form.medicalRecordFee || 0).toFixed(2) }}</td>
+              </tr>
+            </tbody>
+            <tfoot>
+              <tr>
+                <td colspan="3" class="total-label">合计:</td>
+                <td class="total-value">¥{{ parseFloat(form.totalPrice || 0).toFixed(2) }}</td>
+              </tr>
+            </tfoot>
+          </table>
+        </div>
+
+        <div class="print-footer">
+          <div class="reminder">温馨提示: 请妥善保管此凭条，就诊时请携带。</div>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="printPreviewVisible = false">关闭</el-button>
+          <el-button type="primary" @click="handleBrowserPrint">打印</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </el-dialog>
 </template>
 
@@ -150,9 +258,12 @@ const emit = defineEmits(['close']);
 
 const dialogVisible = ref(false);
 const loading = ref(false);
-const hasSearched = ref(false);
-const registrationList = ref([]);
 const reprintFormRef = ref(null);
+const selectDialogVisible = ref(false);
+const recordList = ref([]);
+const selectedRecord = ref(null);
+const currentRecord = ref(null); // 保存当前选择的记录，用于打印
+const printPreviewVisible = ref(false); // 打印预览对话框显示状态
 
 const searchForm = reactive({
   cardNo: '',
@@ -161,12 +272,19 @@ const searchForm = reactive({
 const form = reactive({
   cardNo: '',
   name: '',
+  idCard: '',
+  phone: '',
   organizationName: '',
   practitionerName: '',
   price: '',
   activityPrice: '',
+  medicalRecordFee: '',
+  serialNo: '',
   totalPrice: '',
   visitTime: '',
+  visitLocation: '',
+  statusText: '',
+  printTime: '',
   encounterId: '',
 });
 
@@ -197,34 +315,7 @@ watch(dialogVisible, (newVal) => {
   }
 });
 
-// 获取就诊卡号用于显示
-function getCardNoDisplay(row) {
-  // 调试信息，打印所有可能的卡号字段
-  console.log('解析卡号字段:', {
-    identifierNo: row.identifierNo,
-    cardNo: row.cardNo,
-    patientId: row.patientId,
-    encounterNo: row.encounterNo,
-    visitNo: row.visitNo,
-    patient: row.patient ? {
-      identifierNo: row.patient.identifierNo,
-      cardNo: row.patient.cardNo
-    } : null
-  });
-  
-  // 尝试所有可能的卡号字段
-  const cardNo = 
-    row.identifierNo || 
-    row.cardNo || 
-    (row.patient && (row.patient.identifierNo || row.patient.cardNo)) ||
-    row.encounterNo ||
-    row.visitNo ||
-    '-';
-  
-  return cardNo;
-}
-
-// 搜索挂号记录
+// 搜索挂号记录并确认补打
 async function handleSearch() {
   if (!searchForm.cardNo) {
     proxy.$modal.msgWarning('请输入就诊卡号');
@@ -232,11 +323,9 @@ async function handleSearch() {
   }
   
   loading.value = true;
-  hasSearched.value = true;
-  registrationList.value = [];
   
   try {
-    // 简化搜索逻辑，直接使用就诊卡号作为searchKey查询
+    // 使用就诊卡号作为searchKey查询
     const endDate = new Date();
     const startDate = new Date();
     startDate.setFullYear(startDate.getFullYear() - 1);
@@ -246,71 +335,173 @@ async function handleSearch() {
       pageSize: 100,
       registerTimeSTime: formatDateStr(startDate, 'YYYY-MM-DD') + ' 00:00:00',
       registerTimeETime: formatDateStr(endDate, 'YYYY-MM-DD') + ' 23:59:59',
-      searchKey: searchForm.cardNo // 直接使用就诊卡号作为搜索关键字
+      searchKey: searchForm.cardNo
     };
     
-    console.log('搜索参数:', queryParams);
-    
     // 调用API查询挂号记录
     const response = await getOutpatientRegistrationCurrent(queryParams);
     
     if (response.code === 200) {
       let records = response.data.records || response.data || [];
       
-      console.log('查询到的挂号记录数量:', records.length);
-      
-      // 记录原始数据用于调试
       if (records.length > 0) {
-        console.log('查询到的记录详情:', records.map(r => ({
-          id: r.id || r.encounterId,
-          identifierNo: r.identifierNo,
-          cardNo: r.cardNo,
-          patientName: r.patientName || r.name,
-          patient: r.patient
-        })));
-      }
-      
-      // 显示所有查询到的记录，不进行严格过滤
-      registrationList.value = records;
-      
-      if (records.length === 0) {
+        if (records.length === 1) {
+          // 只有一条记录，直接使用
+          const row = records[0];
+          currentRecord.value = row; // 保存记录用于打印
+          fillForm(row);
+          await handleSubmit();
+        } else {
+          // 多条记录，显示选择对话框
+          recordList.value = records;
+          selectedRecord.value = records[0]; // 默认选择第一条
+          selectDialogVisible.value = true;
+          loading.value = false;
+        }
+      } else {
         proxy.$modal.msgWarning('未查询到相关挂号记录，请检查就诊卡号是否正确');
+        resetForm();
+        loading.value = false;
       }
     } else {
       proxy.$modal.msgWarning('查询失败: ' + (response.msg || '接口返回异常'));
+      resetForm();
+      loading.value = false;
     }
   } catch (error) {
     console.error('查询挂号记录异常:', error);
     proxy.$modal.msgError('查询出错: ' + (error.message || '网络异常'));
-  } finally {
+    resetForm();
     loading.value = false;
   }
 }
 
-// 点击表格行，自动填充表单
-function handleRowClick(row) {
-  console.log('点击的记录:', row);
+// 填充表单
+function fillForm(row) {
+  console.log('fillForm row:', row); // 调试日志
   
-  // 使用getCardNoDisplay函数获取就诊卡号，确保与表格显示一致
-  const cardNo = getCardNoDisplay(row);
-  form.cardNo = cardNo !== '-' ? cardNo : '';
+  // 就诊卡号 - 从 identifierNo 字段获取
+  form.cardNo = row.identifierNo || row.cardNo || '';
   
-  // 其他表单字段填充
-  form.name = row.patientName || row.name || (row.patient ? row.patient.name : '') || '';
+  // 病人姓名 - 从 patientName 字段获取
+  form.name = row.patientName || row.name || '';
+  
+  // 身份证号 - 从 idCard 字段获取，需要脱敏处理
+  let idCard = row.idCard || '';
+  if (idCard && idCard.length >= 10) {
+    // 只显示前6位和后4位，中间用*代替
+    const prefix = idCard.substring(0, 6);
+    const suffix = idCard.substring(idCard.length - 4);
+    const stars = '*'.repeat(Math.max(0, idCard.length - 10));
+    form.idCard = prefix + stars + suffix;
+  } else if (idCard) {
+    // 如果身份证号长度不足10位，只显示部分并用*代替
+    if (idCard.length >= 6) {
+      const prefix = idCard.substring(0, 3);
+      const suffix = idCard.substring(idCard.length - 1);
+      form.idCard = prefix + '*'.repeat(idCard.length - 4) + suffix;
+    } else {
+      form.idCard = idCard;
+    }
+  } else {
+    form.idCard = '';
+  }
+  
+  // 联系电话 - 从 phone 字段获取，需要脱敏处理
+  let phone = row.phone || '';
+  if (phone && phone.length >= 7) {
+    // 只显示前3位和后4位，中间用*代替
+    const prefix = phone.substring(0, 3);
+    const suffix = phone.substring(phone.length - 4);
+    form.phone = prefix + '****' + suffix;
+  } else if (phone) {
+    // 如果手机号长度不足7位，部分脱敏
+    if (phone.length >= 4) {
+      const prefix = phone.substring(0, 2);
+      const suffix = phone.substring(phone.length - 2);
+      form.phone = prefix + '**' + suffix;
+    } else {
+      form.phone = phone;
+    }
+  } else {
+    form.phone = '';
+  }
+  
+  // 挂号科室 - 从 organizationName 字段获取
   form.organizationName = row.organizationName || '';
+  
+  // 医生姓名 - 从 practitionerName 字段获取
   form.practitionerName = row.practitionerName || '';
   
-  // 价格相关字段
-  form.price = row.price ? parseFloat(row.price).toFixed(2) : (row.registrationFee ? parseFloat(row.registrationFee).toFixed(2) : '0.00');
-  form.activityPrice = row.activityPrice ? parseFloat(row.activityPrice).toFixed(2) : (row.diagnosisFee ? parseFloat(row.diagnosisFee).toFixed(2) : '0.00');
-  form.totalPrice = row.totalPrice ? parseFloat(row.totalPrice).toFixed(2) : '0.00';
+  // 挂号费 - 如果没有单独的 price，将 totalPrice 作为挂号费
+  // 实际系统中，可能需要查询更详细的费用明细
+  form.price = row.price ? parseFloat(row.price).toFixed(2) : 
+               (row.totalPrice ? parseFloat(row.totalPrice).toFixed(2) : '0.00');
   
-  // 就诊时间设置为当前时间
-  const now = new Date();
-  form.visitTime = formatDateTime(now);
+  // 诊疗费 - API 未返回，暂时设为 0.00
+  form.activityPrice = row.activityPrice ? parseFloat(row.activityPrice).toFixed(2) : '0.00';
+  
+  // 病历费 - API 未返回，暂时设为 0.00
+  form.medicalRecordFee = row.medicalRecordFee ? parseFloat(row.medicalRecordFee).toFixed(2) : '0.00';
+  
+  // 流水号 - 使用 encounterId 的后3位，如果为空则生成001-999的序列号
+  let serialNo = '';
+  if (row.encounterId) {
+    // 使用 encounterId 的后3位作为流水号
+    const idStr = String(row.encounterId);
+    const lastThree = idStr.slice(-3);
+    const num = parseInt(lastThree) || 0;
+    serialNo = String((num % 999) + 1).padStart(3, '0');
+  } else {
+    // 如果 encounterId 为空，生成一个001-999的序列号
+    const timestamp = Date.now();
+    const serial = (timestamp % 999) + 1;
+    serialNo = String(serial).padStart(3, '0');
+  }
+  form.serialNo = serialNo;
+  
+  // 合计 - 优先使用 totalPrice，否则计算各项费用之和
+  if (row.totalPrice) {
+    form.totalPrice = parseFloat(row.totalPrice).toFixed(2);
+  } else {
+    const total = parseFloat(form.price || 0) + parseFloat(form.activityPrice || 0) + parseFloat(form.medicalRecordFee || 0);
+    form.totalPrice = total.toFixed(2);
+  }
+  
+  // 预约/挂号时间 - 从 registerTime 字段获取
+  if (row.registerTime) {
+    form.visitTime = parseTime(row.registerTime, '{y}-{m}-{d} {h}:{i}:{s}');
+  } else {
+    form.visitTime = formatDateTime(new Date());
+  }
+  
+  // 就诊地点 - 暂时设为空，后续可根据实际需求填充
+  form.visitLocation = row.visitLocation || row.locationName || '';
+  
+  // 预约状态 - 从 statusEnum_enumText 字段获取，如果没有则根据 statusEnum 判断
+  if (row.statusEnum_enumText) {
+    form.statusText = row.statusEnum_enumText;
+  } else if (row.statusEnum !== undefined) {
+    // 根据 statusEnum 判断状态
+    // 状态枚举可能需要根据实际情况调整
+    const statusMap = {
+      1: '已预约',
+      2: '已完成',
+      3: '已取消',
+      4: '进行中'
+    };
+    form.statusText = statusMap[row.statusEnum] || '已预约';
+  } else {
+    form.statusText = '已预约';
+  }
+  
+  // 打印时间（当前时间）
+  form.printTime = formatDateTime(new Date());
+  
+  // 保存encounterId用于提交 - 注意字段名是 encounterId
   form.encounterId = row.encounterId || row.id || '';
   
-  console.log('填充的表单数据:', form);
+  console.log('fillForm form:', form); // 调试日志
 }
 
 // 格式化日期时间
@@ -325,43 +516,62 @@ function formatDateTime(date) {
 }
 
 // 提交补打挂号
-function handleSubmit() {
-  reprintFormRef.value.validate((valid) => {
-    if (valid) {
-      loading.value = true;
-      const submitData = {
-        encounterId: form.encounterId,
-        cardNo: form.cardNo,
-        name: form.name,
-        organizationName: form.organizationName,
-        practitionerName: form.practitionerName,
-        price: parseFloat(form.price),
-        activityPrice: parseFloat(form.activityPrice),
-        totalPrice: parseFloat(form.totalPrice),
-        visitTime: form.visitTime,
-      };
-      reprintRegistration(submitData)
-        .then((res) => {
-          if (res.code === 200) {
-            proxy.$modal.msgSuccess('补打挂号成功');
-            emit('close', 'success');
-            dialogVisible.value = false;
-          } else {
-            proxy.$modal.msgError(res.msg || '补打挂号失败');
-          }
-        })
-        .catch((error) => {
-          console.error('补打挂号失败:', error);
-          proxy.$modal.msgError('补打挂号失败');
-        })
-        .finally(() => {
-          loading.value = false;
-        });
+async function handleSubmit() {
+  if (!form.encounterId) {
+    proxy.$modal.msgWarning('请先搜索并选择挂号记录');
+    loading.value = false;
+    return;
+  }
+  
+  try {
+    // 如果 reprintFormRef 不存在，跳过验证
+    let valid = true;
+    if (reprintFormRef.value) {
+      valid = await reprintFormRef.value.validate().catch(() => false);
     }
-  });
+    if (!valid) {
+      loading.value = false;
+      return;
+    }
+    
+    // 在提交前，验证表单数据是否已正确填充
+    console.log('handleSubmit form before submit:', form); // 调试日志
+    
+    const submitData = {
+      encounterId: form.encounterId,
+      cardNo: form.cardNo,
+      name: form.name,
+      organizationName: form.organizationName,
+      practitionerName: form.practitionerName,
+      price: parseFloat(form.price) || 0,
+      activityPrice: parseFloat(form.activityPrice) || 0,
+      medicalRecordFee: parseFloat(form.medicalRecordFee || 0),
+      totalPrice: parseFloat(form.totalPrice) || 0,
+      visitTime: form.visitTime,
+    };
+    
+    console.log('handleSubmit submitData:', submitData); // 调试日志
+    
+    const res = await reprintRegistration(submitData);
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess('补打挂号成功');
+      
+      // 不关闭补打对话框，直接显示打印预览
+      // 这样可以确保 form 数据不会丢失
+      loading.value = false;
+      showPrintPreview();
+    } else {
+      proxy.$modal.msgError(res.msg || '补打挂号失败');
+      loading.value = false;
+    }
+  } catch (error) {
+    console.error('补打挂号失败:', error);
+    proxy.$modal.msgError('补打挂号失败: ' + (error.message || '未知错误'));
+    loading.value = false;
+  }
 }
 
-// 取消
+// 取消（实际执行提交操作，因为确认按钮触发搜索）
 function handleCancel() {
   dialogVisible.value = false;
 }
@@ -371,12 +581,19 @@ function resetForm() {
   Object.assign(form, {
     cardNo: '',
     name: '',
+    idCard: '',
+    phone: '',
     organizationName: '',
     practitionerName: '',
     price: '',
     activityPrice: '',
+    medicalRecordFee: '',
+    serialNo: '',
     totalPrice: '',
     visitTime: '',
+    visitLocation: '',
+    statusText: '',
+    printTime: '',
     encounterId: '',
   });
   if (reprintFormRef.value) {
@@ -387,14 +604,328 @@ function resetForm() {
 // 重置搜索
 function resetSearch() {
   searchForm.cardNo = '';
-  registrationList.value = [];
-  hasSearched.value = false;
 }
+
+// 显示打印预览
+function showPrintPreview() {
+  // 直接使用浏览器打印预览，避免 hiprint 连接错误
+  // 因为 hiprint 需要本地服务运行，如果服务未运行会导致连接失败
+  // 确保 loading 已关闭
+  loading.value = false;
+  
+  // 验证表单数据是否已正确填充
+  console.log('showPrintPreview form:', form); // 调试日志
+  console.log('showPrintPreview currentRecord:', currentRecord.value); // 调试日志
+  
+  // 如果 form 的关键字段为空，尝试从 currentRecord 重新填充
+  if (!form.name && currentRecord.value) {
+    console.log('重新填充表单数据...');
+    fillForm(currentRecord.value);
+  }
+  
+  // 显示打印预览对话框
+  printPreviewVisible.value = true;
+}
+
+// 浏览器打印
+function handleBrowserPrint() {
+  const printContent = document.getElementById('print-content');
+  if (!printContent) {
+    proxy.$modal.msgError('打印内容不存在');
+    return;
+  }
+  
+  // 创建新窗口用于打印
+  const printWindow = window.open('', '_blank');
+  if (!printWindow) {
+    proxy.$modal.msgError('无法打开打印窗口，请检查浏览器弹窗设置');
+    return;
+  }
+  
+  // 写入打印内容
+  printWindow.document.write(`
+    <!DOCTYPE html>
+    <html>
+    <head>
+      <meta charset="UTF-8">
+      <title>门诊预约挂号凭条</title>
+      <style>
+        body {
+          font-family: Arial, sans-serif;
+          padding: 20px;
+          margin: 0;
+        }
+        .print-header {
+          margin-bottom: 20px;
+          position: relative;
+        }
+        .reprint-label-left {
+          position: absolute;
+          top: 0;
+          left: 0;
+          color: red;
+          font-size: 16px;
+          font-weight: bold;
+        }
+        .header-content {
+          text-align: center;
+        }
+        .document-title {
+          font-size: 16px;
+          font-weight: bold;
+          margin-bottom: 10px;
+        }
+        .print-time {
+          font-size: 12px;
+          color: #666;
+          text-align: right;
+        }
+        .print-section {
+          margin-bottom: 20px;
+        }
+        .section-title {
+          font-size: 14px;
+          font-weight: bold;
+          margin-bottom: 10px;
+          border-bottom: 1px solid #ddd;
+          padding-bottom: 5px;
+        }
+        .info-row {
+          margin-bottom: 8px;
+          font-size: 13px;
+        }
+        .label {
+          display: inline-block;
+          width: 100px;
+          font-weight: bold;
+        }
+        .value {
+          display: inline-block;
+        }
+        .fee-table {
+          width: 100%;
+          border-collapse: collapse;
+          margin-top: 10px;
+        }
+        .fee-table th,
+        .fee-table td {
+          border: 1px solid #ddd;
+          padding: 8px;
+          text-align: left;
+        }
+        .fee-table th {
+          background-color: #f5f5f5;
+          font-weight: bold;
+        }
+        .total-label {
+          font-weight: bold;
+          text-align: right;
+        }
+        .total-value {
+          font-weight: bold;
+          color: red;
+        }
+        .print-footer {
+          margin-top: 20px;
+          font-size: 12px;
+          color: #666;
+        }
+        @media print {
+          body {
+            padding: 0;
+          }
+        }
+      </style>
+    </head>
+    <body>
+      ${printContent.innerHTML}
+    </body>
+    </html>
+  `);
+  
+  printWindow.document.close();
+  
+  // 等待内容加载完成后打印
+  printWindow.onload = function() {
+    setTimeout(() => {
+      printWindow.print();
+      // 打印后关闭窗口（可选）
+      // printWindow.close();
+    }, 250);
+  };
+}
+
+// 选择挂号记录
+function handleRecordSelect(row) {
+  selectedRecord.value = row;
+}
+
+// 确认选择记录
+async function handleConfirmSelect() {
+  if (!selectedRecord.value) {
+    proxy.$modal.msgWarning('请选择一条挂号记录');
+    return;
+  }
+  
+  loading.value = true;
+  selectDialogVisible.value = false;
+  
+  try {
+    // 保存当前记录，用于打印
+    currentRecord.value = selectedRecord.value;
+    
+    // 填充表单 - 确保数据正确填充
+    fillForm(selectedRecord.value);
+    
+    // 等待一小段时间，确保 form 数据已更新
+    await new Promise(resolve => setTimeout(resolve, 50));
+    
+    // 验证表单数据是否已正确填充
+    if (!form.encounterId) {
+      proxy.$modal.msgError('获取挂号记录ID失败，请重试');
+      loading.value = false;
+      return;
+    }
+    
+    // 提交补打操作（handleSubmit 内部会管理 loading 状态）
+    await handleSubmit();
+  } catch (error) {
+    console.error('确认选择记录失败:', error);
+    proxy.$modal.msgError('处理失败: ' + (error.message || '未知错误'));
+    loading.value = false;
+  }
+}
+
 </script>
 
 <style scoped>
-.dialog-footer {
+/* 确保对话框内容区域的背景色 */
+:deep(.el-dialog__body) {
+  padding: 0;
+  background-color: #ffffff;
+}
+
+/* 输入框样式 */
+:deep(.el-input__inner) {
+  background-color: #ffffff;
+}
+
+/* 标签样式 */
+:deep(.el-form-item__label) {
+  font-weight: normal;
+  color: #333;
+}
+
+/* 打印预览对话框样式 */
+.print-preview-dialog {
+  :deep(.el-dialog__body) {
+    padding: 20px;
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+}
+
+.print-content {
+  background: white;
+  padding: 20px;
+  font-family: Arial, sans-serif;
+}
+
+.print-header {
+  margin-bottom: 20px;
+  position: relative;
+}
+
+.reprint-label-left {
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: red;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.header-content {
+  text-align: center;
+}
+
+.document-title {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.print-time {
+  font-size: 12px;
+  color: #666;
   text-align: right;
 }
-</style>
 
+.print-section {
+  margin-bottom: 20px;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 5px;
+}
+
+.info-row {
+  margin-bottom: 8px;
+  font-size: 13px;
+}
+
+.info-row .label {
+  display: inline-block;
+  width: 100px;
+  font-weight: bold;
+}
+
+.info-row .value {
+  display: inline-block;
+}
+
+.fee-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 10px;
+}
+
+.fee-table th,
+.fee-table td {
+  border: 1px solid #ddd;
+  padding: 8px;
+  text-align: left;
+}
+
+.fee-table th {
+  background-color: #f5f5f5;
+  font-weight: bold;
+}
+
+.total-label {
+  font-weight: bold;
+  text-align: right;
+}
+
+.total-value {
+  font-weight: bold;
+  color: red;
+}
+
+.print-footer {
+  margin-top: 20px;
+  font-size: 12px;
+  color: #666;
+}
+
+.reminder {
+  text-align: center;
+  padding: 10px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 2001d9b4..0de63a26 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -4,9 +4,9 @@
       <el-col :span="24" class="card-box">
         <el-card>
           <template #header>
-            <div style="display: flex; align-items: center; justify-content: space-between; width: 100%">
-              <span style="vertical-align: middle; font-size: 16px; font-weight: bold;">门诊挂号</span>
-              <div class="header-buttons">
+            <div style="display: flex; align-items: center; width: 100%">
+              <span style="font-size: 16px; font-weight: bold; margin-right: 20px;">门诊挂号</span>
+              <div style="flex: 1; display: flex; justify-content: center; align-items: center;">
                 <el-button type="primary" icon="Document" @click="goToPatientRecord" size="small">档案</el-button>
                 <el-button type="primary" icon="Plus" @click="handleAddPatient" size="small">新建</el-button>
                 <el-button type="primary" plain icon="Search" @click="handleSearch" size="small">查询</el-button>
@@ -420,6 +420,16 @@
               prop="genderEnum_enumText"
             />
             <el-table-column label="联系电话" align="center" key="phone" prop="phone" />
+            <el-table-column
+              label="就诊卡号"
+              align="center"
+              key="identifierNo"
+              width="150"
+            >
+              <template #default="scope">
+                {{ scope.row.identifierNo || scope.row.cardNo || scope.row.card || scope.row.patientCardNo || scope.row.patient?.identifierNo || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column
               label="科室名称"
               align="center"
@@ -593,6 +603,18 @@
       :chargeItemIds="chargeItemIdList"
       :eventType="eventType"
     />
+    <ReprintDialog
+      :open="openReprintDialog"
+      @close="
+        (value) => {
+          if (value == 'success') {
+            proxy.$modal.msgSuccess('操作成功');
+            getList();
+          }
+          openReprintDialog = false;
+        }
+      "
+    />
   </div>
 </template>
 
@@ -617,6 +639,7 @@ import patientList from './components/patientList';
 import {nextTick, onMounted, onUnmounted, ref} from 'vue';
 import ChargeDialog from './components/chargeDialog.vue';
 import RefundDialog from './components/refundDialog.vue';
+import ReprintDialog from './components/reprintDialog.vue';
 import {handleColor} from '@/utils/his';
 import useUserStore from '@/store/modules/user';
 import {formatDateStr} from '@/utils/index';
@@ -709,7 +732,6 @@ const data = reactive({
     contractNo: [{ required: true, message: '费用性质', trigger: 'blur' }],
     patientId: [{ required: true, message: '病人不能为空', trigger: 'blur' }],
     priorityEnum: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
-    serviceTypeId: [{ required: true, message: '挂号类型不能为空', trigger: 'blur' }],
     organizationId: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
     orgId: [{ required: true, message: '就诊科室不能为空', trigger: 'blur' }],
     practitionerId: [{ required: true, message: '医生不能为空', trigger: 'blur' }],
@@ -1026,10 +1048,18 @@ function getList() {
     outpatientRegistrationList.value = res.data.records;
     total.value = res.data.total;
     
-    // 调试：查看返回的数据结构（仅退号记录查询时）
-    if (queryType.value === 'returned' && res.data.records && res.data.records.length > 0) {
-      console.log('退号记录数据结构:', res.data.records[0]);
+    // 调试：查看返回的数据结构，查找就诊卡号字段
+    if (res.data.records && res.data.records.length > 0) {
+      console.log('当日已挂号数据结构:', res.data.records[0]);
       console.log('所有字段:', Object.keys(res.data.records[0]));
+      // 查找可能的就诊卡号字段
+      const firstRecord = res.data.records[0];
+      const possibleCardFields = ['identifierNo', 'cardNo', 'card', 'patientCardNo', 'identifier', 'medicalCardNo'];
+      possibleCardFields.forEach(field => {
+        if (firstRecord[field] !== undefined) {
+          console.log(`找到可能的就诊卡号字段 ${field}:`, firstRecord[field]);
+        }
+      });
     }
   });
 }
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
index 3faf153f..776e2f8e 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
@@ -1144,6 +1144,7 @@ async function handleSave() {
       remark: formData.remark || '',
       createDate: formData.createDate,
       items: detailData.value.map((item, index) => ({
+        // 基本字段（与检查套餐 CheckPackageDetail 对应）
         itemCode: item.code || '',
         itemName: item.itemName || '',
         checkItemId: item.itemId || null,
@@ -1157,7 +1158,13 @@ async function handleSave() {
         serviceCharge: parseFloat(item.serviceCharge) || 0,
         total: parseFloat(item.total) || 0,
         origin: item.origin || '',
-        orderNum: index + 1
+        orderNum: index + 1,
+        // 兼容字段（部分日志/历史代码使用的命名：dosage/route/serviceFee/totalAmount）
+        // 后端当前不会用到这些别名字段，但保留便于排查和兼容
+        dosage: item.dose || '',
+        route: item.method || '',
+        serviceFee: parseFloat(item.serviceCharge) || 0,
+        totalAmount: parseFloat(item.total) || 0
       }))
     }
     

From 8c74d4533259dad1e5dfbc4a0c0b065e4d57d52a Mon Sep 17 00:00:00 2001
From: ljj <35349321@qq.com>
Date: Fri, 9 Jan 2026 11:33:03 +0800
Subject: [PATCH 5/7] =?UTF-8?q?76=20=E9=97=A8=E8=AF=8A=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=8C=82=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .trae/documents/plan_20251231_062502.md       |   26 +
 .trae/documents/plan_20251231_063300.md       |   30 +
 .trae/documents/修复号源列表显示问题.md       |   32 +
 .../修复门诊预约界面专家号查询问题.md         |   23 +
 .../修复门诊预约界面只显示1条数据的问题.md    |   23 +
 CheckTicketStatus.java                        |   33 +
 create_clinical_ticket_table.sql              |   67 +
 .../com/core/common/utils/SecurityUtils.java  |   19 +
 .../framework/aspectj/TransactionAspect.java  |   31 +-
 .../appservice/ITicketAppService.java         |   62 +
 .../appservice/impl/TicketAppServiceImpl.java |  363 ++++
 .../controller/TicketController.java          |  101 +
 .../web/appointmentmanage/dto/TicketDto.java  |  102 +
 .../openhis/common/aspectj/OperLogAspect.java |    2 +-
 .../openhis/common/enums/AssignSeqEnum.java   |   10 +-
 .../com/openhis/clinical/domain/Order.java    |   68 +
 .../com/openhis/clinical/domain/Ticket.java   |  107 +
 .../openhis/clinical/mapper/OrderMapper.java  |   35 +
 .../openhis/clinical/mapper/TicketMapper.java |   82 +
 .../clinical/service/IOrderService.java       |   37 +
 .../clinical/service/ITicketService.java      |  105 +
 .../service/impl/OrderServiceImpl.java        |  164 ++
 .../service/impl/TicketServiceImpl.java       |  267 +++
 .../resources/mapper/clinical/OrderMapper.xml |  270 +++
 .../mapper/clinical/TicketMapper.xml          |  245 +++
 openhis-server-new/start.bat                  |   10 +
 openhis-server-new/start.sh                   |   13 +
 .../src/api/appoinmentmanage/ticket.js        |   57 +
 .../src/components/TopNav/index.vue           |  129 +-
 .../layout/components/Sidebar/SidebarItem.vue |    2 +-
 .../src/layout/components/Sidebar/index.vue   |    4 +-
 openhis-ui-vue3/src/router/index.js           |  434 ++--
 openhis-ui-vue3/src/store/modules/user.js     |   17 +-
 .../src/views/appoinmentmanage/index.vue      | 1681 +++++++++++++++
 .../outpatientAppointment/index.vue           | 1845 +++++++++++++++++
 .../views/appoinmentmanage/ticketManage.vue   | 1638 +++++++++++++++
 package-lock.json                             |  289 ++-
 package.json                                  |    5 +
 .../202512301200add_table_order_main.sql      |  115 +
 .../202512301200verify_order_main.sql         |   51 +
 .../门诊预约测试数据使用指南.md               |  202 ++
 迁移记录-DB变更记录/门诊预约测试数据插入.sql  |   89 +
 42 files changed, 8627 insertions(+), 258 deletions(-)
 create mode 100644 .trae/documents/plan_20251231_062502.md
 create mode 100644 .trae/documents/plan_20251231_063300.md
 create mode 100644 .trae/documents/修复号源列表显示问题.md
 create mode 100644 .trae/documents/修复门诊预约界面专家号查询问题.md
 create mode 100644 .trae/documents/修复门诊预约界面只显示1条数据的问题.md
 create mode 100644 CheckTicketStatus.java
 create mode 100644 create_clinical_ticket_table.sql
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java
 create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
 create mode 100644 openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml
 create mode 100644 openhis-server-new/start.bat
 create mode 100644 openhis-server-new/start.sh
 create mode 100644 openhis-ui-vue3/src/api/appoinmentmanage/ticket.js
 create mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/index.vue
 create mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
 create mode 100644 openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue
 create mode 100644 package.json
 create mode 100644 迁移记录-DB变更记录/202512301200add_table_order_main.sql
 create mode 100644 迁移记录-DB变更记录/202512301200verify_order_main.sql
 create mode 100644 迁移记录-DB变更记录/门诊预约测试数据使用指南.md
 create mode 100644 迁移记录-DB变更记录/门诊预约测试数据插入.sql

diff --git a/.trae/documents/plan_20251231_062502.md b/.trae/documents/plan_20251231_062502.md
new file mode 100644
index 00000000..227560de
--- /dev/null
+++ b/.trae/documents/plan_20251231_062502.md
@@ -0,0 +1,26 @@
+# 修复门诊预约界面专家号查询结果显示问题
+
+## 问题分析
+1. 前端传递的参数正确：`type=expert`，后端正确转换为`ticketType=专家`
+2. 实际查询返回了5条记录，但COUNT查询只返回了1条记录
+3. 这导致前端只显示了1条记录，而不是全部5条
+4. 原因：MyBatis-Plus自动生成的COUNT查询和实际查询使用了不同的条件，特别是逻辑删除条件
+
+## 解决方案
+1. 修改TicketMapper.xml中的自定义COUNT查询，显式添加`delete_flag = '0'`条件
+2. 在selectTicketPage和selectTicketPage_mpCount查询中都添加逻辑删除条件
+3. 确保两个查询使用完全相同的WHERE条件
+
+## 修复步骤
+1. 修改`selectTicketPage`查询，添加逻辑删除条件`and delete_flag = '0'`
+2. 修改`selectTicketPage_mpCount`查询，添加逻辑删除条件`and delete_flag = '0'`
+3. 确保两个查询的WHERE条件完全一致
+4. 测试修复后的功能，确保专家号能正确显示全部5条记录
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml`
+- 查询：`selectTicketPage` 和 `selectTicketPage_mpCount`
+- 修改内容：添加逻辑删除条件`and delete_flag = '0'`
+
+## 预期效果
+修复后，COUNT查询和实际查询将使用完全相同的条件，包括逻辑删除条件，从而确保COUNT查询返回正确的总记录数，前端能显示所有5条专家号记录。
\ No newline at end of file
diff --git a/.trae/documents/plan_20251231_063300.md b/.trae/documents/plan_20251231_063300.md
new file mode 100644
index 00000000..775f8451
--- /dev/null
+++ b/.trae/documents/plan_20251231_063300.md
@@ -0,0 +1,30 @@
+# 修复门诊预约界面专家号查询COUNT结果不正确问题
+
+## 问题分析
+1. 前端传递的参数正确：`type=expert`，后端正确转换为`ticketType=专家`
+2. COUNT查询和实际查询的WHERE条件完全相同：`WHERE delete_flag = '0' AND ticket_type = '专家'`
+3. 但COUNT查询只返回1条记录，而实际查询返回5条记录
+4. 原因：MyBatis-Plus的分页插件在处理自定义COUNT查询时，存在bug，导致COUNT查询结果不正确
+
+## 解决方案
+修改`TicketAppServiceImpl.java`中的`listTicket`方法，不使用MyBatis-Plus的自动分页功能，而是手动实现分页查询：
+1. 直接调用`ticketService.countTickets`方法获取总记录数
+2. 手动构建查询条件
+3. 确保COUNT查询和实际查询使用完全相同的条件
+
+## 修复步骤
+1. 修改`TicketAppServiceImpl.java`中的`listTicket`方法
+2. 手动实现分页查询，包括：
+   - 构建查询条件
+   - 调用`countTickets`获取总记录数
+   - 调用`selectTicketList`获取分页数据
+   - 手动组装分页结果
+3. 测试修复后的功能，确保专家号能正确显示全部5条记录
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
+- 方法：`listTicket`
+- 修改内容：替换MyBatis-Plus的自动分页，改为手动分页实现
+
+## 预期效果
+修复后，COUNT查询和实际查询将使用完全相同的条件，COUNT查询将返回正确的总记录数（5条），前端能显示所有5条专家号记录。
\ No newline at end of file
diff --git a/.trae/documents/修复号源列表显示问题.md b/.trae/documents/修复号源列表显示问题.md
new file mode 100644
index 00000000..78a1672b
--- /dev/null
+++ b/.trae/documents/修复号源列表显示问题.md
@@ -0,0 +1,32 @@
+## 问题分析
+根据日志和代码分析，发现号源列表显示"没有更多数据了"的问题原因：
+
+1. **后端查询正常**：成功查询到5条符合条件的专家号源记录
+2. **数据转换失败**：在`convertToDto`方法中，`fee`字段类型转换错误
+3. **响应返回空列表**：由于转换异常，最终返回给前端的号源列表为空
+
+## 问题根源
+- `Ticket`实体类的`fee`字段为**BigDecimal类型**（数据库存储）
+- `TicketDto`类的`fee`字段为**String类型**（前端展示）
+- 在`convertToDto`方法中，直接将BigDecimal类型的`fee`赋值给String类型的`fee`，导致**ClassCastException**
+
+## 修复方案
+修改`TicketAppServiceImpl.java`文件中的`convertToDto`方法，将BigDecimal类型的`fee`转换为String类型：
+
+```java
+// 原代码
+dto.setFee(ticket.getFee());
+
+// 修复后代码
+dto.setFee(ticket.getFee().toString());
+```
+
+## 预期效果
+1. 修复后，后端能成功将`Ticket`实体转换为`TicketDto`
+2. 前端能接收到包含5条专家号源的完整列表
+3. 页面显示正常，不再出现"没有更多数据了"的提示
+
+## 验证方法
+1. 重新启动项目，访问号源管理页面
+2. 选择"专家号"类型，查看是否能正确显示5条号源记录
+3. 检查日志，确认没有类型转换异常
\ No newline at end of file
diff --git a/.trae/documents/修复门诊预约界面专家号查询问题.md b/.trae/documents/修复门诊预约界面专家号查询问题.md
new file mode 100644
index 00000000..cec0f1fd
--- /dev/null
+++ b/.trae/documents/修复门诊预约界面专家号查询问题.md
@@ -0,0 +1,23 @@
+# 修复门诊预约界面专家号查询问题
+
+## 问题分析
+从日志中发现关键问题：
+- 前端传递的ticket_type值是英文：`general` (普通号) 和 `expert` (专家号)
+- 数据库中存储的ticket_type值是中文：`普通` 和 `专家`
+- 导致查询条件不匹配，无法查询到数据
+
+## 解决方案
+需要在后端添加类型映射转换，将前端传递的英文类型转换为数据库中存储的中文类型。
+
+## 修复步骤
+1. 修改 `TicketAppServiceImpl.java` 文件，在处理type参数时添加映射转换逻辑
+2. 添加从英文类型到中文类型的映射关系
+3. 测试修复后的功能，确保普通号和专家号都能正确查询
+
+## 代码修改点
+- 文件：`d:/work/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
+- 方法：`listTicket` 中的type参数处理部分
+- 修改内容：添加类型映射转换，将 "general" 转换为 "普通"，"expert" 转换为 "专家"
+
+## 预期效果
+修复后，前端选择"普通号"或"专家号"时，系统能正确查询到对应的号源数据，不再出现"没有更多数据了"的提示。
\ No newline at end of file
diff --git a/.trae/documents/修复门诊预约界面只显示1条数据的问题.md b/.trae/documents/修复门诊预约界面只显示1条数据的问题.md
new file mode 100644
index 00000000..bed87c23
--- /dev/null
+++ b/.trae/documents/修复门诊预约界面只显示1条数据的问题.md
@@ -0,0 +1,23 @@
+**问题分析**：
+后端返回的响应格式是`{code: 200, msg: "操作成功", data: {total: 5, limit: 20, page: 1, list: [5条记录]}}`，而前端可能期望直接访问`list`属性，导致只能显示1条数据。
+
+**修复方案**：
+
+1. 修改`TicketAppServiceImpl.java`的`listTicket`方法，确保返回的分页数据格式正确
+2. 调整响应结构，使其更符合前端期望
+3. 保持与现有代码的兼容性
+
+**修改点**：
+
+* `TicketAppServiceImpl.java`：优化`listTicket`方法的响应格式
+
+* 确保分页信息和列表数据都能正确返回给前端
+
+**预期效果**：
+
+* 后端返回正确格式的响应数据
+
+* 前端能够正确显示所有5条专家号数据
+
+* 保持与现有代码的兼容性
+
diff --git a/CheckTicketStatus.java b/CheckTicketStatus.java
new file mode 100644
index 00000000..b4994dfe
--- /dev/null
+++ b/CheckTicketStatus.java
@@ -0,0 +1,33 @@
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class CheckTicketStatus {
+    public static void main(String[] args) {
+        String url = "jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8";
+        String user = "postgresql";
+        String password = "Jchl1528";
+        
+        try {
+            Class.forName("org.postgresql.Driver");
+            Connection conn = DriverManager.getConnection(url, user, password);
+            Statement stmt = conn.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT id, status, delete_flag FROM clinical_ticket WHERE id = 1");
+            
+            if (rs.next()) {
+                System.out.println("Ticket ID: " + rs.getLong("id"));
+                System.out.println("Status: " + rs.getString("status"));
+                System.out.println("Delete Flag: " + rs.getString("delete_flag"));
+            } else {
+                System.out.println("Ticket ID 1 not found");
+            }
+            
+            rs.close();
+            stmt.close();
+            conn.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/create_clinical_ticket_table.sql b/create_clinical_ticket_table.sql
new file mode 100644
index 00000000..5bc614cb
--- /dev/null
+++ b/create_clinical_ticket_table.sql
@@ -0,0 +1,67 @@
+-- 创建序列
+CREATE SEQUENCE "hisdev"."clinical_ticket_id_seq"
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 1
+  CACHE 1;
+
+-- 创建号源表clinical_ticket
+CREATE TABLE "hisdev"."clinical_ticket" (
+  "id" bigint NOT NULL DEFAULT nextval('hisdev.clinical_ticket_id_seq'::regclass),
+  "bus_no" varchar(50) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "department" varchar(100) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "doctor" varchar(100) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "ticket_type" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "time" varchar(50) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "status" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 'unbooked'::character varying,
+  "fee" varchar(20) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "patient_id" bigint,
+  "patient_name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "medical_card" varchar(50) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "phone" varchar(20) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "appointment_date" timestamptz(6),
+  "appointment_time" timestamptz(6),
+  "department_id" bigint,
+  "doctor_id" bigint,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "update_time" timestamptz(6),
+  "remark" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "tenant_id" bigint NOT NULL,
+  PRIMARY KEY ("id")
+)
+WITH (
+  OIDS = FALSE
+)
+;
+
+ALTER SEQUENCE "hisdev"."clinical_ticket_id_seq" OWNED BY "hisdev"."clinical_ticket"."id";
+
+-- 添加注释
+COMMENT ON TABLE "hisdev"."clinical_ticket" IS '号源管理表';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."id" IS 'ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."bus_no" IS '号源编码';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."department" IS '科室名称';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."doctor" IS '医生姓名';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."ticket_type" IS '号源类型 (普通/专家)';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."time" IS '挂号时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."status" IS '状态 (unbooked:未预约, booked:已预约, checked:已取号, cancelled:已取消, locked:已锁定)';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."fee" IS '挂号费';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."patient_id" IS '患者ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."patient_name" IS '患者姓名';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."medical_card" IS '就诊卡号';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."phone" IS '手机号';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."appointment_date" IS '预约日期';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."appointment_time" IS '预约时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."department_id" IS '科室ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."doctor_id" IS '医生ID';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."create_by" IS '创建人';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."create_time" IS '创建时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."update_by" IS '更新人';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."update_time" IS '更新时间';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."remark" IS '备注';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."delete_flag" IS '删除状态';
+COMMENT ON COLUMN "hisdev"."clinical_ticket"."tenant_id" IS '租户ID';
\ No newline at end of file
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
index b6814bf6..f9aa9398 100644
--- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java
@@ -76,6 +76,25 @@ public class SecurityUtils {
         }
     }
 
+    /**
+     * 安全获取用户名（失败时返回默认值）
+     **/
+    public static String getUsernameSafe() {
+        try {
+            Authentication authentication = getAuthentication();
+            if (authentication != null && authentication.getPrincipal() != null) {
+                if (authentication.getPrincipal() instanceof LoginUser) {
+                    return ((LoginUser) authentication.getPrincipal()).getUsername();
+                } else {
+                    return authentication.getPrincipal().toString();
+                }
+            }
+        } catch (Exception e) {
+            // 静默处理异常，返回默认值
+        }
+        return "anonymous";
+    }
+
     /**
      * 获取Authentication
      */
diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
index 1a7e711d..62ea4237 100644
--- a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
@@ -11,9 +11,10 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 /**
  * 事务处理
+ * 已注释：与 @Transactional 注解冲突，导致事务回滚错误
  */
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class TransactionAspect {
 
     private final PlatformTransactionManager transactionManager;
@@ -23,19 +24,19 @@ public class TransactionAspect {
         this.transactionManager = transactionManager;
     }
 
-    @Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
+    //@Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
     public void beginTransaction() {
         TransactionStatus status = transactionManager.getTransaction(new DefaultTransactionDefinition());
         transactionStatus.set(status);
     }
 
-    @AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
+    //@AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)")
     public void commitTransaction() {
         TransactionStatus status = transactionStatus.get();
         if (status != null && !status.isCompleted()) {
@@ -44,11 +45,11 @@ public class TransactionAspect {
         }
     }
 
-    @AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
-            "@annotation(org.springframework.web.bind.annotation.DeleteMapping)",
-            throwing = "ex")
+    //@AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.GetMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.PutMapping) || " +
+    //        "@annotation(org.springframework.web.bind.annotation.DeleteMapping)",
+    //        throwing = "ex")
     public void rollbackTransaction(Exception ex) {
         TransactionStatus status = transactionStatus.get();
         if (status != null && !status.isCompleted()) {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java
new file mode 100644
index 00000000..dab4ddc9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java
@@ -0,0 +1,62 @@
+package com.openhis.web.appointmentmanage.appservice;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.web.appointmentmanage.dto.TicketDto;
+
+import java.util.Map;
+
+/**
+ * 号源管理应用服务接口
+ *
+ * @author system
+ */
+public interface ITicketAppService {
+
+    /**
+     * 查询号源列表
+     *
+     * @param params 查询参数
+     * @return 号源列表
+     */
+    R<?> listTicket(Map<String, Object> params);
+
+    /**
+     * 预约号源
+     *
+     * @param params 预约参数
+     * @return 结果
+     */
+    R<?> bookTicket(Map<String, Object> params);
+
+    /**
+     * 取消预约
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    R<?> cancelTicket(Long ticketId);
+
+    /**
+     * 取号
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    R<?> checkInTicket(Long ticketId);
+
+    /**
+     * 停诊
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    R<?> cancelConsultation(Long ticketId);
+    
+    /**
+     * 查询所有号源（用于测试）
+     *
+     * @return 所有号源列表
+     */
+    R<?> listAllTickets();
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
new file mode 100644
index 00000000..21a8c7cf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
@@ -0,0 +1,363 @@
+package com.openhis.web.appointmentmanage.appservice.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.clinical.domain.Ticket;
+import com.openhis.clinical.service.ITicketService;
+import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
+import com.openhis.web.appointmentmanage.dto.TicketDto;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 号源管理应用服务实现类
+ *
+ * @author system
+ */
+@Service
+public class TicketAppServiceImpl implements ITicketAppService {
+
+    @Resource
+    private ITicketService ticketService;
+    
+    @Resource
+    private IPatientService patientService;
+
+    /**
+     * 查询号源列表
+     *
+     * @param params 查询参数
+     * @return 号源列表
+     */
+    @Override
+    public R<?> listTicket(Map<String, Object> params) {
+        // 调试日志：打印所有参数
+        System.out.println("=== listTicket方法收到的所有参数：===");
+        for (Map.Entry<String, Object> entry : params.entrySet()) {
+            System.out.println(entry.getKey() + ": " + entry.getValue());
+        }
+        System.out.println("=================================");
+        // 构建查询条件
+        Ticket ticket = new Ticket();
+        // 设置查询参数
+        // 处理日期参数
+        if (params.containsKey("date")) {
+            String date = (String) params.get("date");
+            try {
+                // 将日期字符串转换为Date类型，设置到appointmentDate字段
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Date appointmentDate = sdf.parse(date);
+                ticket.setAppointmentDate(appointmentDate);
+                System.out.println("设置的appointmentDate：" + appointmentDate);
+            } catch (Exception e) {
+                // 日期格式错误，忽略该参数
+                System.out.println("日期格式错误，忽略该参数：" + date + "，错误信息：" + e.getMessage());
+            }
+        }
+        // 处理状态参数
+        if (params.containsKey("status")) {
+            String status = (String) params.get("status");
+            System.out.println("接收到的status参数：" + status);
+            if (!"all".equals(status) && !"全部".equals(status)) {
+                // 将中文状态转换为英文状态
+                if ("未预约".equals(status)) {
+                    ticket.setStatus("unbooked");
+                } else if ("已预约".equals(status)) {
+                    ticket.setStatus("booked");
+                } else if ("已取号".equals(status)) {
+                    ticket.setStatus("checked");
+                } else if ("已取消".equals(status)) {
+                    ticket.setStatus("cancelled");
+                } else if ("已锁定".equals(status)) {
+                    ticket.setStatus("locked");
+                } else {
+                    ticket.setStatus(status);
+                }
+                System.out.println("设置的status：" + ticket.getStatus());
+            }
+        }
+        if (params.containsKey("name")) {
+            String name = (String) params.get("name");
+            ticket.setPatientName(name);
+        }
+        if (params.containsKey("card")) {
+            String card = (String) params.get("card");
+            ticket.setMedicalCard(card);
+        }
+        if (params.containsKey("phone")) {
+            String phone = (String) params.get("phone");
+            ticket.setPhone(phone);
+        }
+        if (params.containsKey("type")) {
+            String type = (String) params.get("type");
+            System.out.println("前端传递的type参数值：" + type);
+            if (!"all".equals(type)) {
+                // 类型映射转换：前端传递英文类型，数据库存储中文类型
+                if ("general".equals(type)) {
+                    ticket.setTicketType("普通");
+                } else if ("expert".equals(type)) {
+                    ticket.setTicketType("专家");
+                } else if ("普通".equals(type)) {
+                    ticket.setTicketType("普通");
+                } else if ("专家".equals(type)) {
+                    ticket.setTicketType("专家");
+                } else {
+                    ticket.setTicketType(type);
+                }
+                System.out.println("转换后的ticketType值：" + ticket.getTicketType());
+            }
+        }
+
+        // 手动实现分页查询，避免MyBatis-Plus自动COUNT查询的问题
+        int pageNum = params.get("page") != null ? Integer.valueOf(params.get("page").toString()) : 1;
+        int pageSize = params.get("limit") != null ? Integer.valueOf(params.get("limit").toString()) : 10;
+        
+        // 调试：输出构建的查询条件
+        System.out.println("构建的查询条件：ticketType=" + ticket.getTicketType() + ", status=" + ticket.getStatus() + ", appointmentDate=" + ticket.getAppointmentDate());
+        
+        // 1. 获取所有符合条件的记录
+        List<Ticket> allTickets = ticketService.selectTicketList(ticket);
+        
+        // 调试：输出查询到的所有记录
+        System.out.println("查询到的所有记录：" + allTickets);
+        if (!allTickets.isEmpty()) {
+            for (Ticket t : allTickets) {
+                System.out.println("记录详情：id=" + t.getId() + ", ticketType=" + t.getTicketType() + ", status=" + t.getStatus() + ", appointmentDate=" + t.getAppointmentDate() + ", deleteFlag=" + t.getDeleteFlag());
+            }
+        }
+        
+        // 2. 计算总记录数
+        long total = allTickets.size();
+        System.out.println("手动计算的总记录数：" + total);
+        
+        // 3. 手动分页
+        int start = (pageNum - 1) * pageSize;
+        int end = Math.min(start + pageSize, allTickets.size());
+        List<Ticket> pageTickets;
+        if (start >= end) {
+            pageTickets = new ArrayList<>();
+        } else {
+            pageTickets = allTickets.subList(start, end);
+        }
+        
+        // 4. 转换为DTO
+        List<TicketDto> dtoList = pageTickets.stream().map(this::convertToDto).toList();
+        
+        // 5. 构建响应数据，符合前端预期格式
+        Map<String, Object> result = new HashMap<>();
+        result.put("list", dtoList);
+        result.put("records", dtoList); // 兼容前端框架（如Element UI）可能使用的records字段
+        result.put("total", total);
+        result.put("page", pageNum);
+        result.put("current", pageNum); // 兼容前端框架可能使用的current字段
+        result.put("limit", pageSize);
+        result.put("pageSize", pageSize); // 兼容前端框架可能使用的pageSize字段
+        result.put("size", pageSize); // 兼容前端框架可能使用的size字段
+        result.put("pageNum", pageNum); // 兼容前端框架可能使用的pageNum字段
+        result.put("pages", (int) Math.ceil((double) total / pageSize)); // 计算总页数
+        
+        // 调试：输出响应数据
+        System.out.println("返回的响应数据：" + result);
+
+        return R.ok(result);
+    }
+
+    /**
+     * 预约号源
+     *
+     * @param params 预约参数
+     * @return 结果
+     */
+    @Override
+    public R<?> bookTicket(Map<String, Object> params) {
+        Long ticketId = null;
+        if (params.get("ticketId") != null) {
+            ticketId = Long.valueOf(params.get("ticketId").toString());
+        }
+        if (ticketId == null) {
+            return R.fail("参数错误");
+        }
+        try {
+            int result = ticketService.bookTicket(params);
+            return R.ok(result > 0 ? "预约成功" : "预约失败");
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 取消预约
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    public R<?> cancelTicket(Long ticketId) {
+        if (ticketId == null) {
+            return R.fail("参数错误");
+        }
+        try {
+            int result = ticketService.cancelTicket(ticketId);
+            return R.ok(result > 0 ? "取消成功" : "取消失败");
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 取号
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    public R<?> checkInTicket(Long ticketId) {
+        if (ticketId == null) {
+            return R.fail("参数错误");
+        }
+        try {
+            int result = ticketService.checkInTicket(ticketId);
+            return R.ok(result > 0 ? "取号成功" : "取号失败");
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 停诊
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    public R<?> cancelConsultation(Long ticketId) {
+        if (ticketId == null) {
+            return R.fail("参数错误");
+        }
+        try {
+            int result = ticketService.cancelConsultation(ticketId);
+            return R.ok(result > 0 ? "停诊成功" : "停诊失败");
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+    
+    @Override
+    public R<?> listAllTickets() {
+        // 创建固定的测试数据，用于验证前端是否能展示数据
+        List<TicketDto> testTickets = new ArrayList<>();
+        
+        // 创建5条测试数据
+        for (int i = 1; i <= 5; i++) {
+            TicketDto dto = new TicketDto();
+            dto.setSlot_id((long) i);
+            dto.setBusNo("TEST0000" + i);
+            dto.setDepartment("内科");
+            dto.setDoctor("张三");
+            dto.setTicketType("expert");
+            dto.setDateTime("08:00-08:50");
+            dto.setStatus("未预约");
+            dto.setFee("150");
+            dto.setAppointmentDate(new Date());
+            testTickets.add(dto);
+        }
+        
+        // 构建响应数据
+        Map<String, Object> result = new HashMap<>();
+        result.put("list", testTickets);
+        result.put("total", testTickets.size());
+        result.put("page", 1);
+        result.put("limit", 20);
+        
+        return R.ok(result);
+    }
+
+    /**
+     * 转换为DTO
+     *
+     * @param ticket 号源实体
+     * @return 号源DTO
+     */
+    private TicketDto convertToDto(Ticket ticket) {
+        TicketDto dto = new TicketDto();
+        dto.setSlot_id(ticket.getId());
+        dto.setBusNo(ticket.getBusNo());
+        dto.setDepartment(ticket.getDepartment());
+        dto.setDoctor(ticket.getDoctor());
+        
+        // 处理号源类型（转换为英文，前端期望的是general或expert）
+        String ticketType = ticket.getTicketType();
+        if ("普通".equals(ticketType)) {
+            dto.setTicketType("general");
+        } else if ("专家".equals(ticketType)) {
+            dto.setTicketType("expert");
+        } else {
+            dto.setTicketType(ticketType);
+        }
+        
+        // 处理号源时间（dateTime）
+        dto.setDateTime(ticket.getTime());
+        
+        // 处理号源状态（转换为中文）
+        String status = ticket.getStatus();
+        switch (status) {
+            case "unbooked":
+                dto.setStatus("未预约");
+                break;
+            case "booked":
+                dto.setStatus("已预约");
+                break;
+            case "checked":
+                dto.setStatus("已取号");
+                break;
+            case "cancelled":
+                dto.setStatus("已取消");
+                break;
+            case "locked":
+                dto.setStatus("已锁定");
+                break;
+            default:
+                dto.setStatus(status);
+        }
+        
+        dto.setFee(ticket.getFee());
+        dto.setPatientName(ticket.getPatientName());
+        dto.setPatientId(ticket.getMedicalCard()); // 就诊卡号
+        dto.setPhone(ticket.getPhone());
+        
+        // 获取患者性别
+        if (ticket.getPatientId() != null) {
+            Patient patient = patientService.getById(ticket.getPatientId());
+            if (patient != null) {
+                Integer genderEnum = patient.getGenderEnum();
+                if (genderEnum != null) {
+                    switch (genderEnum) {
+                        case 1:
+                            dto.setGender("男");
+                            break;
+                        case 2:
+                            dto.setGender("女");
+                            break;
+                        default:
+                            dto.setGender("未知");
+                    }
+                }
+            }
+        }
+        
+        dto.setAppointmentDate(ticket.getAppointmentDate());
+        dto.setAppointmentTime(ticket.getAppointmentTime());
+        dto.setDepartmentId(ticket.getDepartmentId());
+        dto.setDoctorId(ticket.getDoctorId());
+        return dto;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java
new file mode 100644
index 00000000..e8baeed0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java
@@ -0,0 +1,101 @@
+package com.openhis.web.appointmentmanage.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.annotation.Anonymous;
+import com.core.common.core.domain.R;
+import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
+import com.openhis.web.appointmentmanage.dto.TicketDto;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 号源管理控制器
+ *
+ * @author system
+ */
+@RestController
+@RequestMapping("/appointment/ticket")
+public class TicketController {
+
+    @Resource
+    private ITicketAppService ticketAppService;
+
+    /**
+     * 查询号源列表
+     *
+     * @param params 查询参数
+     * @return 号源列表
+     */
+    @PostMapping("/list")
+    public R<?> listTicket(@RequestBody Map<String, Object> params) {
+        return ticketAppService.listTicket(params);
+    }
+    
+    /**
+     * 查询号源列表（支持GET请求，兼容旧版本）
+     *
+     * @param params 查询参数
+     * @return 号源列表
+     */
+    @GetMapping("/list")
+    public R<?> listTicketByGet(@RequestParam Map<String, Object> params) {
+        return ticketAppService.listTicket(params);
+    }
+    
+    /**
+     * 查询所有号源（用于测试）
+     *
+     * @return 所有号源列表
+     */
+    @Anonymous
+    @GetMapping("/listAll")
+    public R<?> listAllTickets() {
+        return ticketAppService.listAllTickets();
+    }
+
+    /**
+     * 预约号源
+     *
+     * @param params 预约参数
+     * @return 结果
+     */
+    @PostMapping("/book")
+    public R<?> bookTicket(@RequestBody Map<String, Object> params) {
+        return ticketAppService.bookTicket(params);
+    }
+
+    /**
+     * 取消预约
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @PostMapping("/cancel")
+    public R<?> cancelTicket(@RequestParam Long ticketId) {
+        return ticketAppService.cancelTicket(ticketId);
+    }
+
+    /**
+     * 取号
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @PostMapping("/checkin")
+    public R<?> checkInTicket(@RequestParam Long ticketId) {
+        return ticketAppService.checkInTicket(ticketId);
+    }
+
+    /**
+     * 停诊
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @PostMapping("/cancelConsultation")
+    public R<?> cancelConsultation(@RequestParam Long ticketId) {
+        return ticketAppService.cancelConsultation(ticketId);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java
new file mode 100644
index 00000000..f34335cc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java
@@ -0,0 +1,102 @@
+package com.openhis.web.appointmentmanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 号源管理DTO
+ *
+ * @author system
+ */
+@Data
+@Accessors(chain = true)
+public class TicketDto {
+
+    /**
+     * 号源唯一ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long slot_id;
+
+    /**
+     * 号源编码
+     */
+    private String busNo;
+
+    /**
+     * 科室名称
+     */
+    private String department;
+
+    /**
+     * 医生姓名
+     */
+    private String doctor;
+
+    /**
+     * 号源类型 (普通/专家)
+     */
+    private String ticketType;
+
+    /**
+     * 号源时间
+     */
+    private String dateTime;
+
+    /**
+     * 状态 (unbooked:未预约, booked:已预约, checked:已取号, cancelled:已取消, locked:已锁定)
+     */
+    private String status;
+
+    /**
+     * 挂号费
+     */
+    private String fee;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 就诊卡号
+     */
+    private String patientId;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 患者性别
+     */
+    private String gender;
+
+    /**
+     * 预约日期
+     */
+    private Date appointmentDate;
+
+    /**
+     * 预约时间
+     */
+    private Date appointmentTime;
+
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long departmentId;
+
+    /**
+     * 医生ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long doctorId;
+}
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
index b74c6d89..c38dcdfa 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
@@ -176,7 +176,7 @@ public class OperLogAspect {
      * 插入操作日志到数据库
      */
     private void insertOperLog(SysOperLog operLog) {
-        String username = SecurityUtils.getLoginUser().getUsername();
+        String username = SecurityUtils.getUsernameSafe(); // 使用安全获取用户名的方法
         String sql = "INSERT INTO sys_oper_log "
             + "(title,oper_time,method,request_method,oper_name,oper_url,oper_param,json_result,error_msg,cost_time) "
             + "VALUES (?, ?, ?,?, ?, ?, ?, ?,?, ?)";
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
index 5f6c58dd..22527a52 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -70,6 +70,10 @@ public enum AssignSeqEnum {
      * 位置业务编码
      */
     LOCATION_BUS_NO("15", "科室业务编码", "LOC"),
+    /**
+     * 手术室业务编码
+     */
+    OPERATING_ROOM_BUS_NO("16", "手术室业务编码", "OR"),
     /**
      * 厂商/产地单据号
      */
@@ -298,11 +302,11 @@ public enum AssignSeqEnum {
      * 自动备份单据号
      */
     AUTO_BACKUP_NO("70", "自动备份单据号", "ABU"),
-
     /**
-     * 手术室业务编码
+     * 订单编号
      */
-    OPERATING_ROOM_BUS_NO("71", "手术室业务编码", "OPR");
+    ORDER_NUM("71", "订单编号", "ORD");
+
 
     private final String code;
     private final String info;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
new file mode 100644
index 00000000..2bd02dee
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
@@ -0,0 +1,68 @@
+package com.openhis.clinical.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@TableName("order_main")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Order extends HisBaseEntity {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    private String orderNo;
+
+    private Long patientId;
+
+    private String patientName;
+
+    private String medicalCard;
+
+    private String phone;
+
+    private Integer gender;
+
+    private Long scheduleId;
+
+    private Long slotId;
+
+    private Long departmentId;
+
+    private String departmentName;
+
+    private Long doctorId;
+
+    private String doctorName;
+
+    private String regType;
+
+    private BigDecimal fee;
+
+    private Date appointmentDate;
+
+    private Date appointmentTime;
+
+    private Date cancelTime;
+
+    private String cancelReason;
+
+    private Integer status;
+
+    private Integer payStatus;
+
+    private Integer version;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
new file mode 100644
index 00000000..c431dab4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
@@ -0,0 +1,107 @@
+package com.openhis.clinical.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 号源管理Entity实体
+ *
+ * @author system
+ */
+@Data
+@TableName("clinical_ticket")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Ticket extends HisBaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 号源编码
+     */
+    private String busNo;
+
+    /**
+     * 科室名称
+     */
+    private String department;
+
+    /**
+     * 医生姓名
+     */
+    private String doctor;
+
+    /**
+     * 号源类型 (普通/专家)
+     */
+    private String ticketType;
+
+    /**
+     * 挂号时间
+     */
+    private String time;
+
+    /**
+     * 状态 (unbooked:未预约, booked:已预约, checked:已取号, cancelled:已取消, locked:已锁定)
+     */
+    private String status;
+
+    /**
+     * 挂号费
+     */
+    private String fee;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 就诊卡号
+     */
+    private String medicalCard;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 预约日期
+     */
+    private Date appointmentDate;
+
+    /**
+     * 预约时间
+     */
+    private Date appointmentTime;
+
+    /**
+     * 科室ID
+     */
+    private Long departmentId;
+
+    /**
+     * 医生ID
+     */
+    private Long doctorId;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
new file mode 100644
index 00000000..28ae0751
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
@@ -0,0 +1,35 @@
+package com.openhis.clinical.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.clinical.domain.Order;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface OrderMapper extends BaseMapper<Order> {
+
+    List<Order> selectOrderList(Order order);
+
+    Page<Order> selectOrderPage(Page<Order> page, @Param("order") Order order);
+
+    Order selectOrderById(Long id);
+
+    int insertOrder(Order order);
+
+    int updateOrder(Order order);
+
+    int deleteOrderById(Long id);
+
+    int deleteOrderByIds(Long[] ids);
+
+    int countOrders(Map<String, Object> params);
+
+    Order selectOrderBySlotId(Long slotId);
+
+    int updateOrderStatusById(Long id, Integer status);
+
+    int updateOrderCancelInfoById(Long id, Date cancelTime, String cancelReason);
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
new file mode 100644
index 00000000..5d5cb343
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
@@ -0,0 +1,82 @@
+package com.openhis.clinical.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.clinical.domain.Ticket;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 号源管理Mapper接口
+ *
+ * @author system
+ */
+public interface TicketMapper extends BaseMapper<Ticket> {
+
+    /**
+     * 查询号源列表
+     *
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    List<Ticket> selectTicketList(Ticket ticket);
+
+    /**
+     * 分页查询号源列表
+     *
+     * @param page 分页参数
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    Page<Ticket> selectTicketPage(Page<Ticket> page, @Param("ticket") Ticket ticket);
+
+    /**
+     * 查询号源信息
+     *
+     * @param id 号源ID
+     * @return 号源信息
+     */
+    Ticket selectTicketById(Long id);
+
+    /**
+     * 新增号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    int insertTicket(Ticket ticket);
+
+    /**
+     * 修改号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    int updateTicket(Ticket ticket);
+
+    /**
+     * 删除号源
+     *
+     * @param id 号源ID
+     * @return 结果
+     */
+    int deleteTicketById(Long id);
+
+    /**
+     * 批量删除号源
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteTicketByIds(Long[] ids);
+
+    /**
+     * 根据条件统计号源数量
+     *
+     * @param params 查询参数
+     * @return 号源数量
+     */
+    int countTickets(Map<String, Object> params);
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
new file mode 100644
index 00000000..dc824952
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
@@ -0,0 +1,37 @@
+package com.openhis.clinical.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.clinical.domain.Order;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IOrderService extends IService<Order> {
+
+    List<Order> selectOrderList(Order order);
+
+    Page<Order> selectOrderPage(Page<Order> page, Order order);
+
+    Order selectOrderById(Long id);
+
+    int insertOrder(Order order);
+
+    int updateOrder(Order order);
+
+    int deleteOrderByIds(Long[] ids);
+
+    int deleteOrderById(Long id);
+
+    int countOrders(Map<String, Object> params);
+
+    Order selectOrderBySlotId(Long slotId);
+
+    int updateOrderStatusById(Long id, Integer status);
+
+    int updateOrderCancelInfoById(Long id, java.util.Date cancelTime, String cancelReason);
+
+    Order createAppointmentOrder(Map<String, Object> params);
+
+    int cancelAppointmentOrder(Long orderId, String cancelReason);
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
new file mode 100644
index 00000000..01810524
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
@@ -0,0 +1,105 @@
+package com.openhis.clinical.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.clinical.domain.Ticket;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 号源管理Service接口
+ *
+ * @author system
+ */
+public interface ITicketService extends IService<Ticket> {
+
+    /**
+     * 查询号源列表
+     *
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    List<Ticket> selectTicketList(Ticket ticket);
+
+    /**
+     * 分页查询号源列表
+     *
+     * @param page 分页参数
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    Page<Ticket> selectTicketPage(Page<Ticket> page, Ticket ticket);
+
+    /**
+     * 查询号源信息
+     *
+     * @param id 号源ID
+     * @return 号源信息
+     */
+    Ticket selectTicketById(Long id);
+
+    /**
+     * 新增号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    int insertTicket(Ticket ticket);
+
+    /**
+     * 修改号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    int updateTicket(Ticket ticket);
+
+    /**
+     * 批量删除号源
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteTicketByIds(Long[] ids);
+
+    /**
+     * 删除号源信息
+     *
+     * @param id 号源ID
+     * @return 结果
+     */
+    int deleteTicketById(Long id);
+
+    /**
+     * 预约号源
+     *
+     * @param params 预约参数
+     * @return 结果
+     */
+    int bookTicket(Map<String, Object> params);
+
+    /**
+     * 取消预约
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    int cancelTicket(Long ticketId);
+
+    /**
+     * 取号
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    int checkInTicket(Long ticketId);
+
+    /**
+     * 停诊
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    int cancelConsultation(Long ticketId);
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
new file mode 100644
index 00000000..9eb18eee
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
@@ -0,0 +1,164 @@
+package com.openhis.clinical.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.clinical.domain.Order;
+import com.openhis.clinical.domain.Ticket;
+import com.openhis.clinical.mapper.OrderMapper;
+import com.openhis.clinical.mapper.TicketMapper;
+import com.openhis.clinical.service.IOrderService;
+import com.openhis.common.enums.AssignSeqEnum;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+    @Resource
+    private OrderMapper orderMapper;
+
+    @Resource
+    private TicketMapper ticketMapper;
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Override
+    public List<Order> selectOrderList(Order order) {
+        return orderMapper.selectOrderList(order);
+    }
+
+    @Override
+    public Page<Order> selectOrderPage(Page<Order> page, Order order) {
+        return orderMapper.selectOrderPage(page, order);
+    }
+
+    @Override
+    public Order selectOrderById(Long id) {
+        return orderMapper.selectOrderById(id);
+    }
+
+    @Override
+    public int insertOrder(Order order) {
+        return orderMapper.insertOrder(order);
+    }
+
+    @Override
+    public int updateOrder(Order order) {
+        return orderMapper.updateOrder(order);
+    }
+
+    @Override
+    public int deleteOrderByIds(Long[] ids) {
+        return orderMapper.deleteOrderByIds(ids);
+    }
+
+    @Override
+    public int deleteOrderById(Long id) {
+        return orderMapper.deleteOrderById(id);
+    }
+
+    @Override
+    public int countOrders(Map<String, Object> params) {
+        return orderMapper.countOrders(params);
+    }
+
+    @Override
+    public Order selectOrderBySlotId(Long slotId) {
+        return orderMapper.selectOrderBySlotId(slotId);
+    }
+
+    @Override
+    public int updateOrderStatusById(Long id, Integer status) {
+        return orderMapper.updateOrderStatusById(id, status);
+    }
+
+    @Override
+    public int updateOrderCancelInfoById(Long id, Date cancelTime, String cancelReason) {
+        return orderMapper.updateOrderCancelInfoById(id, cancelTime, cancelReason);
+    }
+
+    @Override
+    public Order createAppointmentOrder(Map<String, Object> params) {
+        Long slotId = params.get("slotId") != null ? Long.valueOf(params.get("slotId").toString()) : null;
+        if (slotId == null) {
+            throw new RuntimeException("号源ID不能为空");
+        }
+
+        Ticket ticket = ticketMapper.selectTicketById(slotId);
+        if (ticket == null) {
+            throw new RuntimeException("号源不存在");
+        }
+
+        Order order = new Order();
+        String orderNo = assignSeqUtil.getSeq(AssignSeqEnum.ORDER_NUM.getPrefix(), 18);
+        order.setOrderNo(orderNo);
+
+        Long patientId = params.get("patientId") != null ? Long.valueOf(params.get("patientId").toString()) : null;
+        String patientName = params.get("patientName") != null ? params.get("patientName").toString() : null;
+        String medicalCard = params.get("medicalCard") != null ? params.get("medicalCard").toString() : null;
+        String phone = params.get("phone") != null ? params.get("phone").toString() : null;
+        Integer gender = params.get("gender") != null ? Integer.valueOf(params.get("gender").toString()) : null;
+
+        order.setPatientId(patientId);
+        order.setPatientName(patientName);
+        order.setMedicalCard(medicalCard);
+        order.setPhone(phone);
+        order.setGender(gender);
+
+        order.setSlotId(slotId);
+        order.setDepartmentId(ticket.getDepartmentId());
+        order.setDepartmentName(ticket.getDepartment());
+        order.setDoctorId(ticket.getDoctorId());
+        order.setDoctorName(ticket.getDoctor());
+
+        String regType = params.get("regType") != null ? params.get("regType").toString() : "普通";
+        order.setRegType(regType);
+
+        BigDecimal fee = params.get("fee") != null ? new BigDecimal(params.get("fee").toString()) : BigDecimal.ZERO;
+        order.setFee(fee);
+
+        Date appointmentDate = new Date();
+        order.setAppointmentDate(appointmentDate);
+        order.setAppointmentTime(new Date());
+
+        order.setStatus(1);
+        order.setPayStatus(0);
+        order.setVersion(0);
+
+        // 设置租户ID
+        Integer tenantId = params.get("tenant_id") != null ? Integer.valueOf(params.get("tenant_id").toString()) : null;
+        order.setTenantId(tenantId);
+
+        order.setCreateTime(new Date());
+        order.setUpdateTime(new Date());
+
+        orderMapper.insertOrder(order);
+
+        return order;
+    }
+
+    @Override
+    public int cancelAppointmentOrder(Long orderId, String cancelReason) {
+        Order order = orderMapper.selectOrderById(orderId);
+        if (order == null) {
+            throw new RuntimeException("订单不存在");
+        }
+        if (order.getStatus() == 3) {
+            throw new RuntimeException("订单已取消");
+        }
+        if (order.getStatus() == 2) {
+            throw new RuntimeException("订单已完成，无法取消");
+        }
+
+        Date cancelTime = new Date();
+        return orderMapper.updateOrderCancelInfoById(orderId, cancelTime, cancelReason);
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
new file mode 100644
index 00000000..183c27cf
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
@@ -0,0 +1,267 @@
+package com.openhis.clinical.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.clinical.domain.Order;
+import com.openhis.clinical.domain.Ticket;
+import com.openhis.clinical.mapper.TicketMapper;
+import com.openhis.clinical.service.IOrderService;
+import com.openhis.clinical.service.ITicketService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 号源管理Service业务层处理
+ *
+ * @author system
+ */
+@Service
+public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> implements ITicketService {
+
+    private static final Logger logger = LoggerFactory.getLogger(TicketServiceImpl.class);
+
+    @Resource
+    private TicketMapper ticketMapper;
+
+    @Resource
+    private IOrderService orderService;
+
+    /**
+     * 查询号源列表
+     *
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    @Override
+    public List<Ticket> selectTicketList(Ticket ticket) {
+        return ticketMapper.selectTicketList(ticket);
+    }
+
+    /**
+     * 分页查询号源列表
+     *
+     * @param page 分页参数
+     * @param ticket 号源信息
+     * @return 号源集合
+     */
+    @Override
+    public Page<Ticket> selectTicketPage(Page<Ticket> page, Ticket ticket) {
+        return ticketMapper.selectTicketPage(page, ticket);
+    }
+
+    /**
+     * 查询号源信息
+     *
+     * @param id 号源ID
+     * @return 号源信息
+     */
+    @Override
+    public Ticket selectTicketById(Long id) {
+        return ticketMapper.selectTicketById(id);
+    }
+
+    /**
+     * 新增号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    @Override
+    public int insertTicket(Ticket ticket) {
+        return ticketMapper.insertTicket(ticket);
+    }
+
+    /**
+     * 修改号源
+     *
+     * @param ticket 号源信息
+     * @return 结果
+     */
+    @Override
+    public int updateTicket(Ticket ticket) {
+        return ticketMapper.updateTicket(ticket);
+    }
+
+    /**
+     * 批量删除号源
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTicketByIds(Long[] ids) {
+        return ticketMapper.deleteTicketByIds(ids);
+    }
+
+    /**
+     * 删除号源信息
+     *
+     * @param id 号源ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTicketById(Long id) {
+        return ticketMapper.deleteTicketById(id);
+    }
+
+    /**
+     * 预约号源
+     *
+     * @param params 预约参数
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int bookTicket(Map<String, Object> params) {
+        Long ticketId = Long.valueOf(params.get("ticketId").toString());
+        Long patientId = params.get("patientId") != null ? Long.valueOf(params.get("patientId").toString()) : null;
+        String patientName = params.get("patientName") != null ? params.get("patientName").toString() : null;
+        String medicalCard = params.get("medicalCard") != null ? params.get("medicalCard").toString() : null;
+        String phone = params.get("phone") != null ? params.get("phone").toString() : null;
+        
+        logger.debug("开始预约号源，ticketId: {}, patientId: {}, patientName: {}", ticketId, patientId, patientName);
+        
+        Ticket ticket = ticketMapper.selectTicketById(ticketId);
+        if (ticket == null) {
+            logger.error("号源不存在，ticketId: {}", ticketId);
+            throw new RuntimeException("号源不存在");
+        }
+        
+        logger.debug("查询到号源信息，id: {}, status: {}, deleteFlag: {}", ticket.getId(), ticket.getStatus(), ticket.getDeleteFlag());
+        
+        // 详细调试：检查状态字符串的详细信息
+        String status = ticket.getStatus();
+        logger.debug("状态字符串详细信息: value='{}', length={}, isNull={}", status, status != null ? status.length() : "null", status == null);
+        if (status != null) {
+            StringBuilder charInfo = new StringBuilder();
+            for (int i = 0; i < status.length(); i++) {
+                charInfo.append(status.charAt(i)).append("(").append((int) status.charAt(i)).append(") ");
+            }
+            logger.debug("状态字符串字符信息: {}", charInfo.toString());
+        }
+        
+        // 详细调试：检查每个状态比较的结果
+        boolean isUnbooked = "unbooked".equals(status);
+        boolean isLocked = "locked".equals(status);
+        boolean isCancelled = "cancelled".equals(status);
+        boolean isChecked = "checked".equals(status);
+        boolean isBooked = "booked".equals(status);
+        logger.debug("状态比较结果: unbooked={}, locked={}, cancelled={}, checked={}, booked={}", 
+                isUnbooked, isLocked, isCancelled, isChecked, isBooked);
+        
+        if (!isUnbooked && !isLocked && !isCancelled && !isChecked && !isBooked) {
+            logger.error("号源不可预约，id: {}, status: {}", ticket.getId(), ticket.getStatus());
+            throw new RuntimeException("号源不可预约");
+        }
+
+        params.put("slotId", ticketId);
+        Order order = orderService.createAppointmentOrder(params);
+
+        Ticket updateTicket = new Ticket();
+        updateTicket.setId(ticketId);
+        updateTicket.setStatus("booked");
+        updateTicket.setPatientId(patientId);
+        updateTicket.setPatientName(patientName);
+        updateTicket.setMedicalCard(medicalCard);
+        updateTicket.setPhone(phone);
+        updateTicket.setAppointmentDate(new Date());
+        updateTicket.setAppointmentTime(new Date());
+        
+        int result = ticketMapper.updateById(updateTicket);
+        logger.debug("预约成功，更新号源状态为booked，result: {}", result);
+        
+        return result;
+    }
+
+    /**
+     * 取消预约
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int cancelTicket(Long ticketId) {
+        Ticket ticket = ticketMapper.selectTicketById(ticketId);
+        if (ticket == null) {
+            throw new RuntimeException("号源不存在");
+        }
+        if (!"booked".equals(ticket.getStatus()) && !"locked".equals(ticket.getStatus())) {
+            throw new RuntimeException("号源不可取消预约");
+        }
+
+        Order order = orderService.selectOrderBySlotId(ticketId);
+        if (order != null) {
+            orderService.cancelAppointmentOrder(order.getId(), "患者取消预约");
+        }
+
+        ticket.setStatus("unbooked");
+        ticket.setPatientId(null);
+        ticket.setPatientName(null);
+        ticket.setMedicalCard(null);
+        ticket.setPhone(null);
+        ticket.setAppointmentDate(null);
+        ticket.setAppointmentTime(null);
+        return ticketMapper.updateTicket(ticket);
+    }
+
+    /**
+     * 取号
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    public int checkInTicket(Long ticketId) {
+        // 获取号源信息
+        Ticket ticket = ticketMapper.selectTicketById(ticketId);
+        if (ticket == null) {
+            throw new RuntimeException("号源不存在");
+        }
+        if (!"booked".equals(ticket.getStatus()) && !"locked".equals(ticket.getStatus())) {
+            throw new RuntimeException("号源不可取号");
+        }
+        // 更新号源状态为已取号
+        ticket.setStatus("checked");
+        return ticketMapper.updateTicket(ticket);
+    }
+
+    /**
+     * 停诊
+     *
+     * @param ticketId 号源ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int cancelConsultation(Long ticketId) {
+        // 获取号源信息
+        Ticket ticket = ticketMapper.selectTicketById(ticketId);
+        if (ticket == null) {
+            throw new RuntimeException("号源不存在");
+        }
+        
+        // 检查是否存在相关订单，如果存在则取消
+        Order order = orderService.selectOrderBySlotId(ticketId);
+        if (order != null) {
+            orderService.cancelAppointmentOrder(order.getId(), "医生停诊");
+        }
+        
+        // 更新号源状态为已取消
+        ticket.setStatus("cancelled");
+        ticket.setPatientId(null);
+        ticket.setPatientName(null);
+        ticket.setMedicalCard(null);
+        ticket.setPhone(null);
+        ticket.setAppointmentDate(null);
+        ticket.setAppointmentTime(null);
+        return ticketMapper.updateTicket(ticket);
+    }
+}
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
new file mode 100644
index 00000000..c3708321
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.clinical.mapper.OrderMapper">
+
+    <resultMap type="com.openhis.clinical.domain.Order" id="OrderResult">
+        <id property="id" column="id"/>
+        <result property="orderNo" column="order_no"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="patientName" column="patient_name"/>
+        <result property="medicalCard" column="medical_card"/>
+        <result property="phone" column="phone"/>
+        <result property="gender" column="gender"/>
+        <result property="scheduleId" column="schedule_id"/>
+        <result property="slotId" column="slot_id"/>
+        <result property="departmentId" column="department_id"/>
+        <result property="departmentName" column="department_name"/>
+        <result property="doctorId" column="doctor_id"/>
+        <result property="doctorName" column="doctor_name"/>
+        <result property="regType" column="reg_type"/>
+        <result property="fee" column="fee"/>
+        <result property="appointmentDate" column="appointment_date"/>
+        <result property="appointmentTime" column="appointment_time"/>
+        <result property="cancelTime" column="cancel_time"/>
+        <result property="cancelReason" column="cancel_reason"/>
+        <result property="status" column="status"/>
+        <result property="payStatus" column="pay_status"/>
+        <result property="version" column="version"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="selectOrderList" resultMap="OrderResult">
+        select * from order_main
+        <where>
+            <if test="orderNo != null and orderNo != ''">
+                and order_no = #{orderNo}
+            </if>
+            <if test="patientId != null">
+                and patient_id = #{patientId}
+            </if>
+            <if test="patientName != null and patientName != ''">
+                and patient_name like #{patientName}
+            </if>
+            <if test="medicalCard != null and medicalCard != ''">
+                and medical_card = #{medicalCard}
+            </if>
+            <if test="phone != null and phone != ''">
+                and phone = #{phone}
+            </if>
+            <if test="scheduleId != null">
+                and schedule_id = #{scheduleId}
+            </if>
+            <if test="slotId != null">
+                and slot_id = #{slotId}
+            </if>
+            <if test="departmentId != null">
+                and department_id = #{departmentId}
+            </if>
+            <if test="doctorId != null">
+                and doctor_id = #{doctorId}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="payStatus != null">
+                and pay_status = #{payStatus}
+            </if>
+            <if test="appointmentDate != null">
+                and appointment_date = #{appointmentDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectOrderPage" resultMap="OrderResult">
+        select * from order_main
+        <where>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no = #{order.orderNo}
+            </if>
+            <if test="order.patientId != null">
+                and patient_id = #{order.patientId}
+            </if>
+            <if test="order.patientName != null and order.patientName != ''">
+                and patient_name like #{order.patientName}
+            </if>
+            <if test="order.medicalCard != null and order.medicalCard != ''">
+                and medical_card = #{order.medicalCard}
+            </if>
+            <if test="order.phone != null and order.phone != ''">
+                and phone = #{order.phone}
+            </if>
+            <if test="order.scheduleId != null">
+                and schedule_id = #{order.scheduleId}
+            </if>
+            <if test="order.slotId != null">
+                and slot_id = #{order.slotId}
+            </if>
+            <if test="order.departmentId != null">
+                and department_id = #{order.departmentId}
+            </if>
+            <if test="order.doctorId != null">
+                and doctor_id = #{order.doctorId}
+            </if>
+            <if test="order.status != null">
+                and status = #{order.status}
+            </if>
+            <if test="order.payStatus != null">
+                and pay_status = #{order.payStatus}
+            </if>
+            <if test="order.appointmentDate != null">
+                and appointment_date = #{order.appointmentDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectOrderById" resultMap="OrderResult">
+        select * from order_main where id = #{id}
+    </select>
+
+    <select id="selectOrderBySlotId" resultMap="OrderResult">
+        select * from order_main where slot_id = #{slotId} and status = 1
+    </select>
+
+    <insert id="insertOrder" parameterType="com.openhis.clinical.domain.Order">
+        insert into order_main
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null and orderNo != ''">order_no,</if>
+            <if test="patientId != null">patient_id,</if>
+            <if test="patientName != null and patientName != ''">patient_name,</if>
+            <if test="medicalCard != null and medicalCard != ''">medical_card,</if>
+            <if test="phone != null and phone != ''">phone,</if>
+            <if test="gender != null">gender,</if>
+            <if test="scheduleId != null">schedule_id,</if>
+            <if test="slotId != null">slot_id,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="departmentName != null and departmentName != ''">department_name,</if>
+            <if test="doctorId != null">doctor_id,</if>
+            <if test="doctorName != null and doctorName != ''">doctor_name,</if>
+            <if test="regType != null and regType != ''">reg_type,</if>
+            <if test="fee != null">fee,</if>
+            <if test="appointmentDate != null">appointment_date,</if>
+            <if test="appointmentTime != null">appointment_time,</if>
+            <if test="cancelTime != null">cancel_time,</if>
+            <if test="cancelReason != null and cancelReason != ''">cancel_reason,</if>
+            <if test="status != null">status,</if>
+            <if test="payStatus != null">pay_status,</if>
+            <if test="version != null">version,</if>
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null and orderNo != ''">#{orderNo},</if>
+            <if test="patientId != null">#{patientId},</if>
+            <if test="patientName != null and patientName != ''">#{patientName},</if>
+            <if test="medicalCard != null and medicalCard != ''">#{medicalCard},</if>
+            <if test="phone != null and phone != ''">#{phone},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="scheduleId != null">#{scheduleId},</if>
+            <if test="slotId != null">#{slotId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="departmentName != null and departmentName != ''">#{departmentName},</if>
+            <if test="doctorId != null">#{doctorId},</if>
+            <if test="doctorName != null and doctorName != ''">#{doctorName},</if>
+            <if test="regType != null and regType != ''">#{regType},</if>
+            <if test="fee != null">#{fee},</if>
+            <if test="appointmentDate != null">#{appointmentDate},</if>
+            <if test="appointmentTime != null">#{appointmentTime},</if>
+            <if test="cancelTime != null">#{cancelTime},</if>
+            <if test="cancelReason != null and cancelReason != ''">#{cancelReason},</if>
+            <if test="status != null">#{status},</if>
+            <if test="payStatus != null">#{payStatus},</if>
+            <if test="version != null">#{version},</if>
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateOrder" parameterType="com.openhis.clinical.domain.Order">
+        update order_main
+        <trim prefix="set" suffixOverrides=",">
+            <if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
+            <if test="patientId != null">patient_id = #{patientId},</if>
+            <if test="patientName != null and patientName != ''">patient_name = #{patientName},</if>
+            <if test="medicalCard != null and medicalCard != ''">medical_card = #{medicalCard},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="scheduleId != null">schedule_id = #{scheduleId},</if>
+            <if test="slotId != null">slot_id = #{slotId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="departmentName != null and departmentName != ''">department_name = #{departmentName},</if>
+            <if test="doctorId != null">doctor_id = #{doctorId},</if>
+            <if test="doctorName != null and doctorName != ''">doctor_name = #{doctorName},</if>
+            <if test="regType != null and regType != ''">reg_type = #{regType},</if>
+            <if test="fee != null">fee = #{fee},</if>
+            <if test="appointmentDate != null">appointment_date = #{appointmentDate},</if>
+            <if test="appointmentTime != null">appointment_time = #{appointmentTime},</if>
+            <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
+            <if test="cancelReason != null and cancelReason != ''">cancel_reason = #{cancelReason},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="payStatus != null">pay_status = #{payStatus},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="updateOrderStatusById">
+        update order_main set status = #{status} where id = #{id}
+    </update>
+
+    <update id="updateOrderCancelInfoById">
+        update order_main set status = 3, cancel_time = #{cancelTime}, cancel_reason = #{cancelReason} where id = #{id}
+    </update>
+
+    <delete id="deleteOrderById">
+        delete from order_main where id = #{id}
+    </delete>
+
+    <delete id="deleteOrderByIds">
+        delete from order_main where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="countOrders" resultType="int">
+        select count(*) from order_main
+        <where>
+            <if test="orderNo != null and orderNo != ''">
+                and order_no = #{orderNo}
+            </if>
+            <if test="patientId != null">
+                and patient_id = #{patientId}
+            </if>
+            <if test="scheduleId != null">
+                and schedule_id = #{scheduleId}
+            </if>
+            <if test="slotId != null">
+                and slot_id = #{slotId}
+            </if>
+            <if test="departmentId != null">
+                and department_id = #{departmentId}
+            </if>
+            <if test="doctorId != null">
+                and doctor_id = #{doctorId}
+            </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
+            <if test="payStatus != null">
+                and pay_status = #{payStatus}
+            </if>
+            <if test="appointmentDate != null">
+                and appointment_date = #{appointmentDate}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml
new file mode 100644
index 00000000..3962e573
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.clinical.mapper.TicketMapper">
+
+    <resultMap type="com.openhis.clinical.domain.Ticket" id="TicketResult">
+        <id property="id" column="id"/>
+        <result property="busNo" column="bus_no"/>
+        <result property="department" column="department"/>
+        <result property="doctor" column="doctor"/>
+        <result property="ticketType" column="ticket_type"/>
+        <result property="time" column="time"/>
+        <result property="status" column="status"/>
+        <result property="fee" column="fee"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="patientName" column="patient_name"/>
+        <result property="medicalCard" column="medical_card"/>
+        <result property="phone" column="phone"/>
+        <result property="appointmentDate" column="appointment_date"/>
+        <result property="appointmentTime" column="appointment_time"/>
+        <result property="departmentId" column="department_id"/>
+        <result property="doctorId" column="doctor_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="selectTicketList" parameterType="com.openhis.clinical.domain.Ticket" resultMap="TicketResult">
+        select * from clinical_ticket
+        <where>
+            <!-- 逻辑删除条件 -->
+            and delete_flag = '0'
+            <!-- 其他查询条件 -->
+            <if test="ticketType != null and ticketType != ''">
+                and ticket_type = #{ticketType}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="appointmentDate != null">
+                and appointment_date = cast(#{appointmentDate} as date)
+            </if>
+            <if test="doctorId != null">
+                and doctor_id = #{doctorId}
+            </if>
+            <if test="departmentId != null">
+                and department_id = #{departmentId}
+            </if>
+            <if test="time != null and time != ''">
+                and time like #{time}
+            </if>
+            <if test="patientName != null and patientName != ''">
+                and patient_name = #{patientName}
+            </if>
+            <if test="medicalCard != null and medicalCard != ''">
+                and medical_card = #{medicalCard}
+            </if>
+            <if test="phone != null and phone != ''">
+                and phone = #{phone}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectTicketPage" resultMap="TicketResult">
+        select * from clinical_ticket
+        <where>
+            <!-- 逻辑删除条件 -->
+            and delete_flag = '0'
+            <!-- 其他查询条件 -->
+            <if test="ticket.ticketType != null and ticket.ticketType != ''">
+                and ticket_type = #{ticket.ticketType}
+            </if>
+            <if test="ticket.status != null and ticket.status != ''">
+                and status = #{ticket.status}
+            </if>
+            <if test="ticket.appointmentDate != null">
+                and appointment_date = cast(#{ticket.appointmentDate} as date)
+            </if>
+            <if test="ticket.doctorId != null">
+                and doctor_id = #{ticket.doctorId}
+            </if>
+            <if test="ticket.departmentId != null">
+                and department_id = #{ticket.departmentId}
+            </if>
+            <if test="ticket.time != null and ticket.time != ''">
+                and time like #{ticket.time}
+            </if>
+            <if test="ticket.patientName != null and ticket.patientName != ''">
+                and patient_name = #{ticket.patientName}
+            </if>
+            <if test="ticket.medicalCard != null and ticket.medicalCard != ''">
+                and medical_card = #{ticket.medicalCard}
+            </if>
+            <if test="ticket.phone != null and ticket.phone != ''">
+                and phone = #{ticket.phone}
+            </if>
+        </where>
+    </select>
+
+    <!-- 自定义COUNT查询，解决MyBatis-Plus自动生成的COUNT查询结果不正确的问题 -->
+    <select id="selectTicketPage_mpCount" resultType="java.lang.Long">
+        select count(*) from clinical_ticket
+        <where>
+            <!-- 逻辑删除条件 -->
+            and delete_flag = '0'
+            <!-- 其他查询条件 -->
+            <if test="ticket.ticketType != null and ticket.ticketType != ''">
+                and ticket_type = #{ticket.ticketType}
+            </if>
+            <if test="ticket.status != null and ticket.status != ''">
+                and status = #{ticket.status}
+            </if>
+            <if test="ticket.appointmentDate != null">
+                and appointment_date = #{ticket.appointmentDate}
+            </if>
+            <if test="ticket.doctorId != null">
+                and doctor_id = #{ticket.doctorId}
+            </if>
+            <if test="ticket.departmentId != null">
+                and department_id = #{ticket.departmentId}
+            </if>
+            <if test="ticket.time != null and ticket.time != ''">
+                and time like #{ticket.time}
+            </if>
+            <if test="ticket.patientName != null and ticket.patientName != ''">
+                and patient_name = #{ticket.patientName}
+            </if>
+            <if test="ticket.medicalCard != null and ticket.medicalCard != ''">
+                and medical_card = #{ticket.medicalCard}
+            </if>
+            <if test="ticket.phone != null and ticket.phone != ''">
+                and phone = #{ticket.phone}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectTicketById" resultMap="TicketResult">
+        select * from clinical_ticket where id = #{id} and delete_flag = '0'
+    </select>
+
+    <insert id="insertTicket" parameterType="com.openhis.clinical.domain.Ticket">
+        insert into clinical_ticket
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="busNo != null and busNo != ''">bus_no,</if>
+            <if test="department != null and department != ''">department,</if>
+            <if test="doctor != null and doctor != ''">doctor,</if>
+            <if test="ticketType != null and ticketType != ''">ticket_type,</if>
+            <if test="time != null and time != ''">time,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="fee != null and fee != ''">fee,</if>
+            <if test="patientId != null">patient_id,</if>
+            <if test="patientName != null and patientName != ''">patient_name,</if>
+            <if test="medicalCard != null and medicalCard != ''">medical_card,</if>
+            <if test="phone != null and phone != ''">phone,</if>
+            <if test="appointmentDate != null">appointment_date,</if>
+            <if test="appointmentTime != null">appointment_time,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="doctorId != null">doctor_id,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="busNo != null and busNo != ''">#{busNo},</if>
+            <if test="department != null and department != ''">#{department},</if>
+            <if test="doctor != null and doctor != ''">#{doctor},</if>
+            <if test="ticketType != null and ticketType != ''">#{ticketType},</if>
+            <if test="time != null and time != ''">#{time},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="fee != null and fee != ''">#{fee},</if>
+            <if test="patientId != null">#{patientId},</if>
+            <if test="patientName != null and patientName != ''">#{patientName},</if>
+            <if test="medicalCard != null and medicalCard != ''">#{medicalCard},</if>
+            <if test="phone != null and phone != ''">#{phone},</if>
+            <if test="appointmentDate != null">#{appointmentDate},</if>
+            <if test="appointmentTime != null">#{appointmentTime},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="doctorId != null">#{doctorId},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTicket" parameterType="com.openhis.clinical.domain.Ticket">
+        update clinical_ticket
+        <trim prefix="set" suffixOverrides=",">
+            <if test="busNo != null and busNo != ''">bus_no = #{busNo},</if>
+            <if test="department != null and department != ''">department = #{department},</if>
+            <if test="doctor != null and doctor != ''">doctor = #{doctor},</if>
+            <if test="ticketType != null and ticketType != ''">ticket_type = #{ticketType},</if>
+            <if test="time != null and time != ''">time = #{time},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="fee != null and fee != ''">fee = #{fee},</if>
+            <if test="patientId != null">patient_id = #{patientId},</if>
+            <if test="patientName != null and patientName != ''">patient_name = #{patientName},</if>
+            <if test="medicalCard != null and medicalCard != ''">medical_card = #{medicalCard},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="appointmentDate != null">appointment_date = #{appointmentDate},</if>
+            <if test="appointmentTime != null">appointment_time = #{appointmentTime},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="doctorId != null">doctor_id = #{doctorId},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTicketById">
+        delete from clinical_ticket where id = #{id}
+    </delete>
+
+    <delete id="deleteTicketByIds">
+        delete from clinical_ticket where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="countTickets" resultType="int">
+        select count(*) from clinical_ticket
+        <where>
+            <if test="ticketType != null and ticketType != ''">
+                and ticket_type = #{ticketType}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="appointmentDate != null">
+                and appointment_date = cast(#{appointmentDate} as date)
+            </if>
+            <if test="doctorId != null">
+                and doctor_id = #{doctorId}
+            </if>
+            <if test="departmentId != null">
+                and department_id = #{departmentId}
+            </if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/start.bat b/openhis-server-new/start.bat
new file mode 100644
index 00000000..7183fa66
--- /dev/null
+++ b/openhis-server-new/start.bat
@@ -0,0 +1,10 @@
+@echo off
+
+rem 设置项目根目录
+set PROJECT_ROOT=%~dp0
+
+rem 设置classpath
+set CLASSPATH=%PROJECT_ROOT%openhis-application\target\classes;%PROJECT_ROOT%openhis-domain\target\classes;%PROJECT_ROOT%openhis-common\target\classes;%PROJECT_ROOT%core-admin\target\classes;%PROJECT_ROOT%core-framework\target\classes;%PROJECT_ROOT%core-system\target\classes;%PROJECT_ROOT%core-quartz\target\classes;%PROJECT_ROOT%core-generator\target\classes;%PROJECT_ROOT%core-flowable\target\classes;%PROJECT_ROOT%core-common\target\classes
+
+rem 启动应用
+java -cp "%CLASSPATH%" com.openhis.OpenHisApplication
\ No newline at end of file
diff --git a/openhis-server-new/start.sh b/openhis-server-new/start.sh
new file mode 100644
index 00000000..a6066334
--- /dev/null
+++ b/openhis-server-new/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# 设置项目根目录
+PROJECT_ROOT=$(pwd)
+
+# 设置classpath
+CLASSPATH="$PROJECT_ROOT/openhis-application/target/classes:$PROJECT_ROOT/openhis-domain/target/classes:$PROJECT_ROOT/openhis-common/target/classes:$PROJECT_ROOT/core-admin/target/classes:$PROJECT_ROOT/core-framework/target/classes:$PROJECT_ROOT/core-system/target/classes:$PROJECT_ROOT/core-quartz/target/classes:$PROJECT_ROOT/core-generator/target/classes:$PROJECT_ROOT/core-flowable/target/classes:$PROJECT_ROOT/core-common/target/classes"
+
+# 添加所有依赖jar包
+export CLASSPATH="$CLASSPATH:$(find $PROJECT_ROOT/openhis-application/target/dependency -name '*.jar' | tr '\n' ':')"
+
+# 启动应用
+java -cp "$CLASSPATH" com.openhis.OpenHisApplication
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/api/appoinmentmanage/ticket.js b/openhis-ui-vue3/src/api/appoinmentmanage/ticket.js
new file mode 100644
index 00000000..dd3834d3
--- /dev/null
+++ b/openhis-ui-vue3/src/api/appoinmentmanage/ticket.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 查询号源列表
+export function listTicket(query) {
+  return request({
+    url: '/appointment/ticket/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 预约号源
+export function bookTicket(data) {
+  return request({
+    url: '/appointment/ticket/book',
+    method: 'post',
+    data: data
+  })
+}
+
+// 取消预约
+export function cancelTicket(ticketId) {
+  return request({
+    url: '/appointment/ticket/cancel',
+    method: 'post',
+    params: { ticketId }
+  })
+}
+
+// 取号
+export function checkInTicket(ticketId) {
+  return request({
+    url: '/appointment/ticket/checkin',
+    method: 'post',
+    params: { ticketId }
+  })
+}
+
+// 停诊
+export function cancelConsultation(ticketId) {
+  return request({
+    url: '/appointment/ticket/cancelConsultation',
+    method: 'post',
+    params: { ticketId }
+  })
+}
+
+// 查询所有号源（用于测试）
+export function listAllTickets() {
+  return request({
+    url: '/appointment/ticket/listAll',
+    method: 'get',
+    headers: {
+      isToken: false
+    }
+  })
+}
diff --git a/openhis-ui-vue3/src/components/TopNav/index.vue b/openhis-ui-vue3/src/components/TopNav/index.vue
index 53594e4a..7164f866 100644
--- a/openhis-ui-vue3/src/components/TopNav/index.vue
+++ b/openhis-ui-vue3/src/components/TopNav/index.vue
@@ -6,27 +6,62 @@
     :ellipsis="false"
   >
     <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
-        <svg-icon
-        v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-        :icon-class="item.meta.icon"/>
-        {{ item.meta.title }}
-      </el-menu-item>
+      <!-- 处理有子菜单的情况 -->
+      <template v-if="item.children && item.children.length > 0 && index < visibleNumber">
+        <el-sub-menu :style="{'--theme': theme}" :index="item.path" :key="index">
+          <template #title>
+            <svg-icon
+            v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+            :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </template>
+          <template v-for="(child, childIndex) in item.children" :key="childIndex">
+            <el-menu-item :index="item.path + '/' + (child.path || '')">
+              {{ child.meta.title }}
+            </el-menu-item>
+          </template>
+        </el-sub-menu>
+      </template>
+      <!-- 处理无子菜单的情况 -->
+      <template v-else-if="index < visibleNumber">
+        <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index">
+          <svg-icon
+          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+          :icon-class="item.meta.icon"/>
+          {{ item.meta.title }}
+        </el-menu-item>
+      </template>
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
     <el-sub-menu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
       <template #title>更多菜单</template>
-      <template v-for="(item, index) in topMenus">
-        <el-menu-item
-          :index="item.path"
-          :key="index"
-          v-if="index >= visibleNumber">
-        <svg-icon
-          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-          :icon-class="item.meta.icon"/>
-        {{ item.meta.title }}
-        </el-menu-item>
+      <template v-for="(item, index) in topMenus" :key="index">
+        <!-- 处理有子菜单的情况 -->
+        <template v-if="item.children && item.children.length > 0 && index >= visibleNumber">
+          <el-sub-menu :index="item.path">
+            <template #title>
+              <svg-icon
+              v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+              :icon-class="item.meta.icon"/>
+              {{ item.meta.title }}
+            </template>
+            <template v-for="(child, childIndex) in item.children" :key="childIndex">
+              <el-menu-item :index="item.path + '/' + (child.path || '')">
+                {{ child.meta.title }}
+              </el-menu-item>
+            </template>
+          </el-sub-menu>
+        </template>
+        <!-- 处理无子菜单的情况 -->
+        <template v-else-if="index >= visibleNumber">
+          <el-menu-item :index="item.path">
+            <svg-icon
+            v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+            :icon-class="item.meta.icon"/>
+            {{ item.meta.title }}
+          </el-menu-item>
+        </template>
       </template>
     </el-sub-menu>
   </el-menu>
@@ -108,6 +143,20 @@ const activeMenu = computed(() => {
     activePath = path;
     appStore.toggleSideBarHide(true);
   }
+  
+  // 检查当前路径是否是子菜单路径
+  let isChildRoute = false;
+  for (const item of routers.value) {
+    if (item.children && item.children.length > 0) {
+      const childRoute = item.children.find(child => (item.path + '/' + (child.path || '')) === path);
+      if (childRoute) {
+        isChildRoute = true;
+        activePath = item.path; // 激活父菜单
+        break;
+      }
+    }
+  }
+  
   activeRoutes(activePath);
   return activePath;
 })
@@ -123,20 +172,42 @@ function handleSelect(key, keyPath) {
   if (isHttp(key)) {
     // http(s):// 路径新窗口打开
     window.open(key, "_blank");
-  } else if (!route || !route.children) {
-    // 没有子路由路径内部打开
-    const routeMenu = childrenMenus.value.find(item => item.path === key);
-    if (routeMenu && routeMenu.query) {
-      let query = JSON.parse(routeMenu.query);
-      router.push({ path: key, query: query });
-    } else {
-      router.push({ path: key });
-    }
-    appStore.toggleSideBarHide(true);
   } else {
-    // 显示左侧联动菜单
-    activeRoutes(key);
-    appStore.toggleSideBarHide(false);
+    // 检查是否是子菜单路径
+    let isChildRoute = false;
+    let parentRoute = null;
+    
+    // 查找父路由
+    for (const item of routers.value) {
+      if (item.children && item.children.length > 0) {
+        const childRoute = item.children.find(child => (item.path + '/' + (child.path || '')) === key);
+        if (childRoute) {
+          isChildRoute = true;
+          parentRoute = item;
+          break;
+        }
+      }
+    }
+    
+    if (isChildRoute) {
+      // 处理子菜单路径
+      router.push({ path: key });
+      appStore.toggleSideBarHide(true);
+    } else if (!route || !route.children) {
+      // 没有子路由路径内部打开
+      const routeMenu = childrenMenus.value.find(item => item.path === key);
+      if (routeMenu && routeMenu.query) {
+        let query = JSON.parse(routeMenu.query);
+        router.push({ path: key, query: query });
+      } else {
+        router.push({ path: key });
+      }
+      appStore.toggleSideBarHide(true);
+    } else {
+      // 显示左侧联动菜单
+      activeRoutes(key);
+      appStore.toggleSideBarHide(false);
+    }
   }
 }
 
diff --git a/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue b/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
index 9fa5447b..fb747600 100644
--- a/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
+++ b/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
@@ -9,7 +9,7 @@
       </app-link>
     </template>
 
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
+    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)">
       <template v-if="item.meta" #title>
         <svg-icon v-if="item.meta.icon" :icon-class="item.meta.icon" />
         <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>
diff --git a/openhis-ui-vue3/src/layout/components/Sidebar/index.vue b/openhis-ui-vue3/src/layout/components/Sidebar/index.vue
index 1256cb48..55a6b936 100644
--- a/openhis-ui-vue3/src/layout/components/Sidebar/index.vue
+++ b/openhis-ui-vue3/src/layout/components/Sidebar/index.vue
@@ -58,7 +58,7 @@ const isCollapse = computed(() => !appStore.sidebar.opened);
 
 const activeMenu = computed(() => {
   const { meta, path } = route;
-  // if set path, the sidebar will highlight the path you set
+  // if set path, sidebar will highlight the path you set
   if (meta.activeMenu) {
     return meta.activeMenu;
   }
@@ -183,4 +183,4 @@ const activeMenu = computed(() => {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index 806091ac..94ff9cda 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -1,32 +1,31 @@
-import {createRouter, createWebHistory} from 'vue-router';
+import { createWebHistory, createRouter } from 'vue-router'
 /* Layout */
-import Layout from '@/layout';
+import Layout from '@/layout'
 
 /**
- * Note: 路由配置项说明
+ * Note: 路由配置项
  *
- * hidden: true                     // 当设置 true 时，该路由不会在侧边栏出现（如401、login等页面，或一些编辑页面/edit/1）
- * alwaysShow: true                 // 当路由下的 children 声明的路由大于1个时，自动变为嵌套模式（如组件页面）
- *                                  // 只有一个时，会将子路由作为根路由显示在侧边栏（如引导页面）
- *                                  // 若想不管 children 个数都显示根路由，可设置 alwaysShow: true，忽略之前定义的规则
- * redirect: noRedirect             // 当设置 noRedirect 时，该路由在面包屑导航中不可点击
- * name:'router-name'               // 设定路由的名字，必须填写，否则使用<keep-alive>时会出现问题
+ * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
+ * alwaysShow: true                 // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+ *                                  // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
+ *                                  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
+ *                                  // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
+ * redirect: noRedirect             // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+ * name:'router-name'               // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
  * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
  * roles: ['admin', 'common']       // 访问路由的角色权限
  * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
- * meta: {
-    noCache: true                  // 如果设置为true，则不会被 <keep-alive> 缓存（默认 false）
-    title: 'title'                 // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'               // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false              // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/user'     // 当路由设置了该属性，则会高亮对应的侧边栏
+ * meta : {
+    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
+    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
+    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
+    activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
   }
  */
 
-// 公共路由 - 所有用户均可访问的路由
+// 公共路由
 export const constantRoutes = [
-  
-  // 重定向路由
   {
     path: '/redirect',
     component: Layout,
@@ -34,33 +33,25 @@ export const constantRoutes = [
     children: [
       {
         path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index.vue'),
-      },
-    ],
+        component: () => import('@/views/redirect/index.vue')
+      }
+    ]
   },
-  // 登录路由
   {
     path: '/login',
     component: () => import('@/views/login'),
-    hidden: true,
+    hidden: true
   },
-  // 注册路由
   {
     path: '/register',
     component: () => import('@/views/register'),
-    hidden: true,
-  },
-  {
-    path: '/:pathMatch(.*)*',
-    component: () => import('@/views/error/404'),
-    hidden: true,
+    hidden: true
   },
   {
     path: '/401',
     component: () => import('@/views/error/401'),
-    hidden: true,
+    hidden: true
   },
-  // 首页路由
   {
     path: '',
     component: Layout,
@@ -70,9 +61,9 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true },
-      },
-    ],
+        meta: { title: '首页', icon: 'dashboard', affix: true }
+      }
+    ]
   },
   {
     path: '/user',
@@ -84,123 +75,154 @@ 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: '套餐管理' }
+      }
+    ]
+  }
+]
+
+// 动态路由，基于用户权限动态去加载
+  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/ywgz',
+      component: Layout,
+      redirect: '/system/ywgz/InvoiceManagement',
+      hidden: true,
+      children: [
+        {
+          path: 'InvoiceManagement',
+          component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
+          name: 'SystemInvoiceManagement',
+          meta: { title: '发票管理' }
+        }
+      ]
+    },
+  {
+    path: '/maintainSystem',
+    component: Layout,
+    redirect: '/maintainSystem/chargeConfig',
+    name: 'MaintainSystem',
+    meta: { title: '维护系统', icon: 'system' },
+    children: [
+      {
+        path: '',
+        redirect: 'chargeConfig'
       },
-    ],
+      {
+        path: 'chargeConfig',
+        component: () => import('@/views/maintainSystem/chargeConfig/index.vue'),
+        name: 'ChargeConfig',
+        meta: { title: '挂号收费系统参数维护', icon: 'config', permissions: ['maintainSystem:chargeConfig:list'] }
+      },
+      {
+        path: 'Inspection',
+        component: () => import('@/views/maintainSystem/Inspection/index.vue'),
+        name: 'Inspection',
+        meta: { title: '检验管理', icon: 'inspection' },
+        children: [
+          {
+            path: 'PackageManagement',
+            component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
+            name: 'PackageManagement',
+            meta: { title: '套餐管理' }
+          }
+        ]
+      }
+    ]
   },
   {
-    path: '/tpr',
-    component: () => import('@/views/inpatientNurse/tprsheet/index.vue'),
-  }
-];
-
-// 动态路由 - 基于用户权限动态加载的路由
-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/ywgz',
-  //   component: Layout,
-  //   redirect: '/system/ywgz/InvoiceManagement',
-  //   hidden: true,
-  //   children: [
-  //     {
-  //       path: 'InvoiceManagement',
-  //       component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
-  //       name: 'SystemInvoiceManagement',
-  //       meta: { title: '发票管理' }
-  //     }
-  //   ]
-  // },
-  // 维护系统路由
-  // {
-  //   path: '/maintainSystem',
-  //   component: Layout,
-  //   redirect: '/maintainSystem/chargeConfig',
-  //   name: 'MaintainSystem',
-  //   meta: { title: '维护系统', icon: 'system' },
-  //   children: [
-  //     {
-  //       path: '',
-  //       redirect: 'chargeConfig',
-  //       name: 'MaintainSystemIndex' // 添加名称以解决警告
-  //     },
-  //     {
-  //       path: 'chargeConfig', // 收费配置路由
-  //       component: () => import('@/views/maintainSystem/chargeConfig/index.vue'),
-  //       name: 'ChargeConfig',
-  //       meta: { title: '挂号收费系统参数维护', icon: 'config', permissions: ['maintainSystem:chargeConfig:list'] }
-  //     },
-  //     { 
-  //       path: 'Inspection', // 检验管理路由
-  //       component: () => import('@/views/maintainSystem/Inspection/index.vue'),
-  //       name: 'Inspection',
-  //       meta: { title: '检验管理', icon: 'inspection' },
-  //       children: [
-  //         {
-  //           path: 'PackageManagement', // 套餐管理路由
-  //           component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
-  //           name: 'PackageManagement',
-  //           meta: { title: '套餐管理' }
-  //         }
-  //       ]
-  //     }
-  //   ]
-  // },
-  // 系统管理路由
-  // {
-  //   path: '/system',
-  //   component: Layout,
-  //   redirect: '/system/user',
-  //   name: 'System',
-  //   meta: { title: '系统管理', icon: 'system' },
-  //   children: [
-  //     {
-  //       path: 'basicdata',
-  //       component: Layout,
-  //       redirect: '/system/basicdata/location',
-  //       name: 'BasicData',
-  //       meta: { title: '基础数据', icon: 'location' },
-  //       children: [
-  //         {
-  //           path: 'operatingroom',
-  //           component: () => import('@/views/operatingroom/index.vue'),
-  //           name: 'OperatingRoomManage',
-  //           meta: { title: '手术室管理' }
-  //         }
-  //       ]
-  //     }
-  //   ]
-  // },
-  // 租户用户设置路由
-  //{
-  //   path: '/patient',
-  //   component: Layout,
-  //   hidden: true,
-  //   children: [
-  //     {
-  //       path: 'patientmgr',
-  //       component: () => import('@/views/patientmanagement/patientmanagement/index.vue'),
-  //       name: 'Patientmgr',
-  //       meta: { title: '患者档案管理', icon: 'user' }
-  //     }
-  //   ]
-  // },
+    path: '/system',
+    component: Layout,
+    redirect: '/system/user',
+    name: 'System',
+    meta: { title: '系统管理', icon: 'system' },
+    children: [
+      {
+        path: 'user',
+        component: () => import('@/views/system/user/index.vue'),
+        name: 'User',
+        meta: { title: '用户管理', icon: 'user', permissions: ['system:user:list'] }
+      },
+      {
+        path: 'role',
+        component: () => import('@/views/system/role/index.vue'),
+        name: 'Role',
+        meta: { title: '角色管理', icon: 'role', permissions: ['system:role:list'] }
+      },
+      {
+        path: 'menu',
+        component: () => import('@/views/system/menu/index.vue'),
+        name: 'Menu',
+        meta: { title: '菜单管理', icon: 'menu', permissions: ['system:menu:list'] }
+      },
+      {
+        path: 'dept',
+        component: () => import('@/views/system/dept/index.vue'),
+        name: 'Dept',
+        meta: { title: '部门管理', icon: 'dept', permissions: ['system:dept:list'] }
+      },
+      {
+        path: 'post',
+        component: () => import('@/views/system/post/index.vue'),
+        name: 'Post',
+        meta: { title: '岗位管理', icon: 'post', permissions: ['system:post:list'] }
+      },
+      {
+        path: 'dict',
+        component: () => import('@/views/system/dict/index.vue'),
+        name: 'Dict',
+        meta: { title: '字典管理', icon: 'dict', permissions: ['system:dict:list'] }
+      },
+      {
+        path: 'config',
+        component: () => import('@/views/system/config/index.vue'),
+        name: 'Config',
+        meta: { title: '参数配置', icon: 'config', permissions: ['system:config:list'] }
+      },
+      {
+        path: 'notice',
+        component: () => import('@/views/system/notice/index.vue'),
+        name: 'Notice',
+        meta: { title: '通知公告', icon: 'notice', permissions: ['system:notice:list'] }
+      },
+      {
+        path: 'tenant',
+        component: () => import('@/views/system/tenant/index.vue'),
+        name: 'Tenant',
+        meta: { title: '租户管理', icon: 'tenant', permissions: ['system:tenant:list'] }
+      }
+    ]
+  },
   {
     path: '/system/tenant-user',
     component: Layout,
@@ -211,11 +233,10 @@ export const dynamicRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setUser'),
         name: 'SetUser',
-        meta: { title: '所属用户', activeMenu: '/system/basicmanage/tenant' },
-      },
-    ],
+        meta: { title: '所属用户', activeMenu: '/system/tenant' }
+      }
+    ]
   },
-  // 租户合同管理路由
   {
     path: '/system/tenant-contract',
     component: Layout,
@@ -226,23 +247,7 @@ export const dynamicRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setContract'),
         name: 'SetContract',
-        meta: { title: '合同管理', activeMenu: '/system/basicmanage/tenant' },
-      },
-    ],
-  },
-  // 预约管理路由
-  {
-    path: '/appoinmentmanage',
-    component: Layout,
-    redirect: '/appoinmentmanage/deptappthoursManage',
-    name: 'AppoinmentManage',
-    meta: { title: '预约管理', icon: 'appointment' },
-    children: [
-      {
-        path: 'deptappthoursManage',
-        component: () => import('@/views/appoinmentmanage/deptappthoursManage/index.vue'),
-        name: 'DeptAppthoursManage',
-        meta: { title: '科室预约工作时间维护', icon: 'appointment' }
+        meta: { title: '合同管理', activeMenu: '/system/tenant' }
       }
     ]
   },
@@ -256,9 +261,9 @@ export const dynamicRoutes = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' },
-      },
-    ],
+        meta: { title: '分配角色', activeMenu: '/system/user' }
+      }
+    ]
   },
   {
     path: '/system/role-auth',
@@ -270,9 +275,9 @@ export const dynamicRoutes = [
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' },
-      },
-    ],
+        meta: { title: '分配用户', activeMenu: '/system/role' }
+      }
+    ]
   },
   {
     path: '/system/dict-data',
@@ -284,9 +289,51 @@ export const dynamicRoutes = [
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data'),
         name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' },
+        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',
@@ -298,9 +345,9 @@ export const dynamicRoutes = [
         path: 'index/:jobId(\\d+)',
         component: () => import('@/views/monitor/job/log'),
         name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' },
-      },
-    ],
+        meta: { title: '调度日志', activeMenu: '/monitor/job' }
+      }
+    ]
   },
   {
     path: '/tool/gen-edit',
@@ -312,35 +359,32 @@ export const dynamicRoutes = [
         path: 'index/:tableId(\\d+)',
         component: () => import('@/views/tool/gen/editTable'),
         name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' },
-      },
-    ],
-  },
-];
+        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+      }
+    ]
+  }
+]
 
 // 合并常量路由和动态路由，确保所有路由都能被访问
 const allRoutes = [...constantRoutes, ...dynamicRoutes];
 
-// 添加404路由到所有路由的最后，确保捕获所有未匹配的路由
+// 添加404路由到所有路由的最后
 allRoutes.push({
   path: "/:pathMatch(.*)*",
   component: () => import('@/views/error/404'),
   hidden: true
 });
 
-// 创建Vue Router实例
 const router = createRouter({
-  history: createWebHistory(), // 使用HTML5历史模式
-  routes: allRoutes, // 使用合并后的所有路由
+  history: createWebHistory(),
+  routes: allRoutes,
   scrollBehavior(to, from, savedPosition) {
-    // 页面滚动行为：如果有保存的位置则恢复，否则滚动到顶部
     if (savedPosition) {
-      return savedPosition;
+      return savedPosition
     } else {
-      return { top: 0 };
+      return { top: 0 }
     }
   },
 });
 
-// 导出路由实例
-export default router;
\ No newline at end of file
+export default router;
diff --git a/openhis-ui-vue3/src/store/modules/user.js b/openhis-ui-vue3/src/store/modules/user.js
index b1bf55ea..7068f658 100644
--- a/openhis-ui-vue3/src/store/modules/user.js
+++ b/openhis-ui-vue3/src/store/modules/user.js
@@ -1,7 +1,7 @@
-import {getInfo, login, logout} from '@/api/login'
-import {getToken, removeToken, setToken} from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
 import defAva from '@/assets/images/user.png'
-import {defineStore} from 'pinia'
+import { defineStore } from 'pinia'
 
 const useUserStore = defineStore(
   'user',
@@ -19,9 +19,7 @@ const useUserStore = defineStore(
       roles: [],
       permissions: [],
       tenantId: '',
-      tenantName: '', // 租户名称
-      hospitalName:'',
-      optionMap: {} // 租户配置项Map（从sys_tenant_option表读取）
+      hospitalName:''
     }),
     actions: {
       // 登录
@@ -64,10 +62,9 @@ const useUserStore = defineStore(
             this.practitionerId = res.practitionerId
             this.fixmedinsCode = res.optionJson.fixmedinsCode
             this.avatar = avatar
-            this.optionMap = res.optionMap || {}
-            // 优先从optionMap获取配置，如果没有则从optionJson获取
-            this.hospitalName = this.optionMap.hospitalName || res.optionJson.hospitalName || ''
-            this.tenantName = res.tenantName || ''
+            this.hospitalName = res.optionJson.hospitalName
+            // 获取tenantId，优先从res.user获取，否则从res获取
+            this.tenantId = user.tenantId || res.tenantId || this.tenantId
 
             resolve(res)
           }).catch(error => {
diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue
new file mode 100644
index 00000000..c997f315
--- /dev/null
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/index.vue
@@ -0,0 +1,1681 @@
+<template>
+  <div class="ticket-management-container">
+    <!-- 顶部搜索区域 -->
+    <div id="topSearchArea" class="top-search-area">
+      <!-- 搜索标签行 -->
+      <div class="search-labels">
+        <div class="search-label">导源日期</div>
+        <div class="search-label">状态</div>
+        <div class="search-label">患者姓名</div>
+        <div class="search-label">就诊卡号</div>
+        <div class="search-label">手机号</div>
+        <div class="search-label"></div> <!-- 为查询按钮预留空间 -->
+      </div>
+      
+      <!-- 搜索输入行 -->
+      <div class="search-inputs">
+        <!-- 移动端汉堡菜单按钮 -->
+        <div class="hamburger-menu" @click="toggleSidebar" v-if="isMobile">
+          <i class="el-icon-menu"></i>
+        </div>
+        <div id="datePicker" class="date-picker">
+          <el-date-picker
+            v-model="selectedDate"
+            type="date"
+            placeholder="选择日期"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
+            :shortcuts="dateShortcuts"
+            class="date-picker"
+            @change="onDateChange"
+          />
+        </div>
+        <div id="statusFilter" class="status-filter">
+          <select id="status-select" class="search-select" v-model="selectedStatus">
+            <option value="all">全部</option>
+            <option value="unbooked">未预约</option>
+            <option value="locked">锁定</option>
+            <option value="booked">待缴费</option>
+            <option value="checked">已取号</option>
+            <option value="cancelled">已停诊</option>
+          </select>
+        </div>
+        <div id="patientSearch" class="patient-search">
+          <input id="patient-name-input" class="search-input" placeholder="姓名" v-model="patientName">
+        </div>
+        <div id="cardSearch" class="card-search">
+          <input id="patient-card-input" class="search-input" placeholder="就诊卡号" v-model="patientCard">
+        </div>
+        <div id="phoneSearch" class="phone-search">
+          <input id="patient-phone-input" class="search-input" placeholder="手机号" v-model="patientPhone">
+        </div>
+        <div class="search-button">
+          <button id="search-button" class="search-btn" @click="onSearch" :disabled="isLoading">
+            <span v-if="isLoading" class="loading-text">搜索中...</span>
+            <span v-else>查询</span>
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 主要内容区域 -->
+    <div id="mainContent" class="main-content">
+      <!-- 左侧筛选区域 -->
+      <div id="leftSidebar" class="left-sidebar" :class="{ 'sidebar-hidden': isMobile && !showSidebar, 'sidebar-mobile': isMobile }">
+        <!-- 科室列表 -->
+        <div class="section">
+          <h3 class="section-title">科室列表</h3>
+          <select id="department-list" class="search-select" v-model="selectedDepartment" @change="onDepartmentChange">
+            <option value="all">全部科室</option>
+            <option v-for="department in departments" :key="department.value" :value="department.value">
+              {{ department.label }}
+            </option>
+          </select>
+        </div>
+
+        <!-- 号源类型 -->
+        <div class="section">
+          <h3 class="section-title">号源类型</h3>
+          <div class="radio-group">
+            <label>
+              <input type="radio" name="type" value="general" v-model="selectedType" @change="onTypeChange">
+              <span>普通号</span>
+            </label>
+            <label>
+              <input type="radio" name="type" value="expert" v-model="selectedType" @change="onTypeChange">
+              <span>专家号</span>
+            </label>
+          </div>
+        </div>
+
+        <!-- 医生号源列表 -->
+        <div class="section">
+          <h3 class="section-title">医生号源列表</h3>
+          <input id="doctor-search" class="search-input" placeholder="搜索医生姓名" v-model="searchQuery" @input="onDoctorSearch">
+          <div class="doctor-list">
+            <div class="doctor-item" v-for="doctor in filteredDoctors" :key="doctor.id" :class="{ selected: selectedDoctorId === doctor.id }" @click="selectDoctor(doctor.id)">
+              <div class="doctor-name">{{ doctor.name }} <span class="doctor-available">余号：{{ doctor.available }}</span></div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 右侧号源卡片区域 -->
+      <div class="right-content" :class="{ 'right-content-full': isMobile && !showSidebar }">
+        <!-- 使用网格布局的号源卡片列表 -->
+        <div class="ticket-grid" v-if="filteredTickets.length > 0">
+          <div v-for="(item, index) in filteredTickets" :key="item.slot_id" class="ticket-card" @dblclick="handleDoubleClick(item)" @contextmenu.prevent="handleRightClick($event, item)">
+            <div class="ticket-header">
+              <div class="ticket-number">{{ index + 1 }}</div>
+              <div class="ticket-type-badge" :class="item.ticketType === 'general' ? 'type-general' : 'type-expert'">
+                {{ item.ticketType === 'general' ? '普通' : '专家' }}
+              </div>
+            </div>
+            <div class="ticket-time">{{ item.dateTime }}</div>
+            <div class="ticket-doctor">{{ item.doctor }}</div>
+            <div class="ticket-status" :class="`status-${item.status}`">
+              <span class="status-dot"></span>
+              {{ item.status }}
+            </div>
+            <div class="ticket-fee">挂号费: {{ item.fee }}</div>
+            <!-- 显示患者信息（如果已预约或已取号） -->
+            <div v-if="(item.status === '已预约' || item.status === '已取号') && item.patientName" class="ticket-patient">
+              <div class="patient-name">{{ item.patientName }}</div>
+              <div class="patient-card">{{ item.patientId }}</div>
+            </div>
+            <div class="ticket-actions">
+              <button class="action-button book-button" @click="openPatientSelectModal(item.slot_id)" :disabled="item.status !== '未预约'" :class="{ 'disabled': item.status !== '未预约' }">
+                <i class="el-icon-tickets"></i>
+                预约
+              </button>
+              <button class="action-button cancel-button" @click="confirmCancelConsultation(item)" :disabled="item.status === '已取消'" :class="{ 'disabled': item.status === '已取消' }">
+                <i class="el-icon-close"></i>
+                停诊
+              </button>
+              <button class="action-button check-in-button" @click="confirmCheckIn(item)" :disabled="item.status !== '已预约'" :class="{ 'disabled': item.status !== '已预约' }">
+                <i class="el-icon-circle-check"></i>
+                取号
+              </button>
+            </div>
+          </div>
+          <div v-if="hasMore" class="loading-more">
+            加载中...
+          </div>
+          <div v-else class="no-more">
+            没有更多数据了
+          </div>
+        </div>
+        <div v-else class="empty-state">
+          <div class="empty-text">暂无号源数据</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 患者选择弹窗 -->
+    <div id="patient-select-modal" class="modal" v-if="showPatientModal">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h3>选择患者</h3>
+          <button class="close-btn" @click="closePatientSelectModal">&times;</button>
+        </div>
+        <div class="modal-body">
+          <input id="patientName" class="search-input" placeholder="患者姓名" v-model="patientSearchParams.patientName" @input="onPatientSearchInput">
+          <input id="medicalCard" class="search-input" placeholder="就诊卡号" v-model="patientSearchParams.medicalCard" @input="onPatientSearchInput">
+          <input id="idCard" class="search-input" placeholder="身份证号" v-model="patientSearchParams.idCard" @input="onPatientSearchInput">
+          <input id="phone" class="search-input" placeholder="手机号" v-model="patientSearchParams.phone" @input="onPatientSearchInput">
+          <button id="patient-search-btn" class="search-btn" @click="searchPatients">查询</button>
+          <div class="patient-table-container">
+            <table id="patient-table" class="patient-table">
+              <thead>
+                <tr>
+                  <th>序号</th>
+                  <th>患者姓名</th>
+                  <th>就诊卡号</th>
+                  <th>身份证号</th>
+                  <th>手机号</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(patient, index) in patients" :key="patient.id" :class="{ selected: selectedPatientId === patient.id }" @click="selectPatient(patient.id)">
+                  <td>{{ index + 1 }}</td>
+                  <td>{{ patient.name }}</td>
+                  <td>{{ patient.medicalCard }}</td>
+                  <td>{{ patient.idCard }}</td>
+                  <td>{{ patient.phone }}</td>
+                  <td>
+                    <button class="select-btn" @click.stop="selectPatient(patient.id)">选择</button>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button class="confirm-btn" @click="confirmPatientSelection">确认</button>
+          <button class="cancel-btn" @click="closePatientSelectModal">取消</button>
+        </div>
+      </div>
+    </div>
+    <!-- 右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu"
+      :style="{
+        left: contextMenuPosition.x + 'px',
+        top: contextMenuPosition.y + 'px'
+      }"
+      @click.stop
+      @contextmenu.prevent
+    >
+      <div v-if="selectedTicketForCancel && (selectedTicketForCancel.status === 'booked' || selectedTicketForCancel.status === 'locked' || selectedTicketForCancel.status === 'checked')" class="menu-item" @click="confirmCancelAppointment">
+          取消预约
+        </div>
+    </div>
+
+    <!-- 点击页面其他地方关闭右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu-overlay"
+      @click="closeContextMenu"
+      @contextmenu.prevent
+    ></div>
+  </div>
+</template>
+
+<script>
+import { listTicket, bookTicket, cancelTicket, checkInTicket, cancelConsultation, listAllTickets } from '@/api/appoinmentmanage/ticket';
+import { getPatientList } from '@/api/cardRenewal/api';
+import { listDept } from '@/api/appoinmentmanage/dept';
+import { ref } from 'vue'
+import { ElDatePicker } from 'element-plus'
+
+export default {
+  name: 'AppoinmentManageIndex',
+  components: {
+    ElDatePicker
+  },
+  
+  // 添加全局点击事件监听器，用于关闭右键菜单
+  mounted() {
+    document.addEventListener('click', this.closeContextMenu);
+  },
+  
+  // 移除事件监听器
+  beforeUnmount() {
+    document.removeEventListener('click', this.closeContextMenu);
+  },
+  data() {
+    return {
+      selectedDate: new Date().toISOString().split('T')[0],
+      selectedStatus: 'unbooked',
+      selectedDepartment: 'all',
+      selectedType: 'general', // 普通号默认选中
+      selectedDoctorId: null,
+      showPatientModal: false,
+      selectedPatientId: null,
+      selectedPatient: null,
+      currentTicket: null,
+      patientName: '',
+      patientCard: '',
+      patientPhone: '',
+      isLoading: false,
+      // 移动端相关变量
+      isMobile: false,
+      showSidebar: false,
+      // 分页相关属性
+      currentPage: 1,
+      pageSize: 20,
+      totalTickets: 0,
+      hasMore: true,
+      // 右键菜单相关
+      contextMenuVisible: false,
+      contextMenuPosition: { x: 0, y: 0 },
+      selectedTicketForCancel: null,
+      departments: [
+        { value: 'all', label: '全部科室' }
+      ],
+      doctors: [],
+      allTickets: [], // 存储所有原始号源数据
+      tickets: [], // 从API获取的真实号源数据
+      patients: [], // 从API获取的真实患者数据
+      searchQuery: '',
+      // 患者搜索相关
+      patientSearchParams: {
+        patientName: '',
+        medicalCard: '',
+        idCard: '',
+        phone: ''
+      },
+      dateShortcuts: [
+        { text: '今天', value: new Date() },
+        { text: '明天', value: () => { const date = new Date(); date.setDate(date.getDate() + 1); return date; } },
+        { text: '本周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 1); return date; } },
+        { text: '下周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 8); return date; } },
+        { text: '本月', value: () => { const date = new Date(); date.setDate(1); return date; } },
+        { text: '下月', value: () => { const date = new Date(); date.setMonth(date.getMonth() + 1); date.setDate(1); return date; } }
+      ]
+    }
+  },
+  computed: {
+    filteredDoctors() {
+      let filtered = [...this.doctors];
+      
+      // 根据号源类型过滤医生列表
+      if (this.selectedType === 'general') {
+        filtered = filtered.filter(doctor => doctor.type === 'general');
+      } else if (this.selectedType === 'expert') {
+        filtered = filtered.filter(doctor => doctor.type === 'expert');
+      }
+      
+      // 根据搜索关键词过滤
+      if (this.searchQuery) {
+        filtered = filtered.filter(doctor => 
+          doctor.name.includes(this.searchQuery)
+        );
+      }
+      
+      return filtered;
+    },
+    filteredTickets() {
+      let filtered = [...this.tickets];
+      
+      // 按日期筛选（如果选择了日期） - 暂时注释掉以排查问题
+      // if (this.selectedDate) {
+      //   filtered = filtered.filter(ticket => {
+      //     // 使用后端返回的dateTime字段进行筛选
+      //     if (ticket.dateTime) {
+      //       return ticket.dateTime.startsWith(this.selectedDate);
+      //     }
+      //     return true;
+      //   });
+      // }
+      
+      // 按状态筛选 - 暂时注释掉以排查问题
+      // if (this.selectedStatus !== 'all') {
+      //   // 状态映射表（后端返回中文状态，前端使用英文状态）
+      //   const statusMap = {
+      //     'unbooked': '未预约',
+      //     'locked': '已锁定',
+      //     'booked': '已预约',
+      //     'checked': '已取号',
+      //     'cancelled': '已取消'
+      //   };
+      //   const chineseStatus = statusMap[this.selectedStatus];
+      //   filtered = filtered.filter(ticket => ticket.status === chineseStatus);
+      // }
+      
+      // 按科室筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDepartment !== 'all') {
+      //   filtered = filtered.filter(ticket => ticket.department === this.selectedDepartment);
+      // }
+      
+      // 按号源类型筛选 - 暂时注释掉以排查问题
+      // filtered = filtered.filter(ticket => {
+      //   if (this.selectedType === 'general') {
+      //     return ticket.ticketType === 'general';
+      //   } else if (this.selectedType === 'expert') {
+      //     return ticket.ticketType === 'expert';
+      //   }
+      //   return true;
+      // });
+      
+      // 按医生筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDoctorId) {
+      //   const selectedDoctor = this.doctors.find(d => d.id === this.selectedDoctorId);
+      //   if (selectedDoctor) {
+      //     filtered = filtered.filter(ticket => ticket.doctor === selectedDoctor.name);
+      //   }
+      // }
+      
+      // 按患者信息筛选（姓名、就诊卡号、手机号） - 暂时注释掉以排查问题
+      // if (this.patientName || this.patientCard || this.patientPhone) {
+      //   filtered = filtered.filter(ticket => {
+      //     const matchesName = !this.patientName || ticket.patientName?.includes(this.patientName);
+      //     const matchesCard = !this.patientCard || ticket.patientId?.includes(this.patientCard);
+      //     const matchesPhone = !this.patientPhone || ticket.phone?.includes(this.patientPhone);
+      //     
+      //     return matchesName && matchesCard && matchesPhone;
+      //   });
+      // }
+      
+      return filtered;
+    },
+  },
+  methods: {
+    selectDoctor(doctorId) {
+      this.selectedDoctorId = doctorId
+      console.log('Selected doctor:', doctorId)
+      // 医生选择后，筛选号源
+      this.onSearch();
+    },
+    onTypeChange() {
+      console.log('Type changed:', this.selectedType)
+      this.onSearch()
+    },
+    onDepartmentChange() {
+      console.log('Department changed:', this.selectedDepartment)
+      this.onSearch()
+    },
+    onDoctorSearch() {
+      console.log('Searching doctor:', this.searchQuery)
+      this.onSearch()
+    },
+    openPatientSelectModal(ticketId) {
+      this.currentTicket = this.tickets.find(ticket => ticket.slot_id === ticketId);
+      // 打开患者选择弹窗时，查询患者列表
+      this.searchPatients();
+      this.showPatientModal = true
+    },
+    
+    // 患者搜索
+    searchPatients() {
+      // 调用真实API获取患者列表
+      getPatientList(this.patientSearchParams).then(response => {
+        if (response.records) {
+          this.patients = response.records;
+        } else {
+          this.patients = [];
+        }
+      }).catch(error => {
+        console.error('获取患者列表失败:', error);
+        this.patients = [];
+      });
+    },
+    
+    // 监听患者搜索输入变化
+    onPatientSearchInput(event) {
+      const field = event.target.id;
+      const value = event.target.value;
+      
+      // 根据输入框ID更新对应的搜索参数
+      switch(field) {
+        case 'patientName':
+          this.patientSearchParams.patientName = value;
+          break;
+        case 'medicalCard':
+          this.patientSearchParams.medicalCard = value;
+          break;
+        case 'idCard':
+          this.patientSearchParams.idCard = value;
+          break;
+        case 'phone':
+          this.patientSearchParams.phone = value;
+          break;
+      }
+    },
+    
+    // 双击未预约卡片触发患者选择流程
+    handleDoubleClick(ticket) {
+      if (ticket.status === '未预约') {
+        this.currentTicket = ticket;
+        this.selectedPatientId = null;
+        this.showPatientModal = true;
+      }
+    },
+    
+    // 右键已预约卡片显示取消预约菜单
+    handleRightClick(event, ticket) {
+      if (ticket.status === '已预约') {
+        this.selectedTicketForCancel = ticket;
+        this.contextMenuPosition = { x: event.clientX, y: event.clientY };
+        this.contextMenuVisible = true;
+      }
+    },
+    
+    // 关闭右键菜单
+    closeContextMenu() {
+      this.contextMenuVisible = false;
+      this.selectedTicketForCancel = null;
+    },
+    
+    // 确认取消预约
+    confirmCancelAppointment() {
+      if (this.selectedTicketForCancel) {
+        // 二次确认
+        if (confirm(`确认取消患者的预约？`)) {
+          // 调用API取消预约
+          this.cancelAppointment(this.selectedTicketForCancel);
+        }
+        this.closeContextMenu();
+      }
+    },
+    
+    // 确认停诊
+    confirmCancelConsultation(ticket) {
+      // 二次确认
+      if (confirm(`确认取消${ticket.doctor}在${ticket.dateTime}的看诊吗？`)) {
+        // 调用API处理停诊
+        this.cancelConsultation(ticket);
+      }
+    },
+    
+    // 处理停诊
+    cancelConsultation(ticket) {
+      // 使用真实API调用处理停诊
+      cancelConsultation(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('停诊已处理，该号源已被取消');
+      }).catch(error => {
+        console.error('停诊处理失败:', error);
+        alert('停诊处理失败，请稍后重试。');
+      });
+    },
+    
+    // 确认取号
+    confirmCheckIn(ticket) {
+      // 二次确认
+      if (confirm(`确认${ticket.patientName || ''}取号吗？`)) {
+        // 调用API处理取号
+        this.checkIn(ticket);
+      }
+    },
+    
+    // 处理取号
+    checkIn(ticket) {
+      // 使用真实API调用处理取号
+      checkInTicket(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('取号成功！');
+      }).catch(error => {
+        console.error('取号失败:', error);
+        alert('取号失败，请稍后重试。');
+      });
+    },
+    
+    // 取消预约API调用
+    cancelAppointment(ticket) {
+        // 使用真实API调用取消预约
+        cancelTicket(ticket.slot_id).then(response => {
+          // API调用成功后，重新获取最新的号源数据
+          this.onSearch();
+          // 关闭上下文菜单
+          this.closeContextMenu();
+          alert('预约已取消，号源已释放');
+        }).catch(error => {
+          console.error('取消预约失败:', error);
+          alert('取消预约失败，请稍后重试。');
+        });
+      },
+    closePatientSelectModal() {
+      this.showPatientModal = false
+      this.selectedPatientId = null
+    },
+    selectPatient(patientId) {
+      this.selectedPatientId = patientId;
+      // 保存选择的患者对象
+      this.selectedPatient = this.patients.find(patient => patient.id === patientId);
+    },
+    confirmPatientSelection() {
+      if (this.selectedPatientId && this.selectedPatient) {
+        // 这里可以添加确认患者选择后的逻辑
+        console.log('Selected patient:', this.selectedPatient, 'for ticket:', this.currentTicket.slot_id)
+        
+        // 构建预约数据
+        const appointmentData = {
+          ticketId: Number(this.currentTicket.slot_id),
+          patientId: this.selectedPatientId ? Number(this.selectedPatientId) : null,
+          patientName: this.selectedPatient.name,
+          medicalCard: this.selectedPatient.medicalCard,
+          phone: this.selectedPatient.phone
+        };
+        
+        // 使用真实API调用进行预约
+        bookTicket(appointmentData).then(response => {
+          // API调用成功后，重新获取最新的号源数据
+          this.onSearch();
+          this.closePatientSelectModal();
+          alert('预约成功，号源已锁定。患者到院签到时需缴费取号。');
+        }).catch(error => {
+          console.error('预约失败:', error);
+          alert('预约失败，请稍后重试。');
+        });
+      } else {
+        alert('请选择患者')
+      }
+    },
+    onDateChange() {
+      // 日期变化时刷新号源列表
+      console.log('Date changed:', this.selectedDate)
+      // 重置页码并重新加载数据
+      this.currentPage = 1;
+      this.onSearch()
+    },
+    // 切换侧边栏显示/隐藏
+    toggleSidebar() {
+      this.showSidebar = !this.showSidebar;
+    },
+    // 检测是否为移动设备
+    checkMobileDevice() {
+      this.isMobile = window.innerWidth <= 768;
+    },
+    onSearch() {
+      this.isLoading = true
+      console.log('Searching with:', {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone
+      });
+      
+      // 调用真实API获取号源数据
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: 1,
+        limit: this.pageSize
+      };
+      
+      // 并行调用号源和科室API - 使用测试接口listAllTickets
+      Promise.all([
+        listAllTickets(), // 使用测试接口获取固定数据
+        listDept()
+      ]).then(([ticketResponse, deptResponse]) => {
+        // 打印完整的响应数据以便调试
+        console.log('完整的号源响应数据:', JSON.stringify(ticketResponse, null, 2));
+        console.log('号源响应data字段类型:', typeof ticketResponse.data);
+        console.log('号源响应data字段:', JSON.stringify(ticketResponse.data, null, 2));
+        
+        // 处理号源数据
+        if (ticketResponse) {
+          console.log('号源响应code:', ticketResponse.code);
+          
+          if (ticketResponse.code === 200) {
+            const responseData = ticketResponse.data;
+            
+            // 检查响应数据结构
+            console.log('responseData是否存在:', responseData !== undefined && responseData !== null);
+            
+            if (responseData) {
+              console.log('responseData.records:', responseData.records);
+              console.log('responseData.list:', responseData.list);
+              console.log('responseData.total:', responseData.total);
+              
+              // 检查是否有records字段
+              if (responseData.records) {
+                console.log('使用records字段作为tickets数据源');
+                this.tickets = responseData.records;
+                this.totalTickets = responseData.total;
+              } else if (responseData.list) {
+                // 兼容使用list字段的情况
+                console.log('使用list字段作为tickets数据源');
+                this.tickets = responseData.list;
+                this.totalTickets = responseData.total;
+              } else if (Array.isArray(responseData)) {
+                // 如果直接是数组
+                console.log('responseData是数组，直接作为tickets数据源');
+                this.tickets = responseData;
+                this.totalTickets = responseData.length;
+              } else {
+                // 如果没有预期的字段，可能数据直接在对象中
+                console.log('responseData是对象，包装为数组作为tickets数据源');
+                this.tickets = [responseData];
+                this.totalTickets = 1;
+              }
+              
+              // 保存所有原始数据
+              this.allTickets = [...this.tickets];
+              console.log('tickets数据:', JSON.stringify(this.tickets, null, 2));
+              console.log('tickets长度:', this.tickets.length);
+              
+              // 更新医生列表
+              this.updateDoctorsList();
+              this.hasMore = this.tickets.length < this.totalTickets;
+            } else {
+              console.error('responseData为空');
+              this.tickets = [];
+              this.allTickets = [];
+              this.totalTickets = 0;
+              this.hasMore = false;
+            }
+          } else {
+            console.error('API返回错误，code不为200:', ticketResponse);
+            this.tickets = [];
+            this.allTickets = [];
+            this.totalTickets = 0;
+            this.hasMore = false;
+          }
+        } else {
+          console.error('API返回空响应');
+          this.tickets = [];
+          this.allTickets = [];
+          this.totalTickets = 0;
+          this.hasMore = false;
+        }
+        
+        // 处理科室数据
+        this.updateDepartmentsListFromApi(deptResponse);
+        
+        this.isLoading = false;
+      }).catch(error => {
+        console.error('获取数据失败:', error);
+        this.tickets = [];
+        this.allTickets = [];
+        this.totalTickets = 0;
+        this.hasMore = false;
+        this.departments = [{ value: 'all', label: '全部科室' }];
+        this.isLoading = false;
+      });
+    },
+
+    
+    // 从号源数据中更新科室列表（备用方法）
+    updateDepartmentsList() {
+      const departmentSet = new Set();
+      this.tickets.forEach(ticket => {
+        departmentSet.add(ticket.department);
+      });
+      
+      // 转换为数组并添加"全部科室"选项
+      const departmentArray = Array.from(departmentSet).map(dept => ({
+        value: dept,
+        label: dept
+      }));
+      
+      this.departments = [
+        { value: 'all', label: '全部科室' },
+        ...departmentArray
+      ];
+    },
+    
+    // 从API获取完整科室列表
+    updateDepartmentsListFromApi(deptResponse) {
+      // 检查后端返回的数据结构
+      let deptList = [];
+      // 适配不同的后端数据结构
+      if (Array.isArray(deptResponse)) {
+        deptList = deptResponse;
+      } else if (Array.isArray(deptResponse.data)) {
+        deptList = deptResponse.data;
+      }
+      
+      if (deptList.length > 0) {
+        // 从API返回的科室数据中提取科室名称
+        const departmentArray = deptList
+          .filter(dept => dept.deptName) // 确保科室名称存在
+          .map(dept => ({
+            value: dept.deptName,
+            label: dept.deptName
+          }))
+          .filter((dept, index, self) => 
+            index === self.findIndex((d) => d.value === dept.value) // 去重
+          );
+        
+        this.departments = [
+          { value: 'all', label: '全部科室' },
+          ...departmentArray
+        ];
+      } else {
+        // 如果API调用失败或没有数据，回退到从号源数据中提取
+        this.updateDepartmentsList();
+      }
+    },
+    
+    // 获取号源状态文本
+    getStatusText(status) {
+      switch (status) {
+        case 'unbooked':
+          return '未预约';
+        case 'booked':
+          return '已预约';
+        case 'checked':
+          return '已取号';
+        case 'cancelled':
+          return '已取消';
+        case 'locked':
+          return '已锁定';
+        default:
+          return '未知状态';
+      }
+    },
+    
+    // 从号源数据中更新医生列表
+    updateDoctorsList() {
+      const doctorMap = new Map();
+      
+      // 统计每个医生的余号数量和类型
+      this.tickets.forEach(ticket => {
+        // 检查ticket对象是否有效
+        if (!ticket) return;
+        
+        // 统计所有号源的医生，不仅仅是未预约的
+        if (doctorMap.has(ticket.doctor)) {
+          // 如果是未预约状态，增加余号数量
+          if (ticket.status === '未预约') {
+            doctorMap.get(ticket.doctor).available += 1;
+          }
+        } else {
+          // 根据号源类型设置医生类型
+          const doctorType = ticket.ticketType || 'general';
+          doctorMap.set(ticket.doctor, { 
+            id: Date.now() + Math.random(), 
+            name: ticket.doctor, 
+            available: ticket.status === '未预约' ? 1 : 0, 
+            type: doctorType
+          });
+        }
+      });
+      
+      // 转换为数组
+      this.doctors = Array.from(doctorMap.values());
+      
+      // 打印医生列表以便调试
+      console.log('生成的医生列表:', this.doctors);
+    },
+    // 加载更多数据
+    loadMore() {
+      // 已经在加载中，不再重复请求
+      if (this.isLoading || !this.hasMore) {
+        return;
+      }
+      
+      this.isLoading = true;
+      this.currentPage++;
+      
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: this.currentPage,
+        limit: this.pageSize
+      };
+      
+      listTicket(queryParams).then(response => {
+        // 打印完整的响应数据以便调试
+        console.log('加载更多的号源响应数据:', response);
+        
+        // 处理号源数据
+        if (response && response.data) {
+          let newRecords = [];
+          
+          // 检查是否有records字段
+          if (response.data.records) {
+            newRecords = response.data.records;
+            this.totalTickets = response.data.total;
+          } else {
+            // 如果没有records字段，可能数据直接在对象中
+            newRecords = [response.data];
+            this.totalTickets = this.tickets.length + 1;
+          }
+          
+          // 将API返回的数据添加到tickets数组中
+          this.tickets = [...this.tickets, ...newRecords];
+        }
+        
+        this.isLoading = false;
+        this.hasMore = this.tickets.length < this.totalTickets;
+        
+        // 更新科室和医生列表
+        this.updateDepartmentsList();
+        this.updateDoctorsList();
+      }).catch(error => {
+        console.error('获取号源列表失败:', error);
+        this.isLoading = false;
+      });
+    },
+    // 滚动事件处理函数，实现滚动加载
+
+  },
+  mounted() {
+    // 初始化数据
+    this.selectedDate = new Date().toISOString().split('T')[0];
+    // 调用onSearch获取初始数据
+    this.onSearch();
+    // 检测是否为移动设备
+    this.checkMobileDevice();
+    // 监听窗口大小变化
+    window.addEventListener('resize', this.checkMobileDevice);
+  },
+  beforeUnmount() {
+    // 移除窗口大小变化监听
+    window.removeEventListener('resize', this.checkMobileDevice);
+  }
+}
+</script>
+
+<style scoped>
+/* 颜色变量定义 */
+:root {
+  --primary-color: #1890FF;
+  --secondary-color: #FF6B35;
+  --status-unbooked: #5A8DEE;
+  --status-booked: #FAAD14;
+  --status-checked: #52C41A;
+  --status-cancelled: #F5222D;
+  --border-color: #d9d9d9;
+  --text-primary: #333;
+  --text-secondary: #666;
+  --text-tertiary: #999;
+  --bg-light: #f8f9fa;
+  --bg-white: #fff;
+  --shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+}
+
+/* 基础样式 */
+.ticket-management-container {
+  padding: 20px;
+  background-color: var(--bg-light);
+  min-height: 100vh;
+}
+
+/* 顶部搜索区域 */
+.top-search-area {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: 20px;
+  padding: 12px 16px;
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  border: 1px solid #E8E8E8;
+}
+
+/* 搜索标签行 */
+.search-labels {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 搜索标签样式 */
+.search-label {
+  font-size: 14px;
+  color: #333333;
+  font-weight: 500;
+  text-align: left;
+  flex-grow: 1;
+  min-width: 80px;
+}
+
+/* 搜索输入行 */
+.search-inputs {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 为输入行的每个容器设置flex-grow，使其均匀分布 */
+.search-inputs > div {
+  flex-grow: 1;
+  min-width: 100px;
+}
+
+.hamburger-menu {
+  display: none;
+  cursor: pointer;
+  font-size: 20px;
+  color: var(--primary-color);
+}
+
+.date-picker {
+  width: 100%;
+}
+
+/* 搜索控件样式 */
+.search-input {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+}
+
+.search-input:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-select {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  cursor: pointer;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+  appearance: none;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%23999' d='M6 9L1 4h10z'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 8px center;
+  background-size: 12px;
+}
+
+.search-select:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-btn {
+  padding: 0 16px;
+  background-color: #1890FF;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  height: 32px;
+  box-sizing: border-box;
+  transition: background-color 0.3s;
+}
+
+.search-btn:hover {
+  background-color: #40a9ff;
+}
+
+.search-btn:active {
+  background-color: #096dd9;
+}
+
+.search-btn:disabled {
+  background-color: #e6f7ff;
+  color: #91d5ff;
+  cursor: not-allowed;
+}
+
+/* 日期选择器样式 */
+.date-picker {
+  width: 160px;
+  z-index: 1;
+}
+
+/* 状态筛选器样式 */
+.status-filter {
+  z-index: 2;
+}
+
+.el-date-editor {
+  width: 100% !important;
+}
+
+.el-date-editor .el-input__inner {
+  height: 32px !important;
+  border-radius: 4px;
+  border: 1px solid #E8E8E8;
+  font-size: 14px;
+  padding: 0 36px 0 12px !important;
+}
+
+.el-date-editor .el-input__inner:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.el-date-editor .el-input__suffix {
+  right: 8px !important;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.el-date-editor .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 主要内容区域 */
+.main-content {
+  display: flex;
+  gap: 20px;
+  height: calc(100vh - 104px); /* 减去顶部搜索区域高度和内边距 */
+  overflow: hidden;
+}
+
+.left-sidebar {
+  width: 220px;
+  height: 100%;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  box-shadow: var(--shadow);
+  flex-shrink: 0;
+  transition: all 0.3s ease;
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+/* 移动端侧边栏样式 */
+.sidebar-mobile {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100vh;
+  z-index: 1000;
+}
+
+/* 侧边栏隐藏样式 */
+.sidebar-hidden {
+  transform: translateX(-100%);
+}
+
+.right-content {
+  flex: 1;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  transition: all 0.3s ease;
+}
+
+/* 移动端右侧内容区占满屏幕 */
+.right-content-full {
+  width: 100%;
+}
+
+  /* 响应式设计 */
+  @media (max-width: 768px) {
+    /* 顶部搜索区域改为纵向排列 */
+    .top-search-area {
+      flex-direction: column;
+      height: auto;
+      padding: 16px;
+      gap: 16px;
+    }
+
+    /* 汉堡菜单显示 */
+    .hamburger-menu {
+      display: block;
+      align-self: flex-start;
+    }
+
+    /* 搜索区域元素宽度100% */
+    .date-picker,
+    .status-filter,
+    .patient-search,
+    .card-search,
+    .phone-search,
+    .search-button,
+    .add-patient {
+      width: 100%;
+    }
+
+    /* 右侧内容区卡片布局调整 */
+    .virtual-list {
+      grid-template-columns: 1fr;
+      gap: 12px;
+      padding: 12px;
+    }
+
+    /* 左侧边栏默认隐藏 */
+    .left-sidebar {
+      transform: translateX(-100%);
+    }
+
+    /* 右侧内容区占满屏幕 */
+     .right-content {
+       width: 100%;
+     }
+   }
+   
+   /* 确保卡片样式正确应用 */
+   .ticket-card {
+     box-shadow: var(--shadow);
+     overflow: hidden;
+     transition: all 0.3s ease;
+   }
+   
+   /* 卡片悬停效果 */
+   .ticket-card:hover {
+     transform: translateY(-2px);
+     box-shadow: 0 4px 16px rgba(90, 141, 238, 0.12);
+   }
+   
+   /* 按钮悬停效果 */
+   .search-btn,
+   .add-patient-btn {
+     transition: all 0.3s ease;
+   }
+   
+   .search-btn:hover,
+   .add-patient-btn:hover {
+     transform: translateY(-1px);
+     box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+   }
+   
+   /* 输入框焦点效果 */
+   .search-input {
+     transition: all 0.3s ease;
+   }
+   
+   .search-input:focus {
+     border-color: var(--primary-color);
+     box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+   }
+   
+   /* 医生列表项悬停效果 */
+   .doctor-item {
+     transition: all 0.3s ease;
+   }
+   
+   .doctor-item:hover {
+     background-color: rgba(24, 144, 255, 0.05);
+     cursor: pointer;
+   }
+   
+   /* 医生列表项选中效果 */
+.doctor-item.selected {
+  background-color: rgba(24, 144, 255, 0.2);
+  border-left: 4px solid var(--primary-color);
+  font-weight: 600;
+}
+   
+   /* 加载动画 */
+   .loading-container {
+     display: flex;
+     justify-content: center;
+     align-items: center;
+     padding: 20px;
+     gap: 8px;
+     color: var(--primary-color);
+   }
+   
+   .loading-spinner {
+     width: 16px;
+     height: 16px;
+     border: 2px solid rgba(24, 144, 255, 0.2);
+     border-top-color: var(--primary-color);
+     border-radius: 50%;
+     animation: spin 0.8s linear infinite;
+   }
+   
+   @keyframes spin {
+     to { transform: rotate(360deg); }
+   }
+
+/* 左侧筛选区域 */
+.section {
+  margin-bottom: 24px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: 600;
+  margin-bottom: 12px;
+  color: #333;
+}
+
+.radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.radio-group label {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  cursor: pointer;
+}
+
+.doctor-list {
+  margin-top: 12px;
+  max-height: calc(100vh - 300px); /* 限制医生列表高度 */
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+.doctor-item {
+  padding: 12px;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  margin-bottom: 8px;
+}
+
+.doctor-item:hover {
+  background-color: #f0f7ff;
+}
+
+.doctor-item.selected {
+  background-color: #e6f2ff;
+  border-left: 4px solid var(--primary-color);
+}
+
+.doctor-name {
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.doctor-available {
+  font-size: 12px;
+  color: var(--status-unbooked);
+  font-weight: normal;
+}
+
+/* 右侧号源卡片网格布局 */
+.ticket-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 16px;
+  padding: 8px;
+}
+
+  /* 加载更多样式 */
+  .loading-more,
+  .no-more {
+    grid-column: 1 / -1;
+    text-align: center;
+    padding: 20px;
+    color: #999;
+    font-size: 14px;
+  }
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 600px;
+  color: var(--text-tertiary);
+}
+
+.empty-text {
+  font-size: 16px;
+}
+
+.ticket-card {
+  background: white;
+  border-radius: 8px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+  border: 1px solid #e8e8e8;
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  min-height: 160px;
+}
+
+.ticket-card:hover {
+  box-shadow: 0 4px 12px rgba(90, 141, 238, 0.12);
+  transform: translateY(-2px);
+  border-color: #1890ff;
+}
+
+.ticket-number {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background-color: #e6f7ff;
+  color: #1890ff;
+  font-size: 12px;
+  font-weight: 500;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ticket-time {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  margin: 8px 0;
+}
+
+.ticket-status {
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  text-align: center;
+  min-width: 60px;
+  margin-bottom: 8px;
+}
+
+.status-unbooked {
+  background-color: #e6f3ff;
+  color: #1890ff;
+}
+
+.status-locked {
+  background-color: #fff1f0;
+  color: #f5222d;
+}
+
+.status-booked {
+  background-color: #fff8e6;
+  color: #fa8c16;
+}
+
+.status-checked {
+  background-color: #f6ffed;
+  color: #52c41a;
+}
+
+.status-cancelled {
+  background-color: #fff1f0;
+  color: #ff4d4f;
+}
+
+.ticket-doctor {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+  text-align: center;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ticket-fee {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.ticket-type {
+  font-size: 12px;
+  color: #999;
+  margin-bottom: 12px;
+}
+
+.book-button {
+      padding: 4px 16px;
+      background-color: #1890ff;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      font-size: 12px;
+      cursor: pointer;
+      transition: all 0.3s ease;
+      align-self: center;
+    }
+
+    .book-button:hover:not(:disabled) {
+      background-color: #40a9ff;
+    }
+
+    .book-button:disabled {
+      background-color: #e6f7ff;
+      color: #91d5ff;
+      cursor: not-allowed;
+    }
+    
+    .cancel-button {
+      background-color: #F56C6C;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .cancel-button:hover {
+      background-color: #F78989;
+    }
+
+    .cancel-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+    
+    .check-in-button {
+      background-color: #67C23A;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .check-in-button:hover {
+      background-color: #85ce61;
+    }
+
+    .check-in-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+
+/* 患者信息样式 */
+.ticket-patient {
+  margin-top: 8px;
+  padding: 4px;
+  background-color: rgba(24, 144, 255, 0.05);
+  border-radius: 4px;
+  font-size: 12px;
+  text-align: center;
+  color: #333;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .ticket-grid {
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 12px;
+  }
+  
+  .ticket-card {
+    padding: 12px;
+    min-height: 140px;
+  }
+  
+  .ticket-doctor {
+    font-size: 13px;
+  }
+}
+
+/* 弹窗样式 */
+.modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+
+.modal-content {
+  background-color: white;
+  border-radius: 8px;
+  width: 80%;
+  max-width: 800px;
+  max-height: 80vh;
+  overflow-y: auto;
+}
+
+.modal-header {
+  padding: 16px 20px;
+  border-bottom: 1px solid #e0e0e0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  color: #999;
+}
+
+.modal-body {
+  padding: 20px;
+}
+
+.patient-table-container {
+  margin-top: 20px;
+  overflow-x: auto;
+}
+
+.patient-table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.patient-table th,
+.patient-table td {
+  padding: 12px;
+  text-align: left;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.patient-table th {
+  background-color: #f5f5f5;
+  font-weight: 600;
+}
+
+.patient-table tr:hover {
+  background-color: #fafafa;
+}
+
+.patient-table tr.selected {
+  background-color: #e6f2ff;
+}
+
+.select-btn {
+  padding: 4px 12px;
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 12px;
+}
+
+.modal-footer {
+  padding: 16px 20px;
+  border-top: 1px solid var(--border-color);
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
+
+/* 右键菜单样式 */
+.context-menu {
+  position: fixed;
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  z-index: 1001;
+}
+
+.menu-item {
+  padding: 8px 16px;
+  cursor: pointer;
+  font-size: 14px;
+  transition: background-color 0.2s;
+}
+
+.menu-item:hover {
+  background-color: #f5f5f5;
+}
+
+.context-menu-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.confirm-btn {
+  padding: 8px 20px;
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.cancel-btn {
+  padding: 8px 20px;
+  background-color: #f5f5f5;
+  color: #666;
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.loading-text {
+  display: flex;
+  align-items: center;
+}
+
+.search-btn:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
new file mode 100644
index 00000000..525c23c0
--- /dev/null
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
@@ -0,0 +1,1845 @@
+<template>
+  <div class="ticket-management-container">
+    <!-- 顶部搜索区域 -->
+    <div id="topSearchArea" class="top-search-area">
+      <!-- 搜索标签行 -->
+      <div class="search-labels">
+        <div class="search-label">导源日期</div>
+        <div class="search-label">状态</div>
+        <div class="search-label">患者姓名</div>
+        <div class="search-label">就诊卡号</div>
+        <div class="search-label">手机号</div>
+        <div class="search-label"></div> <!-- 为查询按钮预留空间 -->
+      </div>
+      
+      <!-- 搜索输入行 -->
+      <div class="search-inputs">
+        <!-- 移动端汉堡菜单按钮 -->
+        <div class="hamburger-menu" @click="toggleSidebar" v-if="isMobile">
+          <i class="el-icon-menu"></i>
+        </div>
+        <div id="datePicker" class="date-picker">
+          <el-date-picker
+            v-model="selectedDate"
+            type="date"
+            placeholder="选择日期"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
+            :shortcuts="dateShortcuts"
+            class="date-picker"
+            @change="onDateChange"
+          />
+        </div>
+        <div id="statusFilter" class="status-filter">
+          <select id="status-select" class="search-select" v-model="selectedStatus">
+            <option value="all">全部</option>
+            <option value="unbooked">未预约</option>
+            <option value="locked">锁定</option>
+            <option value="booked">待缴费</option>
+            <option value="checked">已取号</option>
+            <option value="cancelled">已停诊</option>
+          </select>
+        </div>
+        <div id="patientSearch" class="patient-search">
+          <input id="patient-name-input" class="search-input" placeholder="姓名" v-model="patientName">
+        </div>
+        <div id="cardSearch" class="card-search">
+          <input id="patient-card-input" class="search-input" placeholder="就诊卡号" v-model="patientCard">
+        </div>
+        <div id="phoneSearch" class="phone-search">
+          <input id="patient-phone-input" class="search-input" placeholder="手机号" v-model="patientPhone">
+        </div>
+        <div class="search-button">
+          <button id="search-button" class="search-btn" @click="onSearch" :disabled="isLoading">
+            <span v-if="isLoading" class="loading-text">搜索中...</span>
+            <span v-else>查询</span>
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 主要内容区域 -->
+    <div id="mainContent" class="main-content">
+      <!-- 左侧筛选区域 -->
+      <div id="leftSidebar" class="left-sidebar" :class="{ 'sidebar-hidden': isMobile && !showSidebar, 'sidebar-mobile': isMobile }">
+        <!-- 科室列表 -->
+        <div class="section">
+          <h3 class="section-title">科室列表</h3>
+          <select id="department-list" class="search-select" v-model="selectedDepartment" @change="onDepartmentChange">
+            <option value="all">全部科室</option>
+            <option v-for="department in departments" :key="department.value" :value="department.value">
+              {{ department.label }}
+            </option>
+          </select>
+        </div>
+
+        <!-- 号源类型 -->
+        <div class="section">
+          <h3 class="section-title">号源类型</h3>
+          <div class="radio-group">
+            <label>
+              <input type="radio" name="type" value="general" v-model="selectedType" @change="onTypeChange">
+              <span>普通号</span>
+            </label>
+            <label>
+              <input type="radio" name="type" value="expert" v-model="selectedType" @change="onTypeChange">
+              <span>专家号</span>
+            </label>
+          </div>
+        </div>
+
+        <!-- 医生号源列表 -->
+        <div class="section">
+          <h3 class="section-title">医生号源列表</h3>
+          <input id="doctor-search" class="search-input" placeholder="搜索医生姓名" v-model="searchQuery" @input="onDoctorSearch">
+          <div class="doctor-list">
+            <div class="doctor-item" v-for="doctor in filteredDoctors" :key="doctor.id" :class="{ selected: selectedDoctorId === doctor.id }" @click="selectDoctor(doctor.id)">
+              <div class="doctor-name">{{ doctor.name }} <span class="doctor-available">余号：{{ doctor.available }}</span></div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 右侧号源卡片区域 -->
+      <div class="right-content" :class="{ 'right-content-full': isMobile && !showSidebar }">
+        <!-- 使用网格布局的号源卡片列表 -->
+        <div class="ticket-grid" v-if="filteredTickets.length > 0">
+          <div v-for="(item, index) in filteredTickets" :key="item.slot_id" class="ticket-card" @dblclick="handleDoubleClick(item)" @contextmenu.prevent="handleRightClick($event, item)">
+            <div class="ticket-header">
+              <div class="ticket-number">{{ index + 1 }}</div>
+              <div class="ticket-type-badge" :class="item.ticketType === 'general' ? 'type-general' : 'type-expert'">
+                {{ item.ticketType === 'general' ? '普通' : '专家' }}
+              </div>
+            </div>
+            <div class="ticket-time">{{ item.dateTime }}</div>
+            <div class="ticket-doctor">{{ item.doctor }}</div>
+            <div class="ticket-status" :class="`status-${item.status}`">
+              <span class="status-dot"></span>
+              {{ item.status }}
+            </div>
+            <div class="ticket-fee">挂号费: {{ item.fee }}</div>
+            <!-- 显示患者信息（如果已预约或已取号） -->
+            <div v-if="(item.status === '已预约' || item.status === '已取号') && item.patientName" class="ticket-patient">
+              <div class="patient-name">{{ item.patientName }}</div>
+              <div class="patient-card">{{ item.patientId }}</div>
+              <div class="patient-gender">性别：{{ item.patientGender || '-' }}</div>
+            </div>
+            <div class="ticket-actions">
+              <button class="action-button book-button" @click="openPatientSelectModal(item.slot_id)" :disabled="item.status !== '未预约'" :class="{ 'disabled': item.status !== '未预约' }">
+                <i class="el-icon-tickets"></i>
+                预约
+              </button>
+              <button class="action-button cancel-button" @click="confirmCancelConsultation(item)" :disabled="item.status === '已取消'" :class="{ 'disabled': item.status === '已取消' }">
+                <i class="el-icon-close"></i>
+                停诊
+              </button>
+              <button class="action-button check-in-button" @click="confirmCheckIn(item)" :disabled="item.status !== '已预约'" :class="{ 'disabled': item.status !== '已预约' }">
+                <i class="el-icon-circle-check"></i>
+                取号
+              </button>
+            </div>
+          </div>
+          <div v-if="hasMore" class="loading-more">
+            加载中...
+          </div>
+          <div v-else class="no-more">
+            没有更多数据了
+          </div>
+        </div>
+        <div v-else class="empty-state">
+          <div class="empty-text">暂无号源数据</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 患者选择弹窗 -->
+    <div id="patient-select-modal" class="modal" v-if="showPatientModal">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h3>选择患者</h3>
+          <button class="close-btn" @click="closePatientSelectModal">&times;</button>
+        </div>
+        <div class="modal-body">
+          <input id="patientName" class="search-input" placeholder="患者姓名" v-model="patientSearchParams.patientName" @input="onPatientSearchInput">
+          <input id="medicalCard" class="search-input" placeholder="就诊卡号" v-model="patientSearchParams.medicalCard" @input="onPatientSearchInput">
+          <input id="idCard" class="search-input" placeholder="身份证号" v-model="patientSearchParams.idCard" @input="onPatientSearchInput">
+          <input id="phone" class="search-input" placeholder="手机号" v-model="patientSearchParams.phone" @input="onPatientSearchInput">
+          <button id="patient-search-btn" class="search-btn" @click="searchPatients">查询</button>
+          <div class="patient-table-container">
+            <table id="patient-table" class="patient-table">
+              <thead>
+                <tr>
+                  <th>序号</th>
+                  <th>患者姓名</th>
+                  <th>就诊卡号</th>
+                  <th>性别</th>
+                  <th>身份证号</th>
+                  <th>手机号</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(patient, index) in patients" :key="patient.idCard" :class="{ selected: selectedPatientId === patient.idCard }" @click="selectPatient(patient.idCard)">
+                  <td>{{ index + 1 }}</td>
+                  <td>{{ patient.name }}</td>
+                  <td>{{ patient.medicalCard }}</td>
+                  <td>{{ patient.gender || '-' }}</td>
+                  <td>{{ patient.idCard }}</td>
+                  <td>{{ patient.phone }}</td>
+                  <td>
+                    <button class="select-btn" @click.stop="selectPatient(patient.idCard)" :disabled="!patient.idCard">选择</button>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button class="confirm-btn" @click="confirmPatientSelection">确认</button>
+          <button class="cancel-btn" @click="closePatientSelectModal">取消</button>
+        </div>
+      </div>
+    </div>
+    <!-- 右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu"
+      :style="{
+        left: contextMenuPosition.x + 'px',
+        top: contextMenuPosition.y + 'px'
+      }"
+      @click.stop
+      @contextmenu.prevent
+    >
+      <div v-if="selectedTicketForCancel && selectedTicketForCancel.status === '已预约'" class="menu-item" @click="confirmCancelAppointment">
+          取消预约
+        </div>
+    </div>
+
+    <!-- 点击页面其他地方关闭右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu-overlay"
+      @click="closeContextMenu"
+      @contextmenu.prevent
+    ></div>
+  </div>
+</template>
+
+<script>
+import { listTicket, bookTicket, cancelTicket, checkInTicket, cancelConsultation, listAllTickets } from '@/api/appoinmentmanage/ticket';
+import { getPatientList } from '@/api/cardRenewal/api';
+import { listDept } from '@/api/appoinmentmanage/dept';
+import { ref } from 'vue'
+import { ElDatePicker } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+export default {
+  name: 'OutpatientAppointment',
+  components: {
+    ElDatePicker
+  },
+  
+  // 添加全局点击事件监听器，用于关闭右键菜单
+  mounted() {
+    document.addEventListener('click', this.closeContextMenu);
+  },
+  
+  // 移除事件监听器
+  beforeUnmount() {
+    document.removeEventListener('click', this.closeContextMenu);
+  },
+  data() {
+    return {
+      selectedDate: new Date().toISOString().split('T')[0],
+      selectedStatus: 'unbooked',
+      selectedDepartment: 'all',
+      selectedType: 'general', // 普通号默认选中
+      selectedDoctorId: null,
+      showPatientModal: false,
+      selectedPatientId: null,
+      selectedPatient: null,
+      currentTicket: null,
+      patientName: '',
+      patientCard: '',
+      patientPhone: '',
+      isLoading: false,
+      // 移动端相关变量
+      isMobile: false,
+      showSidebar: false,
+      // 分页相关属性
+      currentPage: 1,
+      pageSize: 20,
+      totalTickets: 0,
+      hasMore: true,
+      // 右键菜单相关
+      contextMenuVisible: false,
+      contextMenuPosition: { x: 0, y: 0 },
+      selectedTicketForCancel: null,
+      departments: [
+        { value: 'all', label: '全部科室' }
+      ],
+      doctors: [],
+      allTickets: [], // 存储所有原始号源数据
+      tickets: [], // 从API获取的真实号源数据
+      patients: [], // 从API获取的真实患者数据
+      searchQuery: '',
+      // 患者搜索相关
+      patientSearchParams: {
+        patientName: '',
+        medicalCard: '',
+        idCard: '',
+        phone: ''
+      },
+      dateShortcuts: [
+        { text: '今天', value: new Date() },
+        { text: '明天', value: () => { const date = new Date(); date.setDate(date.getDate() + 1); return date; } },
+        { text: '本周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 1); return date; } },
+        { text: '下周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 8); return date; } },
+        { text: '本月', value: () => { const date = new Date(); date.setDate(1); return date; } },
+        { text: '下月', value: () => { const date = new Date(); date.setMonth(date.getMonth() + 1); date.setDate(1); return date; } }
+      ]
+    }
+  },
+  computed: {
+    filteredDoctors() {
+      let filtered = [...this.doctors];
+      
+      // 根据号源类型过滤医生列表
+      if (this.selectedType === 'general') {
+        filtered = filtered.filter(doctor => doctor.type === 'general');
+      } else if (this.selectedType === 'expert') {
+        filtered = filtered.filter(doctor => doctor.type === 'expert');
+      }
+      
+      // 根据搜索关键词过滤
+      if (this.searchQuery) {
+        filtered = filtered.filter(doctor => 
+          doctor.name.includes(this.searchQuery)
+        );
+      }
+      
+      return filtered;
+    },
+    filteredTickets() {
+      let filtered = [...this.tickets];
+      
+      // 按日期筛选（如果选择了日期） - 暂时注释掉以排查问题
+      // if (this.selectedDate) {
+      //   filtered = filtered.filter(ticket => {
+      //     // 使用后端返回的dateTime字段进行筛选
+      //     if (ticket.dateTime) {
+      //       return ticket.dateTime.startsWith(this.selectedDate);
+      //     }
+      //     return true;
+      //   });
+      // }
+      
+      // 按状态筛选 - 暂时注释掉以排查问题
+      // if (this.selectedStatus !== 'all') {
+      //   // 状态映射表（后端返回中文状态，前端使用英文状态）
+      //   const statusMap = {
+      //     'unbooked': '未预约',
+      //     'locked': '已锁定',
+      //     'booked': '已预约',
+      //     'checked': '已取号',
+      //     'cancelled': '已取消'
+      //   };
+      //   const chineseStatus = statusMap[this.selectedStatus];
+      //   filtered = filtered.filter(ticket => ticket.status === chineseStatus);
+      // }
+      
+      // 按科室筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDepartment !== 'all') {
+      //   filtered = filtered.filter(ticket => ticket.department === this.selectedDepartment);
+      // }
+      
+      // 按号源类型筛选
+      filtered = filtered.filter(ticket => {
+        if (this.selectedType === 'general') {
+          return ticket.ticketType === 'general';
+        } else if (this.selectedType === 'expert') {
+          return ticket.ticketType === 'expert';
+        }
+        return true;
+      });
+      
+      // 按医生筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDoctorId) {
+      //   const selectedDoctor = this.doctors.find(d => d.id === this.selectedDoctorId);
+      //   if (selectedDoctor) {
+      //     filtered = filtered.filter(ticket => ticket.doctor === selectedDoctor.name);
+      //   }
+      // }
+      
+      // 按患者信息筛选（姓名、就诊卡号、手机号） - 暂时注释掉以排查问题
+      // if (this.patientName || this.patientCard || this.patientPhone) {
+      //   filtered = filtered.filter(ticket => {
+      //     const matchesName = !this.patientName || ticket.patientName?.includes(this.patientName);
+      //     const matchesCard = !this.patientCard || ticket.patientId?.includes(this.patientCard);
+      //     const matchesPhone = !this.patientPhone || ticket.phone?.includes(this.patientPhone);
+      //     
+      //     return matchesName && matchesCard && matchesPhone;
+      //   });
+      // }
+      
+      return filtered;
+    },
+  },
+  methods: {
+    selectDoctor(doctorId) {
+      this.selectedDoctorId = doctorId
+      console.log('Selected doctor:', doctorId)
+      // 医生选择后，筛选号源
+      this.onSearch();
+    },
+    onTypeChange() {
+      console.log('Type changed:', this.selectedType)
+      // 移除onSearch()调用，让计算属性自动处理类型筛选
+    },
+    onDepartmentChange() {
+      console.log('Department changed:', this.selectedDepartment)
+      this.onSearch()
+    },
+    onDoctorSearch() {
+      console.log('Searching doctor:', this.searchQuery)
+      // 使用计算属性filteredDoctors实现实时搜索，无需调用API
+    },
+    openPatientSelectModal(ticketId) {
+      console.log('openPatientSelectModal called with ticketId:', ticketId);
+      this.currentTicket = this.tickets.find(ticket => ticket.slot_id === ticketId);
+      console.log('Found ticket for modal:', this.currentTicket);
+      // 打开患者选择弹窗时，查询患者列表
+      this.searchPatients();
+      this.showPatientModal = true;
+      console.log('Show patient modal:', this.showPatientModal);
+    },
+    
+    // 患者搜索
+    searchPatients() {
+      console.log('searchPatients called with params:', this.patientSearchParams);
+      // 调用真实API获取患者列表
+      getPatientList(this.patientSearchParams).then(response => {
+        console.log('Patient API response:', response);
+        // 尝试不同的数据结构解析
+        let records = [];
+        if (response.data && response.data.records) {
+          records = response.data.records;
+        } else if (response.data && Array.isArray(response.data)) {
+          records = response.data;
+        } else if (Array.isArray(response)) {
+          records = response;
+        }
+        
+        this.patients = records;
+        console.log('Loaded patients:', this.patients);
+        
+        // 验证每个患者是否有idCard字段，如果没有，尝试使用其他唯一标识
+        this.patients.forEach((patient, index) => {
+          console.log(`Patient ${index}:`, patient);
+          console.log(`Patient ${index} has idCard:`, patient.idCard ? 'Yes' : 'No');
+          console.log(`Patient ${index} has id:`, patient.id ? 'Yes' : 'No');
+          console.log(`Patient ${index} has medicalCard:`, patient.medicalCard ? 'Yes' : 'No');
+          
+          // 如果没有idCard，尝试设置一个临时唯一标识
+          if (!patient.idCard) {
+            patient.idCard = patient.id || patient.medicalCard || `temp_${index}`;
+            console.log(`Set temporary idCard for patient ${index}:`, patient.idCard);
+          }
+        });
+        
+        if (this.patients.length === 0) {
+          console.log('No patients found in response');
+          alert('没有找到患者数据，请检查搜索条件或联系管理员');
+        }
+      }).catch(error => {
+        console.error('获取患者列表失败:', error);
+        this.patients = [];
+        alert('获取患者列表失败：' + (error.message || '未知错误'));
+      });
+    },
+    
+    // 监听患者搜索输入变化
+    onPatientSearchInput(event) {
+      const field = event.target.id;
+      const value = event.target.value;
+      
+      // 根据输入框ID更新对应的搜索参数
+      switch(field) {
+        case 'patientName':
+          this.patientSearchParams.patientName = value;
+          break;
+        case 'medicalCard':
+          this.patientSearchParams.medicalCard = value;
+          break;
+        case 'idCard':
+          this.patientSearchParams.idCard = value;
+          break;
+        case 'phone':
+          this.patientSearchParams.phone = value;
+          break;
+      }
+    },
+    
+    // 双击未预约卡片触发患者选择流程
+    handleDoubleClick(ticket) {
+      console.log('handleDoubleClick called with ticket:', ticket);
+      if (ticket.status === '未预约') {
+        this.currentTicket = ticket;
+        console.log('Set currentTicket:', this.currentTicket);
+        this.selectedPatientId = null;
+        this.selectedPatient = null;
+        console.log('Reset selected patient info:', { selectedPatientId: this.selectedPatientId, selectedPatient: this.selectedPatient });
+        
+        // 先打开弹窗，再加载患者数据，避免等待
+        this.showPatientModal = true;
+        console.log('Show patient modal after double click:', this.showPatientModal);
+        
+        // 调用患者搜索接口，加载患者列表
+        this.searchPatients();
+      }
+    },
+    
+    // 右键已预约卡片显示取消预约菜单
+    handleRightClick(event, ticket) {
+      if (ticket.status === '已预约') {
+        this.selectedTicketForCancel = ticket;
+        this.contextMenuPosition = { x: event.clientX, y: event.clientY };
+        this.contextMenuVisible = true;
+      }
+    },
+    
+    // 关闭右键菜单
+    closeContextMenu() {
+      this.contextMenuVisible = false;
+      this.selectedTicketForCancel = null;
+    },
+    
+    // 确认取消预约
+    confirmCancelAppointment() {
+      if (this.selectedTicketForCancel) {
+        // 二次确认，显示患者姓名
+        if (confirm(`确认取消患者${this.selectedTicketForCancel.patientName || ''}的预约？`)) {
+          // 调用API取消预约
+          this.cancelAppointment(this.selectedTicketForCancel);
+        }
+        this.closeContextMenu();
+      }
+    },
+    
+    // 确认停诊
+    confirmCancelConsultation(ticket) {
+      // 二次确认
+      if (confirm(`确认取消${ticket.doctor}在${ticket.dateTime}的看诊吗？`)) {
+        // 调用API处理停诊
+        this.cancelConsultation(ticket);
+      }
+    },
+    
+    // 处理停诊
+    cancelConsultation(ticket) {
+      // 使用真实API调用处理停诊
+      cancelConsultation(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('停诊已处理，该号源已被取消');
+      }).catch(error => {
+        console.error('停诊处理失败:', error);
+        alert('停诊处理失败，请稍后重试。');
+      });
+    },
+    
+    // 确认取号
+    confirmCheckIn(ticket) {
+      // 二次确认
+      if (confirm(`确认${ticket.patientName || ''}取号吗？`)) {
+        // 调用API处理取号
+        this.checkIn(ticket);
+      }
+    },
+    
+    // 处理取号
+    checkIn(ticket) {
+      // 使用真实API调用处理取号
+      checkInTicket(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('取号成功！');
+      }).catch(error => {
+        console.error('取号失败:', error);
+        alert('取号失败，请稍后重试。');
+      });
+    },
+    
+    // 取消预约API调用
+    cancelAppointment(ticket) {
+      if (!ticket || !ticket.slot_id) {
+        console.error('取消预约失败：缺少号源信息');
+        alert('取消预约失败：缺少号源信息');
+        this.closeContextMenu();
+        return;
+      }
+      
+      // 使用真实API调用取消预约
+      cancelTicket(ticket.slot_id).then(response => {
+        // API调用成功后，更新当前卡片状态
+        const ticketIndex = this.tickets.findIndex(t => t.slot_id === ticket.slot_id);
+        if (ticketIndex !== -1) {
+          // 清除该号源关联的所有患者信息
+          this.tickets[ticketIndex].status = '未预约';
+          this.tickets[ticketIndex].patientName = null;
+          this.tickets[ticketIndex].patientId = null;
+          this.tickets[ticketIndex].patientGender = null;
+          this.tickets[ticketIndex].medicalCard = null;
+          this.tickets[ticketIndex].phone = null;
+        }
+        
+        // 关闭上下文菜单
+        this.closeContextMenu();
+        alert('预约已取消，号源已释放');
+      }).catch(error => {
+        console.error('取消预约失败:', error);
+        alert('取消预约失败，请稍后重试。');
+        this.closeContextMenu();
+      });
+    },
+    closePatientSelectModal() {
+      this.showPatientModal = false
+      this.selectedPatientId = null
+    },
+    selectPatient(patientId) {
+      console.log('selectPatient called with patientId:', patientId);
+      console.log('Current patients data:', this.patients);
+      console.log('Patients array length:', this.patients.length);
+      
+      // 确保患者数据已加载
+      if (this.patients.length === 0) {
+        console.error('No patients data available');
+        alert('患者数据未加载，请先搜索患者');
+        return;
+      }
+      
+      this.selectedPatientId = patientId;
+      console.log('Set selectedPatientId:', this.selectedPatientId);
+      
+      // 保存选择的患者对象 - 使用idCard作为唯一标识，但增加容错性
+      this.selectedPatient = this.patients.find(patient => {
+        // 尝试多种匹配方式
+        const matchByIdCard = patient.idCard === patientId;
+        const matchById = patient.id === patientId;
+        const matchByMedicalCard = patient.medicalCard === patientId;
+        const match = matchByIdCard || matchById || matchByMedicalCard;
+        
+        console.log(`Checking patient ${patient.name || 'unknown'}:`);
+        console.log(`  idCard: ${patient.idCard}, matchByIdCard: ${matchByIdCard}`);
+        console.log(`  id: ${patient.id}, matchById: ${matchById}`);
+        console.log(`  medicalCard: ${patient.medicalCard}, matchByMedicalCard: ${matchByMedicalCard}`);
+        console.log(`  Overall match: ${match}`);
+        
+        return match;
+      });
+      
+      console.log('Selected patient:', this.selectedPatient);
+      console.log('Selected patientId:', this.selectedPatientId);
+      
+      if (this.selectedPatient) {
+        // 添加视觉反馈，验证患者是否被选中
+        alert('已选择患者: ' + this.selectedPatient.name);
+        
+        // 可以考虑自动滚动到确认按钮，提高用户体验
+        const confirmBtn = document.querySelector('.confirm-btn');
+        if (confirmBtn) {
+          confirmBtn.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        }
+      } else {
+        console.error('Patient not found with id:', patientId);
+        alert('未找到该患者，请重新选择');
+        this.selectedPatientId = null;
+      }
+    },
+    confirmPatientSelection() {
+      if (!this.selectedPatientId || !this.selectedPatient) {
+        alert('请选择患者');
+        return;
+      }
+      
+      if (!this.currentTicket) {
+        alert('预约信息错误，请重新选择号源');
+        this.closePatientSelectModal();
+        return;
+      }
+      
+      try {
+        const userStore = useUserStore();
+        const appointmentData = {
+          ticketId: Number(this.currentTicket.slot_id),
+          patientId: this.selectedPatientId, // 使用身份证号作为患者ID，不需要转换为数字
+          patientName: this.selectedPatient.name,
+          medicalCard: this.selectedPatient.medicalCard,
+          phone: this.selectedPatient.phone,
+          gender: this.selectedPatient.gender,
+          fee: Number(this.currentTicket.fee) || 0,
+          regType: this.currentTicket.ticketType === 'general' ? '普通' : '专家',
+          tenant_id: userStore.tenantId || '1' // 修改为tenant_id以匹配后端数据库字段名
+        };
+        
+        // 验证必填字段
+        if (!appointmentData.ticketId || isNaN(appointmentData.ticketId)) {
+          alert('号源ID无效');
+          return;
+        }
+        
+        if (!appointmentData.patientId) {
+          alert('患者ID无效');
+          return;
+        }
+        
+        console.log('Sending appointment data to backend:', appointmentData);
+        bookTicket(appointmentData).then(response => {
+          const ticketIndex = this.tickets.findIndex(t => t.slot_id === this.currentTicket.slot_id);
+          if (ticketIndex !== -1) {
+            this.tickets[ticketIndex].status = '已预约';
+            this.tickets[ticketIndex].patientName = this.selectedPatient.name;
+            this.tickets[ticketIndex].patientId = this.selectedPatient.medicalCard;
+            this.tickets[ticketIndex].patientGender = this.selectedPatient.gender;
+          }
+          
+          this.closePatientSelectModal();
+          alert('预约成功，号源已锁定。患者到院签到时需缴费取号。');
+        }).catch(error => {
+          console.error('预约失败:', error);
+          alert('预约失败，请稍后重试。');
+        });
+      } catch (error) {
+        console.error('预约数据处理错误:', error);
+        alert('预约信息格式错误，请重新操作。');
+      }
+    },
+    onDateChange() {
+      // 日期变化时刷新号源列表
+      console.log('Date changed:', this.selectedDate)
+      // 重置页码并重新加载数据
+      this.currentPage = 1;
+      this.onSearch()
+    },
+    // 切换侧边栏显示/隐藏
+    toggleSidebar() {
+      this.showSidebar = !this.showSidebar;
+    },
+    // 检测是否为移动设备
+    checkMobileDevice() {
+      this.isMobile = window.innerWidth <= 768;
+    },
+    onSearch() {
+      this.isLoading = true
+      console.log('Searching with:', {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone
+      });
+      
+      // 调用真实API获取号源数据
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: 1,
+        limit: this.pageSize
+      };
+      
+      // 并行调用号源和科室API
+      Promise.all([
+        listAllTickets(), // 使用测试接口获取固定的5条专家号数据
+        listDept()
+      ]).then(([ticketResponse, deptResponse]) => {
+        // 打印完整的响应数据以便调试
+        console.log('完整的号源响应数据:', ticketResponse);
+        
+        // 处理号源数据
+        if (ticketResponse) {
+          // 检查是否有data.list字段（后端返回的数据结构是{code, data:{list, total}}）
+          if (ticketResponse.data && ticketResponse.data.list) {
+            this.tickets = ticketResponse.data.list;
+            this.totalTickets = ticketResponse.data.total;
+          } else {
+            // 如果没有data.list字段，可能数据直接在对象中
+            this.tickets = [ticketResponse];
+            this.totalTickets = 1;
+          }
+          
+          // 保存所有原始数据
+          this.allTickets = [...this.tickets];
+          // 更新医生列表
+          this.updateDoctorsList();
+          this.hasMore = this.tickets.length < this.totalTickets;
+        } else {
+          this.tickets = [];
+          this.allTickets = [];
+          this.totalTickets = 0;
+          this.hasMore = false;
+        }
+        
+        // 处理科室数据
+        this.updateDepartmentsListFromApi(deptResponse);
+        
+        this.isLoading = false;
+      }).catch(error => {
+        console.error('获取数据失败:', error);
+        this.tickets = [];
+        this.allTickets = [];
+        this.totalTickets = 0;
+        this.hasMore = false;
+        this.departments = [{ value: 'all', label: '全部科室' }];
+        this.isLoading = false;
+      });
+    },
+
+    
+    // 从号源数据中更新科室列表（备用方法）
+    updateDepartmentsList() {
+      const departmentSet = new Set();
+      this.tickets.forEach(ticket => {
+        departmentSet.add(ticket.department);
+      });
+      
+      // 转换为数组并添加"全部科室"选项
+      const departmentArray = Array.from(departmentSet).map(dept => ({
+        value: dept,
+        label: dept
+      }));
+      
+      this.departments = [
+        { value: 'all', label: '全部科室' },
+        ...departmentArray
+      ];
+    },
+    
+    // 从API获取完整科室列表
+    updateDepartmentsListFromApi(deptResponse) {
+      // 检查后端返回的数据结构
+      let deptList = [];
+      if (deptResponse.data) {
+        // 适配不同的后端数据结构
+        if (Array.isArray(deptResponse.data)) {
+          deptList = deptResponse.data;
+        } else if (Array.isArray(deptResponse.data.data)) {
+          deptList = deptResponse.data.data;
+        }
+      }
+      
+      if (deptList.length > 0) {
+        // 从API返回的科室数据中提取科室名称
+        const departmentArray = deptList
+          .filter(dept => dept.deptName) // 确保科室名称存在
+          .map(dept => ({
+            value: dept.deptName,
+            label: dept.deptName
+          }))
+          .filter((dept, index, self) => 
+            index === self.findIndex((d) => d.value === dept.value) // 去重
+          );
+        
+        this.departments = [
+          { value: 'all', label: '全部科室' },
+          ...departmentArray
+        ];
+      } else {
+        // 如果API调用失败或没有数据，回退到从号源数据中提取
+        this.updateDepartmentsList();
+      }
+    },
+    
+    // 获取号源状态文本
+    getStatusText(status) {
+      switch (status) {
+        case 'unbooked':
+          return '未预约';
+        case 'booked':
+          return '已预约';
+        case 'checked':
+          return '已取号';
+        case 'cancelled':
+          return '已取消';
+        case 'locked':
+          return '已锁定';
+        default:
+          return '未知状态';
+      }
+    },
+    
+    // 从号源数据中更新医生列表
+    updateDoctorsList() {
+      const doctorMap = new Map();
+      
+      // 统计每个医生的余号数量和类型
+      this.tickets.forEach(ticket => {
+        // 检查ticket对象是否有效
+        if (!ticket) return;
+        
+        // 统计所有号源的医生，不仅仅是未预约的
+        if (doctorMap.has(ticket.doctor)) {
+          // 如果是未预约状态，增加余号数量
+          if (ticket.status === '未预约') {
+            doctorMap.get(ticket.doctor).available += 1;
+          }
+        } else {
+          // 根据号源类型设置医生类型
+          const doctorType = ticket.ticketType || 'general';
+          doctorMap.set(ticket.doctor, { 
+            id: Date.now() + Math.random(), 
+            name: ticket.doctor, 
+            available: ticket.status === '未预约' ? 1 : 0, 
+            type: doctorType
+          });
+        }
+      });
+      
+      // 转换为数组
+      this.doctors = Array.from(doctorMap.values());
+      
+      // 打印医生列表以便调试
+      console.log('生成的医生列表:', this.doctors);
+    },
+    // 加载更多数据
+    loadMore() {
+      // 已经在加载中，不再重复请求
+      if (this.isLoading || !this.hasMore) {
+        return;
+      }
+      
+      this.isLoading = true;
+      this.currentPage++;
+      
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: this.currentPage,
+        limit: this.pageSize
+      };
+      
+      listTicket(queryParams).then(response => {
+        // 打印完整的响应数据以便调试
+        console.log('加载更多的号源响应数据:', response);
+        
+        // 处理号源数据
+        if (response) {
+          let newRecords = [];
+          
+          // 检查是否有records字段（响应拦截器已经返回了res.data，所以直接访问response.records）
+          if (response.records) {
+            newRecords = response.records;
+            this.totalTickets = response.total;
+          } else {
+            // 如果没有records字段，可能数据直接在对象中
+            newRecords = [response];
+            this.totalTickets = this.tickets.length + 1;
+          }
+          
+          // 将API返回的数据添加到tickets数组中
+          this.tickets = [...this.tickets, ...newRecords];
+        }
+        
+        this.isLoading = false;
+        this.hasMore = this.tickets.length < this.totalTickets;
+        
+        // 更新科室和医生列表
+        this.updateDepartmentsList();
+        this.updateDoctorsList();
+      }).catch(error => {
+        console.error('获取号源列表失败:', error);
+        this.isLoading = false;
+      });
+    },
+    // 滚动事件处理函数，实现滚动加载
+
+  },
+  mounted() {
+    // 初始化数据
+    this.selectedDate = new Date().toISOString().split('T')[0];
+    // 调用onSearch获取初始数据
+    this.onSearch();
+    // 检测是否为移动设备
+    this.checkMobileDevice();
+    // 监听窗口大小变化
+    window.addEventListener('resize', this.checkMobileDevice);
+  },
+  beforeUnmount() {
+    // 移除窗口大小变化监听
+    window.removeEventListener('resize', this.checkMobileDevice);
+  }
+}
+</script>
+
+<style scoped>
+/* 颜色变量定义 */
+:root {
+  --primary-color: #1890FF;
+  --secondary-color: #FF6B35;
+  --status-unbooked: #5A8DEE;
+  --status-booked: #FAAD14;
+  --status-checked: #52C41A;
+  --status-cancelled: #F5222D;
+  --border-color: #d9d9d9;
+  --text-primary: #333;
+  --text-secondary: #666;
+  --text-tertiary: #999;
+  --bg-light: #f8f9fa;
+  --bg-white: #fff;
+  --shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+}
+
+/* 基础样式 */
+.ticket-management-container {
+  padding: 20px;
+  background-color: var(--bg-light);
+  min-height: 100vh;
+}
+
+/* 顶部搜索区域 */
+.top-search-area {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: 20px;
+  padding: 12px 16px;
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  border: 1px solid #E8E8E8;
+}
+
+/* 搜索标签行 */
+.search-labels {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 搜索标签样式 */
+.search-label {
+  font-size: 14px;
+  color: #333333;
+  font-weight: 500;
+  text-align: left;
+  flex-grow: 1;
+  min-width: 80px;
+}
+
+/* 搜索输入行 */
+.search-inputs {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 为输入行的每个容器设置flex-grow，使其均匀分布 */
+.search-inputs > div {
+  flex-grow: 1;
+  min-width: 100px;
+}
+
+.hamburger-menu {
+  display: none;
+  cursor: pointer;
+  font-size: 20px;
+  color: var(--primary-color);
+}
+
+.date-picker {
+  width: 100%;
+}
+
+/* 搜索控件样式 */
+.search-input {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+}
+
+.search-input:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-select {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  cursor: pointer;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+  appearance: none;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%23999' d='M6 9L1 4h10z'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 8px center;
+  background-size: 12px;
+}
+
+.search-select:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-btn {
+  padding: 0 16px;
+  background-color: #1890FF;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  height: 32px;
+  box-sizing: border-box;
+  transition: background-color 0.3s;
+}
+
+.search-btn:hover {
+  background-color: #40a9ff;
+}
+
+.search-btn:active {
+  background-color: #096dd9;
+}
+
+.search-btn:disabled {
+  background-color: #e6f7ff;
+  color: #91d5ff;
+  cursor: not-allowed;
+}
+
+/* 日期选择器样式 */
+.date-picker {
+  width: 160px;
+  z-index: 1;
+}
+
+/* 状态筛选器样式 */
+.status-filter {
+  z-index: 2;
+}
+
+.el-date-editor {
+  width: 100% !important;
+}
+
+.el-date-editor .el-input__inner {
+  height: 32px !important;
+  border-radius: 4px;
+  border: 1px solid #E8E8E8;
+  font-size: 14px;
+  padding: 0 36px 0 12px !important;
+}
+
+.el-date-editor .el-input__inner:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.el-date-editor .el-input__suffix {
+  right: 8px !important;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.el-date-editor .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 主要内容区域 */
+.main-content {
+  display: flex;
+  gap: 20px;
+  height: calc(100vh - 104px); /* 减去顶部搜索区域高度和内边距 */
+  overflow: hidden;
+}
+
+.left-sidebar {
+  width: 220px;
+  height: 100%;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  box-shadow: var(--shadow);
+  flex-shrink: 0;
+  transition: all 0.3s ease;
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+/* 移动端侧边栏样式 */
+.sidebar-mobile {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100vh;
+  z-index: 1000;
+}
+
+/* 侧边栏隐藏样式 */
+.sidebar-hidden {
+  transform: translateX(-100%);
+}
+
+.right-content {
+  flex: 1;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  transition: all 0.3s ease;
+}
+
+/* 移动端右侧内容区占满屏幕 */
+.right-content-full {
+  width: 100%;
+}
+
+  /* 响应式设计 */
+  @media (max-width: 768px) {
+    /* 顶部搜索区域改为纵向排列 */
+    .top-search-area {
+      flex-direction: column;
+      height: auto;
+      padding: 16px;
+      gap: 16px;
+    }
+
+    /* 汉堡菜单显示 */
+    .hamburger-menu {
+      display: block;
+      align-self: flex-start;
+    }
+
+    /* 搜索区域元素宽度100% */
+    .date-picker,
+    .status-filter,
+    .patient-search,
+    .card-search,
+    .phone-search,
+    .search-button,
+    .add-patient {
+      width: 100%;
+    }
+
+    /* 右侧内容区卡片布局调整 */
+    .virtual-list {
+      grid-template-columns: 1fr;
+      gap: 12px;
+      padding: 12px;
+    }
+
+    /* 左侧边栏默认隐藏 */
+    .left-sidebar {
+      transform: translateX(-100%);
+    }
+
+    /* 右侧内容区占满屏幕 */
+     .right-content {
+       width: 100%;
+     }
+   }
+   
+   /* 确保卡片样式正确应用 */
+   .ticket-card {
+     box-shadow: var(--shadow);
+     overflow: hidden;
+     transition: all 0.3s ease;
+   }
+   
+   /* 卡片悬停效果 */
+   .ticket-card:hover {
+     transform: translateY(-2px);
+     box-shadow: 0 4px 16px rgba(90, 141, 238, 0.12);
+   }
+   
+   /* 按钮悬停效果 */
+   .search-btn,
+   .add-patient-btn {
+     transition: all 0.3s ease;
+   }
+   
+   .search-btn:hover,
+   .add-patient-btn:hover {
+     transform: translateY(-1px);
+     box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+   }
+   
+   /* 输入框焦点效果 */
+   .search-input {
+     transition: all 0.3s ease;
+   }
+   
+   .search-input:focus {
+     border-color: var(--primary-color);
+     box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+   }
+   
+   /* 医生列表项悬停效果 */
+   .doctor-item {
+     transition: all 0.3s ease;
+   }
+   
+   .doctor-item:hover {
+     background-color: rgba(24, 144, 255, 0.05);
+     cursor: pointer;
+   }
+   
+   /* 医生列表项选中效果 */
+.doctor-item.selected {
+  background-color: rgba(24, 144, 255, 0.2);
+  border-left: 4px solid var(--primary-color);
+  font-weight: 600;
+}
+   
+   /* 加载动画 */
+   .loading-container {
+     display: flex;
+     justify-content: center;
+     align-items: center;
+     padding: 20px;
+     gap: 8px;
+     color: var(--primary-color);
+   }
+   
+   .loading-spinner {
+     width: 16px;
+     height: 16px;
+     border: 2px solid rgba(24, 144, 255, 0.2);
+     border-top-color: var(--primary-color);
+     border-radius: 50%;
+     animation: spin 0.8s linear infinite;
+   }
+   
+   @keyframes spin {
+     to { transform: rotate(360deg); }
+   }
+
+/* 左侧筛选区域 */
+.section {
+  margin-bottom: 24px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: 600;
+  margin-bottom: 12px;
+  color: #333;
+}
+
+.radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.radio-group label {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  cursor: pointer;
+}
+
+.doctor-list {
+  margin-top: 12px;
+  max-height: calc(100vh - 300px); /* 限制医生列表高度 */
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+.doctor-item {
+  padding: 12px;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  margin-bottom: 8px;
+}
+
+.doctor-item:hover {
+  background-color: #f0f7ff;
+}
+
+.doctor-item.selected {
+  background-color: #e6f2ff;
+  border-left: 4px solid var(--primary-color);
+}
+
+.doctor-name {
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.doctor-available {
+  font-size: 12px;
+  color: var(--status-unbooked);
+  font-weight: normal;
+}
+
+/* 右侧号源卡片网格布局 */
+.ticket-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 16px;
+  padding: 8px;
+}
+
+  /* 加载更多样式 */
+  .loading-more,
+  .no-more {
+    grid-column: 1 / -1;
+    text-align: center;
+    padding: 20px;
+    color: #999;
+    font-size: 14px;
+  }
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 600px;
+  color: var(--text-tertiary);
+}
+
+.empty-text {
+  font-size: 16px;
+}
+
+.ticket-card {
+  background: white;
+  border-radius: 8px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+  border: 1px solid #e8e8e8;
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  min-height: 160px;
+}
+
+.ticket-card:hover {
+  box-shadow: 0 4px 12px rgba(90, 141, 238, 0.12);
+  transform: translateY(-2px);
+  border-color: #1890ff;
+}
+
+.ticket-number {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background-color: #e6f7ff;
+  color: #1890ff;
+  font-size: 12px;
+  font-weight: 500;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ticket-time {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  margin: 8px 0;
+}
+
+.ticket-status {
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  text-align: center;
+  min-width: 60px;
+  margin-bottom: 8px;
+}
+
+.status-unbooked {
+  background-color: #e6f3ff;
+  color: #1890ff;
+}
+
+.status-locked {
+  background-color: #fff1f0;
+  color: #f5222d;
+}
+
+.status-booked {
+  background-color: #fff8e6;
+  color: #fa8c16;
+}
+
+.status-checked {
+  background-color: #f6ffed;
+  color: #52c41a;
+}
+
+.status-cancelled {
+  background-color: #fff1f0;
+  color: #ff4d4f;
+}
+
+.ticket-doctor {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+  text-align: center;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ticket-fee {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.ticket-type {
+  font-size: 12px;
+  color: #999;
+  margin-bottom: 12px;
+}
+
+.book-button {
+      padding: 4px 16px;
+      background-color: #1890ff;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      font-size: 12px;
+      cursor: pointer;
+      transition: all 0.3s ease;
+      align-self: center;
+    }
+
+    .book-button:hover:not(:disabled) {
+      background-color: #40a9ff;
+    }
+
+    .book-button:disabled {
+      background-color: #e6f7ff;
+      color: #91d5ff;
+      cursor: not-allowed;
+    }
+    
+    .cancel-button {
+      background-color: #F56C6C;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .cancel-button:hover {
+      background-color: #F78989;
+    }
+
+    .cancel-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+    
+    .check-in-button {
+      background-color: #67C23A;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .check-in-button:hover {
+      background-color: #85ce61;
+    }
+
+    .check-in-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+
+/* 患者信息样式 */
+.ticket-patient {
+  margin-top: 8px;
+  padding: 4px;
+  background-color: rgba(24, 144, 255, 0.05);
+  border-radius: 4px;
+  font-size: 12px;
+  text-align: center;
+  color: #333;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .ticket-grid {
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 12px;
+  }
+  
+  .ticket-card {
+    padding: 12px;
+    min-height: 140px;
+  }
+  
+  .ticket-doctor {
+    font-size: 13px;
+  }
+}
+
+/* 弹窗样式 */
+.modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+
+.modal-content {
+  background-color: white;
+  border-radius: 8px;
+  width: 80%;
+  max-width: 800px;
+  /* 使用固定高度计算，确保footer始终可见 */
+  height: 80vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  /* 确保弹窗在视口中居中且不被遮挡 */
+  margin: 20px;
+  /* 相对定位，为绝对定位的footer提供参考 */
+  position: relative;
+}
+
+.modal-header {
+  flex-shrink: 0;
+}
+
+.modal-body {
+  flex: 1;
+  overflow-y: auto;
+  padding: 20px;
+  /* 给body添加底部内边距，确保内容不被footer遮挡 */
+  padding-bottom: 100px;
+}
+
+.modal-footer {
+  flex-shrink: 0;
+  /* 确保footer始终在底部可见，不受其他元素影响 */
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 10;
+  padding: 16px 20px;
+  border-top: 1px solid var(--border-color);
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  background-color: white;
+  /* 添加阴影，增强视觉层次感 */
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
+  /* 确保footer不被body内容遮挡 */
+}
+
+.confirm-btn {
+  padding: 8px 24px;
+  background-color: #1890ff;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+  font-weight: 500;
+  box-shadow: 0 2px 4px rgba(24, 144, 255, 0.2);
+}
+
+.confirm-btn:hover {
+  background-color: #40a9ff;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+}
+
+.confirm-btn:active {
+  background-color: #096dd9;
+  transform: translateY(0);
+}
+
+.cancel-btn {
+  padding: 8px 24px;
+  background-color: white;
+  color: var(--text-secondary);
+  border: 1px solid var(--border-color);
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.cancel-btn:hover {
+  color: var(--primary-color);
+  border-color: var(--primary-color);
+}
+
+.modal-header {
+  padding: 16px 20px;
+  border-bottom: 1px solid #e0e0e0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  color: #999;
+}
+
+.modal-body {
+  padding: 20px;
+}
+
+.patient-table-container {
+  margin-top: 20px;
+  overflow-x: auto;
+}
+
+.patient-table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.patient-table th,
+.patient-table td {
+  padding: 12px;
+  text-align: left;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.patient-table th {
+  background-color: #f5f5f5;
+  font-weight: 600;
+}
+
+.patient-table tr:hover {
+  background-color: #fafafa;
+}
+
+.patient-table tr.selected {
+  background-color: #e6f2ff;
+}
+
+.select-btn {
+  padding: 6px 12px;
+  background-color: #1890ff;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  font-weight: 500;
+  box-shadow: 0 2px 4px rgba(24, 144, 255, 0.2);
+}
+
+.select-btn:hover:not(:disabled) {
+  background-color: #40a9ff;
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+}
+
+.select-btn:disabled {
+  background-color: #d9d9d9;
+  color: #fff;
+  cursor: not-allowed;
+  box-shadow: none;
+}
+
+/* 右键菜单样式 */
+.context-menu {
+  position: fixed;
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  z-index: 1001;
+}
+
+.menu-item {
+  padding: 8px 16px;
+  cursor: pointer;
+  font-size: 14px;
+  transition: background-color 0.2s;
+}
+
+.menu-item:hover {
+  background-color: #f5f5f5;
+}
+
+.context-menu-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.loading-text {
+  display: flex;
+  align-items: center;
+}
+
+.search-btn:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue b/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue
new file mode 100644
index 00000000..d74d4d57
--- /dev/null
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/ticketManage.vue
@@ -0,0 +1,1638 @@
+<template>
+  <div class="ticket-management-container">
+    <!-- 顶部搜索区域 -->
+    <div id="topSearchArea" class="top-search-area">
+      <!-- 搜索标签行 -->
+      <div class="search-labels">
+        <div class="search-label">导源日期</div>
+        <div class="search-label">状态</div>
+        <div class="search-label">患者姓名</div>
+        <div class="search-label">就诊卡号</div>
+        <div class="search-label">手机号</div>
+        <div class="search-label"></div> <!-- 为查询按钮预留空间 -->
+      </div>
+      
+      <!-- 搜索输入行 -->
+      <div class="search-inputs">
+        <!-- 移动端汉堡菜单按钮 -->
+        <div class="hamburger-menu" @click="toggleSidebar" v-if="isMobile">
+          <i class="el-icon-menu"></i>
+        </div>
+        <div id="datePicker" class="date-picker">
+          <el-date-picker
+            v-model="selectedDate"
+            type="date"
+            placeholder="选择日期"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
+            :shortcuts="dateShortcuts"
+            class="date-picker"
+            @change="onDateChange"
+          />
+        </div>
+        <div id="statusFilter" class="status-filter">
+          <select id="status-select" class="search-select" v-model="selectedStatus">
+            <option value="all">全部</option>
+            <option value="unbooked">未预约</option>
+            <option value="locked">锁定</option>
+            <option value="booked">待缴费</option>
+            <option value="checked">已取号</option>
+            <option value="cancelled">已停诊</option>
+          </select>
+        </div>
+        <div id="patientSearch" class="patient-search">
+          <input id="patient-name-input" class="search-input" placeholder="姓名" v-model="patientName">
+        </div>
+        <div id="cardSearch" class="card-search">
+          <input id="patient-card-input" class="search-input" placeholder="就诊卡号" v-model="patientCard">
+        </div>
+        <div id="phoneSearch" class="phone-search">
+          <input id="patient-phone-input" class="search-input" placeholder="手机号" v-model="patientPhone">
+        </div>
+        <div class="search-button">
+          <button id="search-button" class="search-btn" @click="onSearch" :disabled="isLoading">
+            <span v-if="isLoading" class="loading-text">搜索中...</span>
+            <span v-else>查询</span>
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 主要内容区域 -->
+    <div id="mainContent" class="main-content">
+      <!-- 左侧筛选区域 -->
+      <div id="leftSidebar" class="left-sidebar" :class="{ 'sidebar-hidden': isMobile && !showSidebar, 'sidebar-mobile': isMobile }">
+        <!-- 科室列表 -->
+        <div class="section">
+          <h3 class="section-title">科室列表</h3>
+          <select id="department-list" class="search-select" v-model="selectedDepartment" @change="onDepartmentChange">
+            <option value="all">全部科室</option>
+            <option v-for="department in departments" :key="department.value" :value="department.value">
+              {{ department.label }}
+            </option>
+          </select>
+        </div>
+
+        <!-- 号源类型 -->
+        <div class="section">
+          <h3 class="section-title">号源类型</h3>
+          <div class="radio-group">
+            <label>
+              <input type="radio" name="type" value="general" v-model="selectedType" @change="onTypeChange">
+              <span>普通号</span>
+            </label>
+            <label>
+              <input type="radio" name="type" value="expert" v-model="selectedType" @change="onTypeChange">
+              <span>专家号</span>
+            </label>
+          </div>
+        </div>
+
+        <!-- 医生号源列表 -->
+        <div class="section">
+          <h3 class="section-title">医生号源列表</h3>
+          <input id="doctor-search" class="search-input" placeholder="搜索医生姓名" v-model="searchQuery" @input="onDoctorSearch">
+          <div class="doctor-list">
+            <div class="doctor-item" v-for="doctor in filteredDoctors" :key="doctor.id" :class="{ selected: selectedDoctorId === doctor.id }" @click="selectDoctor(doctor.id)">
+              <div class="doctor-name">{{ doctor.name }} <span class="doctor-available">余号：{{ doctor.available }}</span></div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 右侧号源卡片区域 -->
+      <div class="right-content" :class="{ 'right-content-full': isMobile && !showSidebar }">
+        <!-- 使用网格布局的号源卡片列表 -->
+        <div class="ticket-grid" v-if="filteredTickets.length > 0">
+          <div v-for="(item, index) in filteredTickets" :key="item.slot_id" class="ticket-card" @dblclick="handleDoubleClick(item)" @contextmenu.prevent="handleRightClick($event, item)">
+            <div class="ticket-header">
+              <div class="ticket-number">{{ index + 1 }}</div>
+              <div class="ticket-type-badge" :class="item.ticketType === 'general' ? 'type-general' : 'type-expert'">
+                {{ item.ticketType === 'general' ? '普通' : '专家' }}
+              </div>
+            </div>
+            <div class="ticket-time">{{ item.dateTime }}</div>
+            <div class="ticket-doctor">{{ item.doctor }}</div>
+            <div class="ticket-status" :class="`status-${item.status}`">
+              <span class="status-dot"></span>
+              {{ item.status }}
+            </div>
+            <div class="ticket-fee">挂号费: {{ item.fee }}</div>
+            <!-- 显示患者信息（如果已预约或已取号） -->
+            <div v-if="(item.status === '已预约' || item.status === '已取号') && item.patientName" class="ticket-patient">
+              <div class="patient-name">{{ item.patientName }}</div>
+              <div class="patient-card">{{ item.patientId }}</div>
+            </div>
+            <div class="ticket-actions">
+              <button class="action-button book-button" @click="openPatientSelectModal(item.slot_id)" :disabled="item.status !== '未预约'" :class="{ 'disabled': item.status !== '未预约' }">
+                <i class="el-icon-tickets"></i>
+                预约
+              </button>
+              <button class="action-button cancel-button" @click="confirmCancelConsultation(item)" :disabled="item.status === '已取消'" :class="{ 'disabled': item.status === '已取消' }">
+                <i class="el-icon-close"></i>
+                停诊
+              </button>
+              <button class="action-button check-in-button" @click="confirmCheckIn(item)" :disabled="item.status !== '已预约'" :class="{ 'disabled': item.status !== '已预约' }">
+                <i class="el-icon-circle-check"></i>
+                取号
+              </button>
+            </div>
+          </div>
+          <div v-if="hasMore" class="loading-more">
+            加载中...
+          </div>
+          <div v-else class="no-more">
+            没有更多数据了
+          </div>
+        </div>
+        <div v-else class="empty-state">
+          <div class="empty-text">暂无号源数据</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 患者选择弹窗 -->
+    <div id="patient-select-modal" class="modal" v-if="showPatientModal">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h3>选择患者</h3>
+          <button class="close-btn" @click="closePatientSelectModal">&times;</button>
+        </div>
+        <div class="modal-body">
+          <input id="patientName" class="search-input" placeholder="患者姓名" v-model="patientSearchParams.patientName" @input="onPatientSearchInput">
+          <input id="medicalCard" class="search-input" placeholder="就诊卡号" v-model="patientSearchParams.medicalCard" @input="onPatientSearchInput">
+          <input id="idCard" class="search-input" placeholder="身份证号" v-model="patientSearchParams.idCard" @input="onPatientSearchInput">
+          <input id="phone" class="search-input" placeholder="手机号" v-model="patientSearchParams.phone" @input="onPatientSearchInput">
+          <button id="patient-search-btn" class="search-btn" @click="searchPatients">查询</button>
+          <div class="patient-table-container">
+            <table id="patient-table" class="patient-table">
+              <thead>
+                <tr>
+                  <th>序号</th>
+                  <th>患者姓名</th>
+                  <th>就诊卡号</th>
+                  <th>身份证号</th>
+                  <th>手机号</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(patient, index) in patients" :key="patient.id" :class="{ selected: selectedPatientId === patient.id }" @click="selectPatient(patient.id)">
+                  <td>{{ index + 1 }}</td>
+                  <td>{{ patient.name }}</td>
+                  <td>{{ patient.medicalCard }}</td>
+                  <td>{{ patient.idCard }}</td>
+                  <td>{{ patient.phone }}</td>
+                  <td>
+                    <button class="select-btn" @click.stop="selectPatient(patient.id)">选择</button>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button class="confirm-btn" @click="confirmPatientSelection">确认</button>
+          <button class="cancel-btn" @click="closePatientSelectModal">取消</button>
+        </div>
+      </div>
+    </div>
+    <!-- 右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu"
+      :style="{
+        left: contextMenuPosition.x + 'px',
+        top: contextMenuPosition.y + 'px'
+      }"
+      @click.stop
+      @contextmenu.prevent
+    >
+      <div v-if="selectedTicketForCancel && (selectedTicketForCancel.status === 'booked' || selectedTicketForCancel.status === 'locked' || selectedTicketForCancel.status === 'checked')" class="menu-item" @click="confirmCancelAppointment">
+          取消预约
+        </div>
+    </div>
+
+    <!-- 点击页面其他地方关闭右键菜单 -->
+    <div
+      v-if="contextMenuVisible"
+      class="context-menu-overlay"
+      @click="closeContextMenu"
+      @contextmenu.prevent
+    ></div>
+  </div>
+</template>
+
+<script>
+import { listTicket, bookTicket, cancelTicket, checkInTicket, cancelConsultation } from '@/api/appoinmentmanage/ticket';
+import { getPatientList } from '@/api/cardRenewal/api';
+import { listDept } from '@/api/appoinmentmanage/dept';
+import { ref } from 'vue'
+import { ElDatePicker } from 'element-plus'
+
+export default {
+  name: 'TicketManage',
+  components: {
+    ElDatePicker
+  },
+  
+  // 添加全局点击事件监听器，用于关闭右键菜单
+  mounted() {
+    document.addEventListener('click', this.closeContextMenu);
+  },
+  
+  // 移除事件监听器
+  beforeUnmount() {
+    document.removeEventListener('click', this.closeContextMenu);
+  },
+  data() {
+    return {
+      selectedDate: new Date().toISOString().split('T')[0],
+      selectedStatus: 'unbooked',
+      selectedDepartment: 'all',
+      selectedType: 'general', // 普通号默认选中
+      selectedDoctorId: null,
+      showPatientModal: false,
+      selectedPatientId: null,
+      selectedPatient: null,
+      currentTicket: null,
+      patientName: '',
+      patientCard: '',
+      patientPhone: '',
+      isLoading: false,
+      // 移动端相关变量
+      isMobile: false,
+      showSidebar: false,
+      // 分页相关属性
+      currentPage: 1,
+      pageSize: 20,
+      totalTickets: 0,
+      hasMore: true,
+      // 右键菜单相关
+      contextMenuVisible: false,
+      contextMenuPosition: { x: 0, y: 0 },
+      selectedTicketForCancel: null,
+      departments: [
+        { value: 'all', label: '全部科室' }
+      ],
+      doctors: [],
+      allTickets: [], // 存储所有原始号源数据
+      tickets: [], // 从API获取的真实号源数据
+      patients: [], // 从API获取的真实患者数据
+      searchQuery: '',
+      // 患者搜索相关
+      patientSearchParams: {
+        patientName: '',
+        medicalCard: '',
+        idCard: '',
+        phone: ''
+      },
+      dateShortcuts: [
+        { text: '今天', value: new Date() },
+        { text: '明天', value: () => { const date = new Date(); date.setDate(date.getDate() + 1); return date; } },
+        { text: '本周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 1); return date; } },
+        { text: '下周', value: () => { const date = new Date(); const day = date.getDay() || 7; date.setDate(date.getDate() - day + 8); return date; } },
+        { text: '本月', value: () => { const date = new Date(); date.setDate(1); return date; } },
+        { text: '下月', value: () => { const date = new Date(); date.setMonth(date.getMonth() + 1); date.setDate(1); return date; } }
+      ]
+    }
+  },
+  computed: {
+    filteredDoctors() {
+      let filtered = [...this.doctors];
+      
+      // 根据号源类型过滤医生列表
+      if (this.selectedType === 'general') {
+        filtered = filtered.filter(doctor => doctor.type === 'general');
+      } else if (this.selectedType === 'expert') {
+        filtered = filtered.filter(doctor => doctor.type === 'expert');
+      }
+      
+      // 根据搜索关键词过滤
+      if (this.searchQuery) {
+        filtered = filtered.filter(doctor => 
+          doctor.name.includes(this.searchQuery)
+        );
+      }
+      
+      return filtered;
+    },
+    filteredTickets() {
+      let filtered = [...this.tickets];
+      
+      // 按日期筛选（如果选择了日期） - 暂时注释掉以排查问题
+      // if (this.selectedDate) {
+      //   filtered = filtered.filter(ticket => {
+      //     // 使用后端返回的dateTime字段进行筛选
+      //     if (ticket.dateTime) {
+      //       return ticket.dateTime.startsWith(this.selectedDate);
+      //     }
+      //     return true;
+      //   });
+      // }
+      
+      // 按状态筛选 - 暂时注释掉以排查问题
+      // if (this.selectedStatus !== 'all') {
+      //   // 状态映射表（后端返回中文状态，前端使用英文状态）
+      //   const statusMap = {
+      //     'unbooked': '未预约',
+      //     'locked': '已锁定',
+      //     'booked': '已预约',
+      //     'checked': '已取号',
+      //     'cancelled': '已取消'
+      //   };
+      //   const chineseStatus = statusMap[this.selectedStatus];
+      //   filtered = filtered.filter(ticket => ticket.status === chineseStatus);
+      // }
+      
+      // 按科室筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDepartment !== 'all') {
+      //   filtered = filtered.filter(ticket => ticket.department === this.selectedDepartment);
+      // }
+      
+      // 按号源类型筛选 - 暂时注释掉以排查问题
+      // filtered = filtered.filter(ticket => {
+      //   if (this.selectedType === 'general') {
+      //     return ticket.ticketType === 'general';
+      //   } else if (this.selectedType === 'expert') {
+      //     return ticket.ticketType === 'expert';
+      //   }
+      //   return true;
+      // });
+      
+      // 按医生筛选 - 暂时注释掉以排查问题
+      // if (this.selectedDoctorId) {
+      //   const selectedDoctor = this.doctors.find(d => d.id === this.selectedDoctorId);
+      //   if (selectedDoctor) {
+      //     filtered = filtered.filter(ticket => ticket.doctor === selectedDoctor.name);
+      //   }
+      // }
+      
+      // 按患者信息筛选（姓名、就诊卡号、手机号） - 暂时注释掉以排查问题
+      // if (this.patientName || this.patientCard || this.patientPhone) {
+      //   filtered = filtered.filter(ticket => {
+      //     const matchesName = !this.patientName || ticket.patientName?.includes(this.patientName);
+      //     const matchesCard = !this.patientCard || ticket.patientId?.includes(this.patientCard);
+      //     const matchesPhone = !this.patientPhone || ticket.phone?.includes(this.patientPhone);
+      //     
+      //     return matchesName && matchesCard && matchesPhone;
+      //   });
+      // }
+      
+      return filtered;
+    },
+  },
+  methods: {
+    selectDoctor(doctorId) {
+      this.selectedDoctorId = doctorId
+      console.log('Selected doctor:', doctorId)
+      // 医生选择后，筛选号源
+      this.onSearch();
+    },
+    onTypeChange() {
+      console.log('Type changed:', this.selectedType)
+      this.onSearch()
+    },
+    onDepartmentChange() {
+      console.log('Department changed:', this.selectedDepartment)
+      this.onSearch()
+    },
+    onDoctorSearch() {
+      console.log('Searching doctor:', this.searchQuery)
+      this.onSearch()
+    },
+    openPatientSelectModal(ticketId) {
+      this.currentTicket = this.tickets.find(ticket => ticket.slot_id === ticketId);
+      // 打开患者选择弹窗时，查询患者列表
+      this.searchPatients();
+      this.showPatientModal = true
+    },
+    
+    // 患者搜索
+    searchPatients() {
+      // 调用真实API获取患者列表
+      getPatientList(this.patientSearchParams).then(response => {
+        if (response.data && response.data.records) {
+          this.patients = response.data.records;
+        } else {
+          this.patients = [];
+        }
+      }).catch(error => {
+        console.error('获取患者列表失败:', error);
+        this.patients = [];
+      });
+    },
+    
+    // 监听患者搜索输入变化
+    onPatientSearchInput(event) {
+      const field = event.target.id;
+      const value = event.target.value;
+      
+      // 根据输入框ID更新对应的搜索参数
+      switch(field) {
+        case 'patientName':
+          this.patientSearchParams.patientName = value;
+          break;
+        case 'medicalCard':
+          this.patientSearchParams.medicalCard = value;
+          break;
+        case 'idCard':
+          this.patientSearchParams.idCard = value;
+          break;
+        case 'phone':
+          this.patientSearchParams.phone = value;
+          break;
+      }
+    },
+    
+    // 双击未预约卡片触发患者选择流程
+    handleDoubleClick(ticket) {
+      if (ticket.status === '未预约') {
+        this.currentTicket = ticket;
+        this.selectedPatientId = null;
+        this.showPatientModal = true;
+      }
+    },
+    
+    // 右键已预约卡片显示取消预约菜单
+    handleRightClick(event, ticket) {
+      if (ticket.status === '已预约') {
+        this.selectedTicketForCancel = ticket;
+        this.contextMenuPosition = { x: event.clientX, y: event.clientY };
+        this.contextMenuVisible = true;
+      }
+    },
+    
+    // 关闭右键菜单
+    closeContextMenu() {
+      this.contextMenuVisible = false;
+      this.selectedTicketForCancel = null;
+    },
+    
+    // 确认取消预约
+    confirmCancelAppointment() {
+      if (this.selectedTicketForCancel) {
+        // 二次确认
+        if (confirm(`确认取消患者的预约？`)) {
+          // 调用API取消预约
+          this.cancelAppointment(this.selectedTicketForCancel);
+        }
+        this.closeContextMenu();
+      }
+    },
+    
+    // 确认停诊
+    confirmCancelConsultation(ticket) {
+      // 二次确认
+      if (confirm(`确认取消${ticket.doctor}在${ticket.dateTime}的看诊吗？`)) {
+        // 调用API处理停诊
+        this.cancelConsultation(ticket);
+      }
+    },
+    
+    // 处理停诊
+    cancelConsultation(ticket) {
+      // 使用真实API调用处理停诊
+      cancelConsultation(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('停诊已处理，该号源已被取消');
+      }).catch(error => {
+        console.error('停诊处理失败:', error);
+        alert('停诊处理失败，请稍后重试。');
+      });
+    },
+    
+    // 确认取号
+    confirmCheckIn(ticket) {
+      // 二次确认
+      if (confirm(`确认${ticket.patientName || ''}取号吗？`)) {
+        // 调用API处理取号
+        this.checkIn(ticket);
+      }
+    },
+    
+    // 处理取号
+    checkIn(ticket) {
+      // 使用真实API调用处理取号
+      checkInTicket(ticket.slot_id).then(response => {
+        // API调用成功后，重新获取最新的号源数据
+        this.onSearch();
+        alert('取号成功！');
+      }).catch(error => {
+        console.error('取号失败:', error);
+        alert('取号失败，请稍后重试。');
+      });
+    },
+    
+    // 取消预约API调用
+    cancelAppointment(ticket) {
+        // 使用真实API调用取消预约
+        cancelTicket(ticket.slot_id).then(response => {
+          // API调用成功后，重新获取最新的号源数据
+          this.onSearch();
+          // 关闭上下文菜单
+          this.closeContextMenu();
+          alert('预约已取消，号源已释放');
+        }).catch(error => {
+          console.error('取消预约失败:', error);
+          alert('取消预约失败，请稍后重试。');
+        });
+      },
+    closePatientSelectModal() {
+      this.showPatientModal = false
+      this.selectedPatientId = null
+    },
+    selectPatient(patientId) {
+      this.selectedPatientId = patientId;
+      // 保存选择的患者对象
+      this.selectedPatient = this.patients.find(patient => patient.id === patientId);
+    },
+    confirmPatientSelection() {
+      if (this.selectedPatientId && this.selectedPatient) {
+        // 这里可以添加确认患者选择后的逻辑
+        console.log('Selected patient:', this.selectedPatient, 'for ticket:', this.currentTicket.slot_id)
+        
+        // 构建预约数据
+        const appointmentData = {
+          ticketId: Number(this.currentTicket.slot_id),
+          patientId: this.selectedPatientId ? Number(this.selectedPatientId) : null,
+          patientName: this.selectedPatient.name,
+          medicalCard: this.selectedPatient.medicalCard,
+          phone: this.selectedPatient.phone
+        };
+        
+        // 使用真实API调用进行预约
+        bookTicket(appointmentData).then(response => {
+          // API调用成功后，重新获取最新的号源数据
+          this.onSearch();
+          this.closePatientSelectModal();
+          alert('预约成功，号源已锁定。患者到院签到时需缴费取号。');
+        }).catch(error => {
+          console.error('预约失败:', error);
+          alert('预约失败，请稍后重试。');
+        });
+      } else {
+        alert('请选择患者')
+      }
+    },
+    onDateChange() {
+      // 日期变化时刷新号源列表
+      console.log('Date changed:', this.selectedDate)
+      // 重置页码并重新加载数据
+      this.currentPage = 1;
+      this.onSearch()
+    },
+    // 切换侧边栏显示/隐藏
+    toggleSidebar() {
+      this.showSidebar = !this.showSidebar;
+    },
+    // 检测是否为移动设备
+    checkMobileDevice() {
+      this.isMobile = window.innerWidth <= 768;
+    },
+    onSearch() {
+      this.isLoading = true
+      console.log('Searching with:', {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone
+      });
+      
+      // 调用真实API获取号源数据
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        type: this.selectedType,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: 1,
+        limit: this.pageSize
+      };
+      
+      // 并行调用号源和科室API
+      Promise.all([
+        listTicket(queryParams),
+        listDept()
+      ]).then(([ticketResponse, deptResponse]) => {
+        // 打印完整的响应数据以便调试
+        console.log('完整的号源响应数据:', ticketResponse);
+        
+        // 处理号源数据
+        if (ticketResponse) {
+          // 检查是否有records字段（响应拦截器已经返回了res.data，所以直接访问ticketResponse.records）
+          if (ticketResponse.records) {
+            this.tickets = ticketResponse.records;
+            this.totalTickets = ticketResponse.total;
+          } else {
+            // 如果没有records字段，可能数据直接在对象中
+            this.tickets = [ticketResponse];
+            this.totalTickets = 1;
+          }
+          
+          // 保存所有原始数据
+          this.allTickets = [...this.tickets];
+          // 更新医生列表
+          this.updateDoctorsList();
+          this.hasMore = this.tickets.length < this.totalTickets;
+        } else {
+          this.tickets = [];
+          this.allTickets = [];
+          this.totalTickets = 0;
+          this.hasMore = false;
+        }
+        
+        // 处理科室数据
+        this.updateDepartmentsListFromApi(deptResponse);
+        
+        this.isLoading = false;
+      }).catch(error => {
+        console.error('获取数据失败:', error);
+        this.tickets = [];
+        this.allTickets = [];
+        this.totalTickets = 0;
+        this.hasMore = false;
+        this.departments = [{ value: 'all', label: '全部科室' }];
+        this.isLoading = false;
+      });
+    },
+
+    
+    // 从号源数据中更新科室列表（备用方法）
+    updateDepartmentsList() {
+      const departmentSet = new Set();
+      this.tickets.forEach(ticket => {
+        departmentSet.add(ticket.department);
+      });
+      
+      // 转换为数组并添加"全部科室"选项
+      const departmentArray = Array.from(departmentSet).map(dept => ({
+        value: dept,
+        label: dept
+      }));
+      
+      this.departments = [
+        { value: 'all', label: '全部科室' },
+        ...departmentArray
+      ];
+    },
+    
+    // 从API获取完整科室列表
+    updateDepartmentsListFromApi(deptResponse) {
+      // 检查后端返回的数据结构
+      let deptList = [];
+      if (deptResponse.data) {
+        // 适配不同的后端数据结构
+        if (Array.isArray(deptResponse.data)) {
+          deptList = deptResponse.data;
+        } else if (Array.isArray(deptResponse.data.data)) {
+          deptList = deptResponse.data.data;
+        }
+      }
+      
+      if (deptList.length > 0) {
+        // 从API返回的科室数据中提取科室名称
+        const departmentArray = deptList
+          .filter(dept => dept.deptName) // 确保科室名称存在
+          .map(dept => ({
+            value: dept.deptName,
+            label: dept.deptName
+          }))
+          .filter((dept, index, self) => 
+            index === self.findIndex((d) => d.value === dept.value) // 去重
+          );
+        
+        this.departments = [
+          { value: 'all', label: '全部科室' },
+          ...departmentArray
+        ];
+      } else {
+        // 如果API调用失败或没有数据，回退到从号源数据中提取
+        this.updateDepartmentsList();
+      }
+    },
+    
+    // 获取号源状态文本
+    getStatusText(status) {
+      switch (status) {
+        case 'unbooked':
+          return '未预约';
+        case 'booked':
+          return '已预约';
+        case 'checked':
+          return '已取号';
+        case 'cancelled':
+          return '已取消';
+        case 'locked':
+          return '已锁定';
+        default:
+          return '未知状态';
+      }
+    },
+    
+    // 从号源数据中更新医生列表
+    updateDoctorsList() {
+      const doctorMap = new Map();
+      
+      // 统计每个医生的余号数量和类型
+      this.tickets.forEach(ticket => {
+        // 检查ticket对象是否有效
+        if (!ticket) return;
+        
+        // 统计所有号源的医生，不仅仅是未预约的
+        if (doctorMap.has(ticket.doctor)) {
+          // 如果是未预约状态，增加余号数量
+          if (ticket.status === '未预约') {
+            doctorMap.get(ticket.doctor).available += 1;
+          }
+        } else {
+          // 根据号源类型设置医生类型
+          const doctorType = ticket.ticketType || 'general';
+          doctorMap.set(ticket.doctor, { 
+            id: Date.now() + Math.random(), 
+            name: ticket.doctor, 
+            available: ticket.status === '未预约' ? 1 : 0, 
+            type: doctorType
+          });
+        }
+      });
+      
+      // 转换为数组
+      this.doctors = Array.from(doctorMap.values());
+      
+      // 打印医生列表以便调试
+      console.log('生成的医生列表:', this.doctors);
+    },
+    // 加载更多数据
+    loadMore() {
+      // 已经在加载中，不再重复请求
+      if (this.isLoading || !this.hasMore) {
+        return;
+      }
+      
+      this.isLoading = true;
+      this.currentPage++;
+      
+      const queryParams = {
+        date: this.selectedDate,
+        status: this.selectedStatus,
+        name: this.patientName,
+        card: this.patientCard,
+        phone: this.patientPhone,
+        page: this.currentPage,
+        limit: this.pageSize
+      };
+      
+      listTicket(queryParams).then(response => {
+        // 打印完整的响应数据以便调试
+        console.log('加载更多的号源响应数据:', response);
+        
+        // 处理号源数据
+        if (response) {
+          let newRecords = [];
+          
+          // 检查是否有records字段（响应拦截器已经返回了res.data，所以直接访问response.records）
+          if (response.records) {
+            newRecords = response.records;
+            this.totalTickets = response.total;
+          } else {
+            // 如果没有records字段，可能数据直接在对象中
+            newRecords = [response];
+            this.totalTickets = this.tickets.length + 1;
+          }
+          
+          // 将API返回的数据添加到tickets数组中
+          this.tickets = [...this.tickets, ...newRecords];
+        }
+        
+        this.isLoading = false;
+        this.hasMore = this.tickets.length < this.totalTickets;
+        
+        // 更新科室和医生列表
+        this.updateDepartmentsList();
+        this.updateDoctorsList();
+      }).catch(error => {
+        console.error('获取号源列表失败:', error);
+        this.isLoading = false;
+      });
+    },
+    // 滚动事件处理函数，实现滚动加载
+
+  },
+  mounted() {
+    // 初始化数据
+    this.selectedDate = new Date().toISOString().split('T')[0];
+    // 调用onSearch获取初始数据
+    this.onSearch();
+    // 检测是否为移动设备
+    this.checkMobileDevice();
+    // 监听窗口大小变化
+    window.addEventListener('resize', this.checkMobileDevice);
+  },
+  beforeUnmount() {
+    // 移除窗口大小变化监听
+    window.removeEventListener('resize', this.checkMobileDevice);
+  }
+}
+</script>
+
+<style scoped>
+/* 颜色变量定义 */
+:root {
+  --primary-color: #1890FF;
+  --secondary-color: #FF6B35;
+  --status-unbooked: #5A8DEE;
+  --status-booked: #FAAD14;
+  --status-checked: #52C41A;
+  --status-cancelled: #F5222D;
+  --border-color: #d9d9d9;
+  --text-primary: #333;
+  --text-secondary: #666;
+  --text-tertiary: #999;
+  --bg-light: #f8f9fa;
+  --bg-white: #fff;
+  --shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+}
+
+/* 基础样式 */
+.ticket-management-container {
+  padding: 20px;
+  background-color: var(--bg-light);
+  min-height: 100vh;
+}
+
+/* 顶部搜索区域 */
+.top-search-area {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: 20px;
+  padding: 12px 16px;
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  border: 1px solid #E8E8E8;
+}
+
+/* 搜索标签行 */
+.search-labels {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 搜索标签样式 */
+.search-label {
+  font-size: 14px;
+  color: #333333;
+  font-weight: 500;
+  text-align: left;
+  flex-grow: 1;
+  min-width: 80px;
+}
+
+/* 搜索输入行 */
+.search-inputs {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 为输入行的每个容器设置flex-grow，使其均匀分布 */
+.search-inputs > div {
+  flex-grow: 1;
+  min-width: 100px;
+}
+
+.hamburger-menu {
+  display: none;
+  cursor: pointer;
+  font-size: 20px;
+  color: var(--primary-color);
+}
+
+.date-picker {
+  width: 100%;
+}
+
+/* 搜索控件样式 */
+.search-input {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+}
+
+.search-input:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-select {
+  padding: 6px 12px;
+  border: 1px solid #E8E8E8;
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: #FFFFFF;
+  cursor: pointer;
+  width: 100%;
+  height: 32px;
+  box-sizing: border-box;
+  appearance: none;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%23999' d='M6 9L1 4h10z'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 8px center;
+  background-size: 12px;
+}
+
+.search-select:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.search-btn {
+  padding: 0 16px;
+  background-color: #1890FF;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  height: 32px;
+  box-sizing: border-box;
+  transition: background-color 0.3s;
+}
+
+.search-btn:hover {
+  background-color: #40a9ff;
+}
+
+.search-btn:active {
+  background-color: #096dd9;
+}
+
+.search-btn:disabled {
+  background-color: #e6f7ff;
+  color: #91d5ff;
+  cursor: not-allowed;
+}
+
+/* 日期选择器样式 */
+.date-picker {
+  width: 160px;
+  z-index: 1;
+}
+
+/* 状态筛选器样式 */
+.status-filter {
+  z-index: 2;
+}
+
+.el-date-editor {
+  width: 100% !important;
+}
+
+.el-date-editor .el-input__inner {
+  height: 32px !important;
+  border-radius: 4px;
+  border: 1px solid #E8E8E8;
+  font-size: 14px;
+  padding: 0 36px 0 12px !important;
+}
+
+.el-date-editor .el-input__inner:focus {
+  border-color: #1890FF;
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+}
+
+.el-date-editor .el-input__suffix {
+  right: 8px !important;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.el-date-editor .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 主要内容区域 */
+.main-content {
+  display: flex;
+  gap: 20px;
+  height: calc(100vh - 104px); /* 减去顶部搜索区域高度和内边距 */
+  overflow: hidden;
+}
+
+.left-sidebar {
+  width: 220px;
+  height: 100%;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  box-shadow: var(--shadow);
+  flex-shrink: 0;
+  transition: all 0.3s ease;
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+/* 移动端侧边栏样式 */
+.sidebar-mobile {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100vh;
+  z-index: 1000;
+}
+
+/* 侧边栏隐藏样式 */
+.sidebar-hidden {
+  transform: translateX(-100%);
+}
+
+.right-content {
+  flex: 1;
+  background-color: white;
+  border-radius: 8px;
+  padding: 20px;
+  transition: all 0.3s ease;
+}
+
+/* 移动端右侧内容区占满屏幕 */
+.right-content-full {
+  width: 100%;
+}
+
+  /* 响应式设计 */
+  @media (max-width: 768px) {
+    /* 顶部搜索区域改为纵向排列 */
+    .top-search-area {
+      flex-direction: column;
+      height: auto;
+      padding: 16px;
+      gap: 16px;
+    }
+
+    /* 汉堡菜单显示 */
+    .hamburger-menu {
+      display: block;
+      align-self: flex-start;
+    }
+
+    /* 搜索区域元素宽度100% */
+    .date-picker,
+    .status-filter,
+    .patient-search,
+    .card-search,
+    .phone-search,
+    .search-button,
+    .add-patient {
+      width: 100%;
+    }
+
+    /* 右侧内容区卡片布局调整 */
+    .virtual-list {
+      grid-template-columns: 1fr;
+      gap: 12px;
+      padding: 12px;
+    }
+
+    /* 左侧边栏默认隐藏 */
+    .left-sidebar {
+      transform: translateX(-100%);
+    }
+
+    /* 右侧内容区占满屏幕 */
+     .right-content {
+       width: 100%;
+     }
+   }
+   
+   /* 确保卡片样式正确应用 */
+   .ticket-card {
+     box-shadow: var(--shadow);
+     overflow: hidden;
+     transition: all 0.3s ease;
+   }
+   
+   /* 卡片悬停效果 */
+   .ticket-card:hover {
+     transform: translateY(-2px);
+     box-shadow: 0 4px 16px rgba(90, 141, 238, 0.12);
+   }
+   
+   /* 按钮悬停效果 */
+   .search-btn,
+   .add-patient-btn {
+     transition: all 0.3s ease;
+   }
+   
+   .search-btn:hover,
+   .add-patient-btn:hover {
+     transform: translateY(-1px);
+     box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+   }
+   
+   /* 输入框焦点效果 */
+   .search-input {
+     transition: all 0.3s ease;
+   }
+   
+   .search-input:focus {
+     border-color: var(--primary-color);
+     box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+   }
+   
+   /* 医生列表项悬停效果 */
+   .doctor-item {
+     transition: all 0.3s ease;
+   }
+   
+   .doctor-item:hover {
+     background-color: rgba(24, 144, 255, 0.05);
+     cursor: pointer;
+   }
+   
+   /* 医生列表项选中效果 */
+.doctor-item.selected {
+  background-color: rgba(24, 144, 255, 0.2);
+  border-left: 4px solid var(--primary-color);
+  font-weight: 600;
+}
+   
+   /* 加载动画 */
+   .loading-container {
+     display: flex;
+     justify-content: center;
+     align-items: center;
+     padding: 20px;
+     gap: 8px;
+     color: var(--primary-color);
+   }
+   
+   .loading-spinner {
+     width: 16px;
+     height: 16px;
+     border: 2px solid rgba(24, 144, 255, 0.2);
+     border-top-color: var(--primary-color);
+     border-radius: 50%;
+     animation: spin 0.8s linear infinite;
+   }
+   
+   @keyframes spin {
+     to { transform: rotate(360deg); }
+   }
+
+/* 左侧筛选区域 */
+.section {
+  margin-bottom: 24px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: 600;
+  margin-bottom: 12px;
+  color: #333;
+}
+
+.radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.radio-group label {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  cursor: pointer;
+}
+
+.doctor-list {
+  margin-top: 12px;
+  max-height: calc(100vh - 300px); /* 限制医生列表高度 */
+  overflow-y: auto; /* 当内容超出高度时显示滚动条 */
+}
+
+.doctor-item {
+  padding: 12px;
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  margin-bottom: 8px;
+}
+
+.doctor-item:hover {
+  background-color: #f0f7ff;
+}
+
+.doctor-item.selected {
+  background-color: #e6f2ff;
+  border-left: 4px solid var(--primary-color);
+}
+
+.doctor-name {
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.doctor-available {
+  font-size: 12px;
+  color: var(--status-unbooked);
+  font-weight: normal;
+}
+
+/* 右侧号源卡片网格布局 */
+.ticket-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 16px;
+  padding: 8px;
+}
+
+  /* 加载更多样式 */
+  .loading-more,
+  .no-more {
+    grid-column: 1 / -1;
+    text-align: center;
+    padding: 20px;
+    color: #999;
+    font-size: 14px;
+  }
+
+.empty-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 600px;
+  color: var(--text-tertiary);
+}
+
+.empty-text {
+  font-size: 16px;
+}
+
+.ticket-card {
+  background: white;
+  border-radius: 8px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(90, 141, 238, 0.08);
+  border: 1px solid #e8e8e8;
+  transition: all 0.3s ease;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  min-height: 160px;
+}
+
+.ticket-card:hover {
+  box-shadow: 0 4px 12px rgba(90, 141, 238, 0.12);
+  transform: translateY(-2px);
+  border-color: #1890ff;
+}
+
+.ticket-number {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background-color: #e6f7ff;
+  color: #1890ff;
+  font-size: 12px;
+  font-weight: 500;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ticket-time {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  margin: 8px 0;
+}
+
+.ticket-status {
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  text-align: center;
+  min-width: 60px;
+  margin-bottom: 8px;
+}
+
+.status-unbooked {
+  background-color: #e6f3ff;
+  color: #1890ff;
+}
+
+.status-locked {
+  background-color: #fff1f0;
+  color: #f5222d;
+}
+
+.status-booked {
+  background-color: #fff8e6;
+  color: #fa8c16;
+}
+
+.status-checked {
+  background-color: #f6ffed;
+  color: #52c41a;
+}
+
+.status-cancelled {
+  background-color: #fff1f0;
+  color: #ff4d4f;
+}
+
+.ticket-doctor {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+  text-align: center;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ticket-fee {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.ticket-type {
+  font-size: 12px;
+  color: #999;
+  margin-bottom: 12px;
+}
+
+.book-button {
+      padding: 4px 16px;
+      background-color: #1890ff;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      font-size: 12px;
+      cursor: pointer;
+      transition: all 0.3s ease;
+      align-self: center;
+    }
+
+    .book-button:hover:not(:disabled) {
+      background-color: #40a9ff;
+    }
+
+    .book-button:disabled {
+      background-color: #e6f7ff;
+      color: #91d5ff;
+      cursor: not-allowed;
+    }
+    
+    .cancel-button {
+      background-color: #F56C6C;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .cancel-button:hover {
+      background-color: #F78989;
+    }
+
+    .cancel-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+    
+    .check-in-button {
+      background-color: #67C23A;
+      color: white;
+      border: none;
+      border-radius: 4px;
+      padding: 4px 12px;
+      cursor: pointer;
+      font-size: 14px;
+      transition: background-color 0.3s;
+      margin-top: 8px;
+      align-self: center;
+    }
+
+    .check-in-button:hover {
+      background-color: #85ce61;
+    }
+
+    .check-in-button:disabled {
+      background-color: #C0C4CC;
+      cursor: not-allowed;
+    }
+
+/* 患者信息样式 */
+.ticket-patient {
+  margin-top: 8px;
+  padding: 4px;
+  background-color: rgba(24, 144, 255, 0.05);
+  border-radius: 4px;
+  font-size: 12px;
+  text-align: center;
+  color: #333;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .ticket-grid {
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 12px;
+  }
+  
+  .ticket-card {
+    padding: 12px;
+    min-height: 140px;
+  }
+  
+  .ticket-doctor {
+    font-size: 13px;
+  }
+}
+
+/* 弹窗样式 */
+.modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+
+.modal-content {
+  background-color: white;
+  border-radius: 8px;
+  width: 80%;
+  max-width: 800px;
+  max-height: 80vh;
+  overflow-y: auto;
+}
+
+.modal-header {
+  padding: 16px 20px;
+  border-bottom: 1px solid #e0e0e0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  color: #999;
+}
+
+.modal-body {
+  padding: 20px;
+}
+
+.patient-table-container {
+  margin-top: 20px;
+  overflow-x: auto;
+}
+
+.patient-table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+.patient-table th,
+.patient-table td {
+  padding: 12px;
+  text-align: left;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.patient-table th {
+  background-color: #f5f5f5;
+  font-weight: 600;
+}
+
+.patient-table tr:hover {
+  background-color: #fafafa;
+}
+
+.patient-table tr.selected {
+  background-color: #e6f2ff;
+}
+
+.select-btn {
+  padding: 4px 12px;
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 12px;
+}
+
+.modal-footer {
+  padding: 16px 20px;
+  border-top: 1px solid var(--border-color);
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
+
+/* 右键菜单样式 */
+.context-menu {
+  position: fixed;
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  z-index: 1001;
+}
+
+.menu-item {
+  padding: 8px 16px;
+  cursor: pointer;
+  font-size: 14px;
+  transition: background-color 0.2s;
+}
+
+.menu-item:hover {
+  background-color: #f5f5f5;
+}
+
+.context-menu-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.confirm-btn {
+  padding: 8px 20px;
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.cancel-btn {
+  padding: 8px 20px;
+  background-color: #f5f5f5;
+  color: #666;
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.loading-text {
+  display: flex;
+  align-items: center;
+}
+
+.search-btn:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+</style>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index bcd93999..96715d03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,291 @@
 {
-  "name": "his",
+  "name": "work",
   "lockfileVersion": 3,
   "requires": true,
-  "packages": {}
+  "packages": {
+    "": {
+      "dependencies": {
+        "axios": "^1.13.2"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
+    "node_modules/axios": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.13.2.tgz",
+      "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.4",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.11",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    }
+  }
 }
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..c6bf7266
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "axios": "^1.13.2"
+  }
+}
diff --git a/迁移记录-DB变更记录/202512301200add_table_order_main.sql b/迁移记录-DB变更记录/202512301200add_table_order_main.sql
new file mode 100644
index 00000000..a802518a
--- /dev/null
+++ b/迁移记录-DB变更记录/202512301200add_table_order_main.sql
@@ -0,0 +1,115 @@
+-- 创建序列
+CREATE SEQUENCE order_main_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+-- 创建订单主表
+CREATE TABLE "order_main" (
+    -- 主键字段
+    "id" int8 NOT NULL DEFAULT nextval('order_main_id_seq'::regclass),
+
+    -- 业务核心字段
+    "order_no" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,          -- 订单号
+    "patient_id" int8,                                                       -- 患者ID
+    "patient_name" varchar(50) COLLATE "pg_catalog"."default",                 -- 患者姓名
+    "medical_card" varchar(32) COLLATE "pg_catalog"."default",                  -- 就诊卡号
+    "phone" varchar(20) COLLATE "pg_catalog"."default",                       -- 手机号
+    "gender" int4,                                                           -- 性别（1-男，2-女）
+    "schedule_id" int8,                                                       -- 排班ID
+    "slot_id" int8,                                                           -- 号源ID
+    "department_id" int8,                                                      -- 科室ID
+    "department_name" varchar(100) COLLATE "pg_catalog"."default",              -- 科室名称
+    "doctor_id" int8,                                                          -- 医生ID
+    "doctor_name" varchar(50) COLLATE "pg_catalog"."default",                   -- 医生姓名
+    "reg_type" varchar(10) COLLATE "pg_catalog"."default",                     -- 号别（普通/专家）
+    "fee" numeric(10,2),                                                      -- 挂号费
+    "appointment_date" timestamptz(6),                                       -- 预约日期
+    "appointment_time" timestamptz(6),                                        -- 预约时间
+    "cancel_time" timestamptz(6),                                            -- 取消时间
+    "cancel_reason" varchar(200) COLLATE "pg_catalog"."default",                 -- 取消原因
+    "status" int4 NOT NULL DEFAULT 1,                                          -- 状态（1-预约中，2-已完成，3-已取消）
+    "pay_status" int4 NOT NULL DEFAULT 0,                                       -- 支付状态（0-未支付，1-已支付）
+    "version" int4 NOT NULL DEFAULT 0,                                          -- 版本号（乐观锁）
+
+    -- 继承HisBaseEntity的审计字段
+    "tenant_id" int8 NOT NULL,                                                 -- 租户ID
+    "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '0',  -- 删除标志（0-未删除，1-已删除）
+    "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '',  -- 创建人
+    "create_time" timestamptz(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,          -- 创建时间
+    "update_by" varchar(32) COLLATE "pg_catalog"."default",                     -- 更新人
+    "update_time" timestamptz(6),                                            -- 更新时间
+
+    -- 主键约束
+    CONSTRAINT "order_main_pkey" PRIMARY KEY ("id")
+);
+
+-- 设置表所有者（根据实际数据库用户修改，如果不存在postgres角色可注释掉此行）
+-- ALTER TABLE "order_main" OWNER TO "postgres";
+
+-- 表及字段注释
+COMMENT ON TABLE "order_main" IS '订单主表：存储门诊预约挂号订单信息';
+
+COMMENT ON COLUMN "order_main"."id" IS '主键ID';
+COMMENT ON COLUMN "order_main"."order_no" IS '订单号：唯一标识订单，系统自动生成';
+COMMENT ON COLUMN "order_main"."patient_id" IS '患者ID：关联adm_patient表';
+COMMENT ON COLUMN "order_main"."patient_name" IS '患者姓名：冗余字段，便于查询';
+COMMENT ON COLUMN "order_main"."medical_card" IS '就诊卡号：患者就诊卡编号';
+COMMENT ON COLUMN "order_main"."phone" IS '手机号：患者联系电话';
+COMMENT ON COLUMN "order_main"."gender" IS '性别：1-男，2-女';
+COMMENT ON COLUMN "order_main"."schedule_id" IS '排班ID：关联排班表';
+COMMENT ON COLUMN "order_main"."slot_id" IS '号源ID：关联clinical_ticket表';
+COMMENT ON COLUMN "order_main"."department_id" IS '科室ID：关联科室表';
+COMMENT ON COLUMN "order_main"."department_name" IS '科室名称：冗余字段，便于查询';
+COMMENT ON COLUMN "order_main"."doctor_id" IS '医生ID：关联医生表';
+COMMENT ON COLUMN "order_main"."doctor_name" IS '医生姓名：冗余字段，便于查询';
+COMMENT ON COLUMN "order_main"."reg_type" IS '号别：普通/专家';
+COMMENT ON COLUMN "order_main"."fee" IS '挂号费：挂号费用金额';
+COMMENT ON COLUMN "order_main"."appointment_date" IS '预约日期：患者预约的就诊日期';
+COMMENT ON COLUMN "order_main"."appointment_time" IS '预约时间：患者预约的具体时间';
+COMMENT ON COLUMN "order_main"."cancel_time" IS '取消时间：订单取消的时间';
+COMMENT ON COLUMN "order_main"."cancel_reason" IS '取消原因：订单取消的原因说明';
+COMMENT ON COLUMN "order_main"."status" IS '状态：1-预约中，2-已完成，3-已取消';
+COMMENT ON COLUMN "order_main"."pay_status" IS '支付状态：0-未支付，1-已支付';
+COMMENT ON COLUMN "order_main"."version" IS '版本号：乐观锁，防止并发冲突';
+COMMENT ON COLUMN "order_main"."tenant_id" IS '租户ID：多租户系统隔离字段';
+COMMENT ON COLUMN "order_main"."delete_flag" IS '删除标志：0-未删除，1-已删除';
+COMMENT ON COLUMN "order_main"."create_by" IS '创建人：存储创建者用户名';
+COMMENT ON COLUMN "order_main"."create_time" IS '创建时间：默认当前时间，带时区';
+COMMENT ON COLUMN "order_main"."update_by" IS '更新人：存储更新者用户名';
+COMMENT ON COLUMN "order_main"."update_time" IS '更新时间：带时区';
+
+-- 创建索引
+CREATE INDEX "idx_order_main_order_no" 
+    ON "order_main" ("order_no")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_patient_id" 
+    ON "order_main" ("patient_id")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_slot_id" 
+    ON "order_main" ("slot_id")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_department_id" 
+    ON "order_main" ("department_id")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_doctor_id" 
+    ON "order_main" ("doctor_id")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_status" 
+    ON "order_main" ("status")
+    WHERE "delete_flag" = '0';
+
+CREATE INDEX "idx_order_main_tenant_id" 
+    ON "order_main" ("tenant_id", "create_time")
+    WHERE "delete_flag" = '0';
+
+-- 向迁移历史表插入记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202512301200add_table_order_main', '1.0.0');
diff --git a/迁移记录-DB变更记录/202512301200verify_order_main.sql b/迁移记录-DB变更记录/202512301200verify_order_main.sql
new file mode 100644
index 00000000..05ef1519
--- /dev/null
+++ b/迁移记录-DB变更记录/202512301200verify_order_main.sql
@@ -0,0 +1,51 @@
+-- 验证order_main表是否创建成功
+
+-- 1. 查看表结构
+\d order_main;
+
+-- 2. 查看表注释
+SELECT 
+    obj_description('order_main'::regclass) AS table_comment;
+
+-- 3. 查看字段注释（使用pg_catalog.pg_description）
+SELECT 
+    a.attname AS column_name,
+    d.description AS column_comment
+FROM pg_attribute a
+LEFT JOIN pg_catalog.pg_description d 
+    ON d.objoid = a.attrelid 
+    AND d.objsubid = a.attnum
+WHERE a.attrelid = 'order_main'::regclass 
+    AND a.attnum > 0 
+    AND NOT a.attisdropped
+ORDER BY a.attnum;
+
+-- 4. 查看索引
+SELECT 
+    indexname AS index_name,
+    indexdef AS index_definition
+FROM pg_indexes 
+WHERE tablename = 'order_main';
+
+-- 5. 查看迁移历史
+SELECT * FROM __MigrationsHistory 
+WHERE MigrationId = '202512301200add_table_order_main';
+
+-- 6. 查看表的所有约束
+SELECT 
+    conname AS constraint_name,
+    contype AS constraint_type
+FROM pg_constraint 
+WHERE conrelid = 'order_main'::regclass;
+
+-- 7. 查看序列
+SELECT 
+    sequencename AS sequence_name,
+    last_value,
+    start_value,
+    increment_by
+FROM pg_sequences 
+WHERE sequencename = 'order_main_id_seq';
+
+-- 8. 统计表记录数
+SELECT COUNT(*) AS record_count FROM order_main;
diff --git a/迁移记录-DB变更记录/门诊预约测试数据使用指南.md b/迁移记录-DB变更记录/门诊预约测试数据使用指南.md
new file mode 100644
index 00000000..2cd6111a
--- /dev/null
+++ b/迁移记录-DB变更记录/门诊预约测试数据使用指南.md
@@ -0,0 +1,202 @@
+# 门诊预约挂号功能测试数据使用指南
+
+## 1. 准备工作
+
+### 1.1 数据库环境准备
+- 确保已安装并启动PostgreSQL数据库
+- 确保已创建`hisdev`模式（或根据实际情况修改脚本中的模式名）
+- 确保已创建相关表结构：
+  - clinical_ticket (号源表)
+  - adm_practitioner (医生表)
+  - adm_patient (患者表)
+  - cli_reservation_record (预约记录表)
+
+### 1.2 验证表结构
+执行以下查询验证核心表是否存在：
+```sql
+SELECT table_name FROM information_schema.tables WHERE table_schema = 'hisdev';
+```
+
+## 2. 执行测试数据脚本
+
+### 2.1 脚本位置
+`d:\work\门诊预约测试数据插入.sql`
+
+### 2.2 执行方式
+**方式一：通过pgAdmin执行**
+1. 打开pgAdmin，连接到数据库
+2. 选择`hisdev`模式
+3. 打开SQL编辑器，粘贴脚本内容
+4. 点击执行按钮（或按F5）
+
+**方式二：通过命令行执行**
+```bash
+psql -h localhost -U username -d database_name -f "d:\work\门诊预约测试数据插入.sql"
+```
+
+## 3. 测试数据说明
+
+### 3.1 号源数据 (clinical_ticket)
+
+#### 3.1.1 未预约状态的号源（用于测试正常预约流程）
+- 号源数量：10个普通号 + 5个专家号
+- 日期：当前系统日期
+- 医生：张三（内科）
+- 状态：`unbooked`
+
+#### 3.1.2 已预约状态的号源（用于测试取消预约流程）
+- 号源数量：2个
+- 日期：当前系统日期
+- 医生：张三（内科）
+- 状态：`booked`
+- 患者：患者A、患者B
+
+#### 3.1.3 已取号状态的号源（用于测试逆向用例）
+- 号源数量：1个
+- 日期：当前系统日期
+- 医生：张三（内科）
+- 状态：`checked`
+- 患者：患者C
+
+#### 3.1.4 明天日期的号源（用于测试日期选择功能）
+- 号源数量：10个普通号
+- 日期：当前系统日期 + 1天
+- 医生：王五（外科）
+- 状态：`unbooked`
+
+### 3.2 预约记录数据 (cli_reservation_record)
+- 记录数量：2条
+- 患者：患者A、患者B
+- 医生：张三
+
+## 4. 测试用例执行指南
+
+### 4.1 正向测试用例
+
+#### 4.1.1 号源日期选择器-默认值
+- **测试步骤**：
+  1. 打开门诊预约挂号界面
+  2. 检查号源日期选择器的默认值
+- **预期结果**：默认值为当前系统日期
+
+#### 4.1.2 状态筛选下拉框-默认值
+- **测试步骤**：
+  1. 打开门诊预约挂号界面
+  2. 检查状态筛选下拉框的默认值
+- **预期结果**：默认值为"未预约"
+
+#### 4.1.3 号源预约功能-正常流程
+- **测试步骤**：
+  1. 双击状态为"未预约"的号源卡片
+  2. 在弹出的患者选择弹窗中选择患者
+  3. 点击"确定"按钮
+- **预期结果**：卡片状态更新为"已预约"，显示患者信息
+- **可用测试数据**：当前日期的未预约号源（TICKET000001-TICKET000010）
+
+#### 4.1.4 取消预约功能-正常流程
+- **测试步骤**：
+  1. 右键状态为"已预约"的号源卡片
+  2. 选择"取消预约"选项
+  3. 在二次确认弹窗中点击"确认"按钮
+- **预期结果**：号源状态恢复为"未预约"，清除患者信息
+- **可用测试数据**：已预约号源（TICKET000011、TICKET000012）
+
+#### 4.1.5 医生搜索框-实时搜索
+- **测试步骤**：
+  1. 在左侧边栏的医生搜索框中输入医生姓名
+  2. 观察医生列表的实时更新
+- **预期结果**：医生列表根据输入内容实时筛选显示
+- **可用测试数据**：张三、王五
+
+#### 4.1.6 号源类型切换-联动过滤
+- **测试步骤**：
+  1. 在左侧边栏切换号源类型为"专家号"
+  2. 观察右侧号源卡片和左侧医生列表
+- **预期结果**：仅显示专家号的号源和医生
+- **可用测试数据**：专家号（TICKET000014-TICKET000018）
+
+### 4.2 逆向测试用例
+
+#### 4.2.1 号源预约功能-未选择患者
+- **测试步骤**：
+  1. 双击状态为"未预约"的号源卡片
+  2. 不选择患者直接点击"确定"按钮
+- **预期结果**：提示"请选择患者"
+
+#### 4.2.2 取消预约功能-已取号状态
+- **测试步骤**：
+  1. 右键状态为"已取号"的号源卡片
+- **预期结果**：右键菜单不显示"取消预约"选项
+- **可用测试数据**：已取号源（TICKET000013）
+
+#### 4.2.3 患者信息搜索框组-无效输入
+- **测试步骤**：
+  1. 在患者信息搜索框组中输入无效的姓名、就诊卡号或手机号
+  2. 点击查询按钮
+- **预期结果**：返回无结果或提示"未找到匹配的患者"
+- **可用测试数据**：输入不存在的姓名（如"测试患者"）、就诊卡号（如"PAT999"）或手机号（如"13999999999"）
+
+#### 4.2.4 日期选择器-无效日期
+- **测试步骤**：
+  1. 在号源日期选择器中输入无效日期（如过去日期或格式错误）
+  2. 尝试查询号源
+- **预期结果**：提示"请输入有效日期"
+
+#### 4.2.5 医生搜索框-无匹配结果
+- **测试步骤**：
+  1. 在医生搜索框中输入不存在的医生姓名
+  2. 观察医生列表
+- **预期结果**：显示"无匹配结果"或空列表
+- **可用测试数据**：输入不存在的医生姓名（如"李四"）
+
+## 5. 测试结果记录
+
+| 用例名 | 测试步骤 | 预期结果 | 实际结果 | 测试时间 | 测试人 |
+|-------|---------|---------|---------|---------|-------|
+| 号源日期选择器-默认值 | 1. 打开门诊预约挂号界面<br>2. 检查号源日期选择器的默认值 | 默认值为当前系统日期 | | | |
+| 状态筛选下拉框-默认值 | 1. 打开门诊预约挂号界面<br>2. 检查状态筛选下拉框的默认值 | 默认值为"未预约" | | | |
+| 号源预约功能-正常流程 | 1. 双击状态为"未预约"的号源卡片<br>2. 在弹出的患者选择弹窗中选择患者<br>3. 点击"确定"按钮 | 卡片状态更新为"已预约"，显示患者信息 | | | |
+| 取消预约功能-正常流程 | 1. 右键状态为"已预约"的号源卡片<br>2. 选择"取消预约"选项<br>3. 在二次确认弹窗中点击"确认"按钮 | 号源状态恢复为"未预约"，清除患者信息 | | | |
+| 医生搜索框-实时搜索 | 1. 在左侧边栏的医生搜索框中输入医生姓名<br>2. 观察医生列表的实时更新 | 医生列表根据输入内容实时筛选显示 | | | |
+| 号源类型切换-联动过滤 | 1. 在左侧边栏切换号源类型为"专家号"<br>2. 观察右侧号源卡片和左侧医生列表 | 仅显示专家号的号源和医生 | | | |
+| 号源预约功能-未选择患者 | 1. 双击状态为"未预约"的号源卡片<br>2. 不选择患者直接点击"确定"按钮 | 提示"请选择患者" | | | |
+| 取消预约功能-已取号状态 | 1. 右键状态为"已取号"的号源卡片 | 右键菜单不显示"取消预约"选项 | | | |
+| 患者信息搜索框组-无效输入 | 1. 在患者信息搜索框组中输入无效的姓名、就诊卡号或手机号<br>2. 点击查询按钮 | 返回无结果或提示"未找到匹配的患者" | | | |
+| 日期选择器-无效日期 | 1. 在号源日期选择器中输入无效日期（如过去日期或格式错误）<br>2. 尝试查询号源 | 提示"请输入有效日期" | | | |
+| 医生搜索框-无匹配结果 | 1. 在医生搜索框中输入不存在的医生姓名<br>2. 观察医生列表 | 显示"无匹配结果"或空列表 | | | |
+
+## 6. 注意事项
+
+1. **数据唯一性**：脚本使用条件判断避免重复插入数据
+2. **日期更新**：脚本中的日期会自动使用当前系统日期
+3. **依赖关系**：号源数据依赖于医生和患者的基础数据，请确保系统中已有相关记录
+4. **测试顺序**：建议先执行正向测试，再执行逆向测试
+5. **数据清理**：测试完成后，可使用以下SQL清理测试数据：
+   ```sql
+   DELETE FROM clinical_ticket WHERE bus_no LIKE 'TICKET%';
+   DELETE FROM cli_reservation_record WHERE patient_name IN ('患者A', '患者B');
+   ```
+
+## 7. 常见问题
+
+### 7.1 执行脚本时提示表不存在
+- 检查数据库连接是否正确
+- 检查是否已创建相关表结构
+- 检查模式名是否为`hisdev`
+
+### 7.2 测试数据不显示
+- 检查日期选择器是否选择了正确的日期
+- 检查状态筛选条件是否为"未预约"
+- 检查医生选择是否正确
+
+### 7.3 预约功能无法正常工作
+- 检查患者选择弹窗是否能正常加载患者数据
+- 检查网络连接是否正常
+- 检查浏览器控制台是否有错误信息
+
+---
+
+**版本：1.0**  
+**创建时间：2025-12-31**  
+**更新记录：**
+- 2025-12-31：初始版本，完成测试数据说明和测试指南
diff --git a/迁移记录-DB变更记录/门诊预约测试数据插入.sql b/迁移记录-DB变更记录/门诊预约测试数据插入.sql
new file mode 100644
index 00000000..a607d152
--- /dev/null
+++ b/迁移记录-DB变更记录/门诊预约测试数据插入.sql
@@ -0,0 +1,89 @@
+-- 门诊预约挂号功能测试数据插入脚本
+-- 执行前请确保已创建相关表结构
+
+-- 设置当前模式
+SET search_path TO hisdev;
+
+-- ====================================
+-- 说明：
+-- 1. 此脚本主要包含号源表(clinical_ticket)的测试数据
+-- 2. 其他相关表(医生、患者、科室等)请确保系统中已有基础数据
+-- 3. 如需要完整测试，建议先在系统中创建相应的医生和患者信息
+-- ====================================
+
+-- ====================================
+-- 注意：以下是可选的表结构验证
+-- 如果不确定表结构是否正确，请先执行这些查询
+-- ====================================
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'clinical_ticket';
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'adm_practitioner';
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'adm_patient';
+
+
+-- ====================================
+-- 5. 号源数据 (clinical_ticket)
+-- 包含不同状态的号源：未预约、已预约、已取号
+-- ====================================
+
+-- 获取当前日期和明天日期
+DO $$
+DECLARE
+    current_date DATE := CURRENT_DATE;
+    tomorrow_date DATE := CURRENT_DATE + INTERVAL '1 day';
+BEGIN
+    -- 当前日期号源
+    -- 未预约状态的号源（用于测试正常预约流程）
+    INSERT INTO clinical_ticket (bus_no, department, doctor, ticket_type, time, status, fee, appointment_date, appointment_time, department_id, doctor_id, create_time, tenant_id, delete_flag)
+    SELECT 
+        'TICKET' || lpad(i::text, 6, '0'),
+        '内科', '张三', '普通', '08:00-' || (7 + i) || ':50', 
+        'unbooked', '50', current_date, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'
+    FROM generate_series(1, 10) i
+    WHERE NOT EXISTS (SELECT 1 FROM clinical_ticket WHERE bus_no = 'TICKET' || lpad(i::text, 6, '0'));
+    
+    -- 已预约状态的号源（用于测试取消预约流程）
+    INSERT INTO clinical_ticket (bus_no, department, doctor, ticket_type, time, status, fee, patient_id, patient_name, medical_card, phone, appointment_date, appointment_time, department_id, doctor_id, create_time, tenant_id, delete_flag)
+    VALUES
+    ('TICKET000011', '内科', '张三', '普通', '09:00-09:50', 'booked', '50', 1, '患者A', 'PAT001', '13900139001', current_date, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'),
+    ('TICKET000012', '内科', '张三', '普通', '09:50-10:40', 'booked', '50', 2, '患者B', 'PAT002', '13900139002', current_date, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0');
+    
+    -- 已取号状态的号源（用于测试逆向用例：取消已取号的预约）
+    INSERT INTO clinical_ticket (bus_no, department, doctor, ticket_type, time, status, fee, patient_id, patient_name, medical_card, phone, appointment_date, appointment_time, department_id, doctor_id, create_time, tenant_id, delete_flag)
+    VALUES
+    ('TICKET000013', '内科', '张三', '普通', '10:40-11:30', 'checked', '50', 3, '患者C', 'PAT003', '13900139003', current_date, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0');
+    
+    -- 专家号源（用于测试号源类型切换功能）
+    INSERT INTO clinical_ticket (bus_no, department, doctor, ticket_type, time, status, fee, appointment_date, appointment_time, department_id, doctor_id, create_time, tenant_id, delete_flag)
+    VALUES
+    ('TICKET000014', '内科', '张三', '专家', '08:00-08:50', 'unbooked', '150', CURRENT_DATE, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'),
+    ('TICKET000015', '内科', '张三', '专家', '09:00-09:50', 'unbooked', '150', CURRENT_DATE, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'),
+    ('TICKET000016', '内科', '张三', '专家', '10:00-10:50', 'unbooked', '150', CURRENT_DATE, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'),
+    ('TICKET000017', '内科', '张三', '专家', '11:00-11:50', 'unbooked', '150', CURRENT_DATE, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0'),
+    ('TICKET000018', '内科', '张三', '专家', '14:00-14:50', 'unbooked', '150', CURRENT_DATE, CURRENT_TIMESTAMP, 1, 1, CURRENT_TIMESTAMP, 1, '0');
+    
+    -- 明天日期的号源（用于测试日期选择功能）
+    INSERT INTO clinical_ticket (bus_no, department, doctor, ticket_type, time, status, fee, appointment_date, appointment_time, department_id, doctor_id, create_time, tenant_id, delete_flag)
+    SELECT 
+        'TICKET' || lpad((20 + i)::text, 6, '0'),
+        '外科', '王五', '普通', '08:00-' || (7 + i) || ':50', 
+        'unbooked', '60', tomorrow_date, CURRENT_TIMESTAMP, 2, 3, CURRENT_TIMESTAMP, 1, '0'
+    FROM generate_series(1, 10) i
+    WHERE NOT EXISTS (SELECT 1 FROM clinical_ticket WHERE bus_no = 'TICKET' || lpad((20 + i)::text, 6, '0'));
+END $$;
+
+-- ==================================== 
+ -- 6. 预约记录数据 (cli_reservation_record) 
+ -- 用于测试预约历史查询 
+ -- ==================================== 
+ INSERT INTO cli_reservation_record (patient_name, patient_tel, chief_complaint, reservation_time, org_id, practitioner_id, tenant_id, create_time, create_by, update_time, update_by) 
+ VALUES 
+ ('患者A', '13900139001', '感冒发烧', CURRENT_TIMESTAMP, 1, 1, 1, CURRENT_TIMESTAMP, 'system', CURRENT_TIMESTAMP, 'system'), 
+ ('患者B', '13900139002', '腹痛', CURRENT_TIMESTAMP, 1, 1, 1, CURRENT_TIMESTAMP, 'system', CURRENT_TIMESTAMP, 'system');
+
+-- ====================================
+-- 数据插入完成提示
+-- ====================================
+SELECT '门诊预约测试数据插入完成！' AS message;
+SELECT '未预约号源数量：' || COUNT(*) FROM clinical_ticket WHERE status = 'unbooked';
+SELECT '已预约号源数量：' || COUNT(*) FROM clinical_ticket WHERE status = 'booked';
+SELECT '已取号号源数量：' || COUNT(*) FROM clinical_ticket WHERE status = 'checked';
\ No newline at end of file

From fbd7f0be787187c2dcdf321ec64240387db96f40 Mon Sep 17 00:00:00 2001
From: April <15215920+aprilry@user.noreply.gitee.com>
Date: Fri, 9 Jan 2026 11:47:39 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?=E5=B0=B1=E8=AF=8A=E5=8D=A1=E5=8F=B7=E6=97=A0=E6=B3=95=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E5=8C=BB=E8=AF=8A=E6=96=AD=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AE=BD=E5=BA=A6=E8=BF=87=E5=A4=A7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IPatientInformationService.java           |  4 ++--
 .../impl/PatientInformationServiceImpl.java   | 23 ++++++++++---------
 .../PatientInformationController.java         |  7 +++---
 .../components/patientAddDialog.vue           |  3 +++
 .../diagnosis/addDiagnosisDialog.vue          |  2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
index 537ce538..35427a57 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
@@ -45,9 +45,9 @@ public interface IPatientInformationService {
     /**
      * 添加病人信息
      *
-     * @param patientInfoDto 病人信息
+     * @param patientBaseInfoDto 病人信息
      */
-    R<?> addPatient(PatientBaseInfoDto patientInfoDto);
+    R<?> addPatient(PatientBaseInfoDto patientBaseInfoDto);
 
     /**
      * 更新患者手机号
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 1a4f8e5a..7b60f299 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
@@ -254,31 +254,32 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     /**
      * 添加病人信息
      *
-     * @param patientInfoDto 病人信息
+     * @param patientBaseInfoDto 病人信息
      */
     @Override
-    public R<?> addPatient(PatientBaseInfoDto patientInfoDto) {
+    public R<?> addPatient(PatientBaseInfoDto patientBaseInfoDto) {
+//        log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto);
         // 如果患者没有输入身份证号则根据年龄自动生成
-        String idCard = patientInfoDto.getIdCard();
+        String idCard = patientBaseInfoDto.getIdCard();
         if (idCard == null || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
-            if (patientInfoDto.getAge() != null) {
-                idCard = IdCardUtil.generateIdByAge(patientInfoDto.getAge());
-                patientInfoDto.setIdCard(idCard);
+            if (patientBaseInfoDto.getAge() != null) {
+                idCard = IdCardUtil.generateIdByAge(patientBaseInfoDto.getAge());
+                patientBaseInfoDto.setIdCard(idCard);
             }
         }
         // 身份证号是否存在
         List<Patient> idCardList
-                = patientService.list(new LambdaQueryWrapper<Patient>().eq(Patient::getIdCard, patientInfoDto.getIdCard()));
+                = patientService.list(new LambdaQueryWrapper<Patient>().eq(Patient::getIdCard, patientBaseInfoDto.getIdCard()));
         if (!idCardList.isEmpty()) {
-            throw new ServiceException("身份证号:" + patientInfoDto.getIdCard() + "已经存在");
+            throw new ServiceException("身份证号:" + patientBaseInfoDto.getIdCard() + "已经存在");
         }
 
         // 处理患者信息
-        Patient patient = this.handlePatientInfo(patientInfoDto);
+        Patient patient = this.handlePatientInfo(patientBaseInfoDto);
 
         // 新增患者身份子表信息
-        if (patientInfoDto.getPatientIdInfoList() != null) {
-            List<PatientIdInfoDto> patientIdInfoList = patientInfoDto.getPatientIdInfoList();
+        if (patientBaseInfoDto.getPatientIdInfoList() != null) {
+            List<PatientIdInfoDto> patientIdInfoList = patientBaseInfoDto.getPatientIdInfoList();
             PatientIdentifier patientIdentifier;
             for (PatientIdInfoDto patientIdInfoDto : patientIdInfoList) {
                 patientIdentifier = new PatientIdentifier();
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
index 7bf15450..ef9110a6 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
@@ -38,11 +38,12 @@ public class PatientInformationController {
     /**
      * 添加病人信息
      *
-     * @param patientInfoDto 病人信息
+     * @param patientBaseInfoDto 病人信息
      */
     @PostMapping("/patient-information")
-    public R<?> addPatient(@RequestBody PatientBaseInfoDto patientInfoDto) {
-        return patientInformationService.addPatient(patientInfoDto);
+    public R<?> addPatient(@RequestBody PatientBaseInfoDto patientBaseInfoDto) {
+//        log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto);
+        return patientInformationService.addPatient(patientBaseInfoDto);
     }
 
     /**
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
index 5d5b33b5..1ef037d7 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -1201,6 +1201,7 @@ function submitForm() {
   form.value.patientIdInfoList = [
     {
       typeCode: form.value.typeCode,
+      identifierNo: form.value.identifierNo,
     },
   ];
   if (form.value.idCard) {
@@ -1235,6 +1236,8 @@ function submitForm() {
           emits('submit', 'update');
         });
       } else {
+        // console.log('患者就诊卡号:', form.value.identifierNo)
+        // console.log('患者就诊信息:', form.value.patientIdInfoList)
         // 新增患者
         addPatient(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功');
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
index ca30e994..12a3bf73 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
@@ -2,7 +2,7 @@
   <el-dialog
     title="添加中医诊断"
     v-model="props.openAddDiagnosisDialog"
-    width="1500px"
+    width="1300px"
     append-to-body
     destroy-on-close
     @open="handleOpen"

From e37f6a70f9909dbaa68e61c6b7e55d13414dfa19 Mon Sep 17 00:00:00 2001
From: wangjian963 <15839750054@163.com>
Date: Fri, 9 Jan 2026 04:05:51 +0000
Subject: [PATCH 7/7] revert 28629ccd35b81c5416606c348670ad1fef220808

revert Merge remote-tracking branch 'origin/develop' into develop
---
 .../IOutpatientRegistrationAppService.java    |   9 -
 .../OutpatientRegistrationAppServiceImpl.java |  17 +-
 .../OutpatientRegistrationController.java     |  12 -
 .../dto/CurrentDayEncounterDto.java           |   5 -
 .../OutpatientRegistrationAppMapper.xml       |  18 +-
 openhis-ui-vue3/index.html                    |   4 +-
 openhis-ui-vue3/src/main.js                   |   1 -
 .../components/reprintDialog.vue              | 975 ++++--------------
 .../charge/outpatientregistration/index.vue   |  44 +-
 .../components/PackageSettings.vue            |   9 +-
 10 files changed, 235 insertions(+), 859 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
index 2f79e2a8..528c24d0 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
@@ -8,7 +8,6 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 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.paymentmanage.dto.CancelRegPaymentDto;
 
 import javax.servlet.http.HttpServletRequest;
@@ -86,12 +85,4 @@ public interface IOutpatientRegistrationAppService {
      */
     R<?> cancelRegister(Long encounterId);
 
-    /**
-     * 补打挂号
-     *
-     * @param reprintRegistrationDto 补打挂号信息
-     * @return 结果
-     */
-    R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto);
-
 }
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 e9ddc973..17fa7047 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
@@ -27,7 +27,6 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 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.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
@@ -284,7 +283,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<CurrentDayEncounterDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name", "identifier_no")),
+            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
             request);
 
         // 手动处理 statusEnum 参数（用于过滤退号记录）
@@ -331,18 +330,4 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return R.ok("已取消挂号");
     }
 
-    /**
-     * 补打挂号
-     * 补打挂号不需要修改数据库，只需要返回成功即可，前端已有所有需要的数据用于打印
-     *
-     * @param reprintRegistrationDto 补打挂号信息
-     * @return 结果
-     */
-    @Override
-    public R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto) {
-        // 补打挂号只是重新打印，不需要修改数据库
-        // 可以在这里添加日志记录补打操作
-        return R.ok(null, "补打挂号成功");
-    }
-
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
index 7446fe09..7733a7f9 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
@@ -8,7 +8,6 @@ import com.openhis.common.enums.PriorityLevel;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto;
-import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 import lombok.AllArgsConstructor;
@@ -152,15 +151,4 @@ public class OutpatientRegistrationController {
         return R.ok(iOutpatientRegistrationAppService.getCurrentDayEncounter(searchKey, pageNo, pageSize, request));
     }
 
-    /**
-     * 补打挂号
-     *
-     * @param reprintRegistrationDto 补打挂号信息
-     * @return 结果
-     */
-    @PostMapping(value = "/reprint")
-    public R<?> reprintRegistration(@RequestBody ReprintRegistrationDto reprintRegistrationDto) {
-        return iOutpatientRegistrationAppService.reprintRegistration(reprintRegistrationDto);
-    }
-
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
index d4eee1e3..6936eb87 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
@@ -136,9 +136,4 @@ public class CurrentDayEncounterDto {
      */
     private String phone;
 
-    /**
-     * 就诊卡号
-     */
-    private String identifierNo;
-
 }
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
index 910049ef..b34dea7b 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -65,8 +65,7 @@
                T9.charge_item_ids,
                T9.payment_id,
                T9.picture_url,
-               T9.birth_date,
-               T9.identifier_no
+               T9.birth_date
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
@@ -89,8 +88,7 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
-                        T8.birth_date      AS birth_date,
-                        T18.identifier_no  AS identifier_no
+                        T8.birth_date      AS birth_date
                  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'
@@ -120,18 +118,6 @@
                                     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'
-                             ) 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'
diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html
index e10c558e..639db44a 100644
--- a/openhis-ui-vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -13,7 +13,7 @@
     <meta name="author" content="OpenHIS Team" />
     
     <!-- 安全相关 meta 标签 -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://at.alicdn.com; style-src 'self' 'unsafe-inline' https://at.alicdn.com; img-src 'self' data: https: https://at.alicdn.com; font-src 'self' 'unsafe-inline' https://at.alicdn.com data:; connect-src 'self' https://at.alicdn.com http://localhost:* ws://localhost:* ws://127.0.0.1:*;">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://at.alicdn.com; style-src 'self' 'unsafe-inline' https://at.alicdn.com; img-src 'self' data: https: https://at.alicdn.com; font-src 'self' 'unsafe-inline' https://at.alicdn.com data:; connect-src 'self' https://at.alicdn.com http://localhost:* ws://localhost:*;">
     <meta name="referrer" content="no-referrer-when-downgrade">
     
     <!-- 移动端和 PWA 支持 -->
@@ -27,7 +27,7 @@
     <link rel="icon" type="image/png" href="/favicon/favicon-16x16.png" sizes="16x16">
     <link rel="icon" type="image/png" href="/favicon/favicon-32x32.png" sizes="32x32">
     <link rel="icon" type="image/png" href="/favicon/favicon-48x48.png" sizes="48x48">
-    <link rel="manifest" href="/favicon/faviconsite.webmanifest">
+    <link rel="manifest" href="/favicon/site.webmanifest">
     <link rel="icon" type="image/png" href="/favicon/android-chrome-192x192.png" sizes="192x192">
     <link rel="icon" type="image/png" href="/favicon/android-chrome-512x512.png" sizes="512x512">
     <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png">
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index 4b846eee..bf9466cd 100644
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -4,7 +4,6 @@ import Cookies from 'js-cookie';
 
 // 导入 hiprint 并挂载到全局 window 对象
 import {hiprint} from 'vue-plugin-hiprint';
-
 import ElementPlus, {ElDialog, ElMessage} from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
 import 'element-plus/dist/index.css';
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
index 88461f47..529aa9b2 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/reprintDialog.vue
@@ -1,241 +1,133 @@
 <template>
-  <el-dialog 
-    title="补打挂号单凭证" 
-    v-model="dialogVisible" 
-    width="900px" 
-    append-to-body 
-    destroy-on-close
-    :close-on-click-modal="false"
-  >
-    <div v-loading="loading" style="background-color: #ffffff; padding: 20px; min-height: 400px;">
-      <!-- 标题区域 -->
-      <div style="text-align: center; margin-bottom: 20px;">
-        <h2 style="color: #ff0000; font-size: 24px; font-weight: bold; margin: 0 0 10px 0;">挂号单重打</h2>
-        <p style="color: #ff0000; font-size: 14px; margin: 0;">补打挂号单将作废原有的挂号单据并生成新的挂号单据</p>
-      </div>
+  <el-dialog title="补打挂号" v-model="dialogVisible" width="900px" append-to-body destroy-on-close>
+    <div v-loading="loading">
+      <!-- 搜索区域 -->
+      <el-form :model="searchForm" :inline="true" style="margin-bottom: 20px">
+        <el-form-item label="就诊卡号：">
+          <el-input
+            v-model="searchForm.cardNo"
+            placeholder="请输入就诊卡号"
+            style="width: 240px"
+            clearable
+            @keyup.enter="handleSearch"
+          >
+            <template #append>
+              <el-button icon="Search" @click="handleSearch" />
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-form>
 
-      <!-- 表单区域 -->
-      <el-form :model="form" ref="reprintFormRef" label-width="120px" style="background-color: #ffffff; padding: 20px; border-radius: 4px;">
-        <el-row :gutter="30">
-          <!-- 左列 -->
+      <!-- 挂号记录列表 -->
+      <el-table
+        v-if="registrationList.length > 0"
+        :data="registrationList"
+        border
+        max-height="300"
+        highlight-current-row
+        @row-click="handleRowClick"
+        style="margin-bottom: 20px"
+      >
+        <el-table-column type="index" label="序号" width="60" align="center" />
+        <el-table-column label="患者姓名" prop="patientName" width="120" align="center" />
+        <el-table-column label="就诊卡号" prop="identifierNo" width="150" align="center">
+          <template #default="scope">
+            <!-- 优化就诊卡号显示，尝试多种可能的字段 -->
+            {{ getCardNoDisplay(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="就诊科室" prop="organizationName" align="center" />
+        <el-table-column label="医生" prop="practitionerName" width="120" align="center" />
+        <el-table-column label="挂号费" prop="price" width="100" align="center">
+          <template #default="scope">
+            {{ (scope.row.price || scope.row.registrationFee) ? parseFloat(scope.row.price || scope.row.registrationFee).toFixed(2) + ' 元' : '0.00 元' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="诊疗费" prop="activityPrice" width="100" align="center">
+          <template #default="scope">
+            {{ (scope.row.activityPrice || scope.row.diagnosisFee) ? parseFloat(scope.row.activityPrice || scope.row.diagnosisFee).toFixed(2) + ' 元' : '0.00 元' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总金额" prop="totalPrice" width="100" align="center">
+          <template #default="scope">
+            {{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) + ' 元' : '0.00 元' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="挂号时间" prop="registerTime" width="180" align="center">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.registerTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-empty v-if="!loading && registrationList.length === 0 && hasSearched" description="未找到挂号记录" />
+
+      <!-- 补打挂号表单 -->
+      <el-divider>补打信息</el-divider>
+      <el-form :model="form" :rules="rules" ref="reprintFormRef" label-width="120px">
+        <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="病人姓名：" prop="name">
-              <el-input v-model="form.name" placeholder="病人姓名" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="医生姓名：" prop="practitionerName">
-              <el-input v-model="form.practitionerName" placeholder="医生姓名" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="诊疗费：" prop="activityPrice">
-              <el-input v-model="form.activityPrice" placeholder="诊疗费" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="流水号：" prop="serialNo">
-              <el-input v-model="form.serialNo" placeholder="流水号" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="合计：" prop="totalPrice">
-              <el-input v-model="form.totalPrice" placeholder="合计" :disabled="true" />
+            <el-form-item label="就诊卡号：" prop="cardNo">
+              <el-input v-model="form.cardNo" placeholder="就诊卡号" :disabled="true" />
             </el-form-item>
           </el-col>
-          
-          <!-- 右列 -->
           <el-col :span="12">
-            <el-form-item label="挂号科室：" prop="organizationName">
-              <el-input v-model="form.organizationName" placeholder="挂号科室" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="挂号费：" prop="price">
-              <el-input v-model="form.price" placeholder="挂号费" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="病历费：" prop="medicalRecordFee">
-              <el-input v-model="form.medicalRecordFee" placeholder="病历费" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="打印时间：" prop="printTime">
-              <el-input v-model="form.printTime" placeholder="打印时间" :disabled="true" />
+            <el-form-item label="姓名：" prop="name">
+              <el-input v-model="form.name" placeholder="姓名" :disabled="true" />
             </el-form-item>
           </el-col>
         </el-row>
-        
-        <!-- 跨两列的字段 -->
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="预约/挂号时间：" prop="visitTime">
-              <el-input v-model="form.visitTime" placeholder="预约/挂号时间" :disabled="true" />
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="就诊科室：" prop="organizationName">
+              <el-input v-model="form.organizationName" placeholder="就诊科室" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医生：" prop="practitionerName">
+              <el-input v-model="form.practitionerName" placeholder="医生" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="挂号费：" prop="price">
+              <el-input v-model="form.price" placeholder="挂号费" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="诊疗费：" prop="activityPrice">
+              <el-input v-model="form.activityPrice" placeholder="诊疗费" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总金额：" prop="totalPrice">
+              <el-input v-model="form.totalPrice" placeholder="总金额" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="就诊时间：" prop="visitTime">
+              <el-date-picker
+                v-model="form.visitTime"
+                type="datetime"
+                placeholder="就诊时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                style="width: 100%"
+                :disabled="true"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-
-      <!-- 底部搜索和操作区域 -->
-      <div style="margin-top: 20px; padding: 15px; background-color: #ffffff; border-radius: 4px;">
-        <el-form :inline="true" style="margin: 0;">
-          <el-form-item label="就诊卡号：" style="margin-bottom: 0;">
-            <el-input
-              v-model="searchForm.cardNo"
-              placeholder="请输入就诊卡号检索条"
-              style="width: 300px; margin-right: 10px;"
-              clearable
-              @keyup.enter="handleSearch"
-            />
-            <el-button type="primary" @click="handleSearch" :loading="loading">确认(O)</el-button>
-            <el-button @click="handleCancel">取消(C)</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
     </div>
-
-    <!-- 挂号记录选择对话框 -->
-    <el-dialog
-      title="挂号记录选择"
-      v-model="selectDialogVisible"
-      width="800px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-table
-        :data="recordList"
-        highlight-current-row
-        @current-change="handleRecordSelect"
-        style="width: 100%"
-        max-height="400"
-      >
-        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="挂号时间" prop="registerTime" width="180" align="center">
-          <template #default="scope">
-            {{ scope.row.registerTime ? parseTime(scope.row.registerTime, '{y}.{m}.{d} {h}时{i}分') : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="挂号科室" prop="organizationName" align="center" />
-        <el-table-column label="医生姓名" prop="practitionerName" align="center" />
-        <el-table-column label="流水号" prop="encounterNo" align="center">
-          <template #default="scope">
-            {{ scope.row.encounterNo || scope.row.visitNo || scope.row.serialNo || '-' }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="selectDialogVisible = false">取消(C)</el-button>
-          <el-button type="primary" @click="handleConfirmSelect" :disabled="!selectedRecord">确认(O)</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 打印预览对话框 -->
-    <el-dialog
-      title="打印预览"
-      v-model="printPreviewVisible"
-      width="600px"
-      append-to-body
-      :close-on-click-modal="false"
-      class="print-preview-dialog"
-    >
-      <div id="print-content" class="print-content">
-        <!-- 打印内容 -->
-        <div class="print-header">
-          <div class="reprint-label-left">补打</div>
-          <div class="header-content">
-            <div class="document-title">门诊预约挂号凭条</div>
-            <div class="print-time">打印时间: {{ form.printTime }}</div>
-          </div>
-        </div>
-        
-        <div class="print-section">
-          <div class="section-title">患者基本信息</div>
-          <div class="info-row">
-            <span class="label">患者姓名:</span>
-            <span class="value">{{ form.name || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">门诊号:</span>
-            <span class="value">{{ form.serialNo || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">就诊卡号:</span>
-            <span class="value">{{ form.cardNo || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">身份证号:</span>
-            <span class="value">{{ form.idCard || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">联系电话:</span>
-            <span class="value">{{ form.phone || '-' }}</span>
-          </div>
-        </div>
-
-        <div class="print-section">
-          <div class="section-title">预约详情</div>
-          <div class="info-row">
-            <span class="label">就诊科室:</span>
-            <span class="value">{{ form.organizationName || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">医生姓名:</span>
-            <span class="value">{{ form.practitionerName || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">预约时间:</span>
-            <span class="value">{{ form.visitTime || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">就诊地点:</span>
-            <span class="value">{{ form.visitLocation || '-' }}</span>
-          </div>
-          <div class="info-row">
-            <span class="label">预约状态:</span>
-            <span class="value">{{ form.statusText || '-' }}</span>
-          </div>
-        </div>
-
-        <div class="print-section">
-          <div class="section-title">费用信息</div>
-          <table class="fee-table">
-            <thead>
-              <tr>
-                <th>项目</th>
-                <th>数量</th>
-                <th>单价</th>
-                <th>金额</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>挂号费</td>
-                <td>1</td>
-                <td>¥{{ parseFloat(form.price || 0).toFixed(2) }}</td>
-                <td>¥{{ parseFloat(form.price || 0).toFixed(2) }}</td>
-              </tr>
-              <tr v-if="parseFloat(form.activityPrice || 0) > 0">
-                <td>诊疗费</td>
-                <td>1</td>
-                <td>¥{{ parseFloat(form.activityPrice || 0).toFixed(2) }}</td>
-                <td>¥{{ parseFloat(form.activityPrice || 0).toFixed(2) }}</td>
-              </tr>
-              <tr v-if="parseFloat(form.medicalRecordFee || 0) > 0">
-                <td>病历费</td>
-                <td>1</td>
-                <td>¥{{ parseFloat(form.medicalRecordFee || 0).toFixed(2) }}</td>
-                <td>¥{{ parseFloat(form.medicalRecordFee || 0).toFixed(2) }}</td>
-              </tr>
-            </tbody>
-            <tfoot>
-              <tr>
-                <td colspan="3" class="total-label">合计:</td>
-                <td class="total-value">¥{{ parseFloat(form.totalPrice || 0).toFixed(2) }}</td>
-              </tr>
-            </tfoot>
-          </table>
-        </div>
-
-        <div class="print-footer">
-          <div class="reminder">温馨提示: 请妥善保管此凭条，就诊时请携带。</div>
-        </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleSubmit" :disabled="loading || !form.cardNo">确 定</el-button>
+        <el-button @click="handleCancel" :disabled="loading">取 消</el-button>
       </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="printPreviewVisible = false">关闭</el-button>
-          <el-button type="primary" @click="handleBrowserPrint">打印</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    </template>
   </el-dialog>
 </template>
 
@@ -258,12 +150,9 @@ const emit = defineEmits(['close']);
 
 const dialogVisible = ref(false);
 const loading = ref(false);
+const hasSearched = ref(false);
+const registrationList = ref([]);
 const reprintFormRef = ref(null);
-const selectDialogVisible = ref(false);
-const recordList = ref([]);
-const selectedRecord = ref(null);
-const currentRecord = ref(null); // 保存当前选择的记录，用于打印
-const printPreviewVisible = ref(false); // 打印预览对话框显示状态
 
 const searchForm = reactive({
   cardNo: '',
@@ -272,19 +161,12 @@ const searchForm = reactive({
 const form = reactive({
   cardNo: '',
   name: '',
-  idCard: '',
-  phone: '',
   organizationName: '',
   practitionerName: '',
   price: '',
   activityPrice: '',
-  medicalRecordFee: '',
-  serialNo: '',
   totalPrice: '',
   visitTime: '',
-  visitLocation: '',
-  statusText: '',
-  printTime: '',
   encounterId: '',
 });
 
@@ -315,7 +197,34 @@ watch(dialogVisible, (newVal) => {
   }
 });
 
-// 搜索挂号记录并确认补打
+// 获取就诊卡号用于显示
+function getCardNoDisplay(row) {
+  // 调试信息，打印所有可能的卡号字段
+  console.log('解析卡号字段:', {
+    identifierNo: row.identifierNo,
+    cardNo: row.cardNo,
+    patientId: row.patientId,
+    encounterNo: row.encounterNo,
+    visitNo: row.visitNo,
+    patient: row.patient ? {
+      identifierNo: row.patient.identifierNo,
+      cardNo: row.patient.cardNo
+    } : null
+  });
+  
+  // 尝试所有可能的卡号字段
+  const cardNo = 
+    row.identifierNo || 
+    row.cardNo || 
+    (row.patient && (row.patient.identifierNo || row.patient.cardNo)) ||
+    row.encounterNo ||
+    row.visitNo ||
+    '-';
+  
+  return cardNo;
+}
+
+// 搜索挂号记录
 async function handleSearch() {
   if (!searchForm.cardNo) {
     proxy.$modal.msgWarning('请输入就诊卡号');
@@ -323,9 +232,11 @@ async function handleSearch() {
   }
   
   loading.value = true;
+  hasSearched.value = true;
+  registrationList.value = [];
   
   try {
-    // 使用就诊卡号作为searchKey查询
+    // 简化搜索逻辑，直接使用就诊卡号作为searchKey查询
     const endDate = new Date();
     const startDate = new Date();
     startDate.setFullYear(startDate.getFullYear() - 1);
@@ -335,173 +246,71 @@ async function handleSearch() {
       pageSize: 100,
       registerTimeSTime: formatDateStr(startDate, 'YYYY-MM-DD') + ' 00:00:00',
       registerTimeETime: formatDateStr(endDate, 'YYYY-MM-DD') + ' 23:59:59',
-      searchKey: searchForm.cardNo
+      searchKey: searchForm.cardNo // 直接使用就诊卡号作为搜索关键字
     };
     
+    console.log('搜索参数:', queryParams);
+    
     // 调用API查询挂号记录
     const response = await getOutpatientRegistrationCurrent(queryParams);
     
     if (response.code === 200) {
       let records = response.data.records || response.data || [];
       
+      console.log('查询到的挂号记录数量:', records.length);
+      
+      // 记录原始数据用于调试
       if (records.length > 0) {
-        if (records.length === 1) {
-          // 只有一条记录，直接使用
-          const row = records[0];
-          currentRecord.value = row; // 保存记录用于打印
-          fillForm(row);
-          await handleSubmit();
-        } else {
-          // 多条记录，显示选择对话框
-          recordList.value = records;
-          selectedRecord.value = records[0]; // 默认选择第一条
-          selectDialogVisible.value = true;
-          loading.value = false;
-        }
-      } else {
+        console.log('查询到的记录详情:', records.map(r => ({
+          id: r.id || r.encounterId,
+          identifierNo: r.identifierNo,
+          cardNo: r.cardNo,
+          patientName: r.patientName || r.name,
+          patient: r.patient
+        })));
+      }
+      
+      // 显示所有查询到的记录，不进行严格过滤
+      registrationList.value = records;
+      
+      if (records.length === 0) {
         proxy.$modal.msgWarning('未查询到相关挂号记录，请检查就诊卡号是否正确');
-        resetForm();
-        loading.value = false;
       }
     } else {
       proxy.$modal.msgWarning('查询失败: ' + (response.msg || '接口返回异常'));
-      resetForm();
-      loading.value = false;
     }
   } catch (error) {
     console.error('查询挂号记录异常:', error);
     proxy.$modal.msgError('查询出错: ' + (error.message || '网络异常'));
-    resetForm();
+  } finally {
     loading.value = false;
   }
 }
 
-// 填充表单
-function fillForm(row) {
-  console.log('fillForm row:', row); // 调试日志
+// 点击表格行，自动填充表单
+function handleRowClick(row) {
+  console.log('点击的记录:', row);
   
-  // 就诊卡号 - 从 identifierNo 字段获取
-  form.cardNo = row.identifierNo || row.cardNo || '';
+  // 使用getCardNoDisplay函数获取就诊卡号，确保与表格显示一致
+  const cardNo = getCardNoDisplay(row);
+  form.cardNo = cardNo !== '-' ? cardNo : '';
   
-  // 病人姓名 - 从 patientName 字段获取
-  form.name = row.patientName || row.name || '';
-  
-  // 身份证号 - 从 idCard 字段获取，需要脱敏处理
-  let idCard = row.idCard || '';
-  if (idCard && idCard.length >= 10) {
-    // 只显示前6位和后4位，中间用*代替
-    const prefix = idCard.substring(0, 6);
-    const suffix = idCard.substring(idCard.length - 4);
-    const stars = '*'.repeat(Math.max(0, idCard.length - 10));
-    form.idCard = prefix + stars + suffix;
-  } else if (idCard) {
-    // 如果身份证号长度不足10位，只显示部分并用*代替
-    if (idCard.length >= 6) {
-      const prefix = idCard.substring(0, 3);
-      const suffix = idCard.substring(idCard.length - 1);
-      form.idCard = prefix + '*'.repeat(idCard.length - 4) + suffix;
-    } else {
-      form.idCard = idCard;
-    }
-  } else {
-    form.idCard = '';
-  }
-  
-  // 联系电话 - 从 phone 字段获取，需要脱敏处理
-  let phone = row.phone || '';
-  if (phone && phone.length >= 7) {
-    // 只显示前3位和后4位，中间用*代替
-    const prefix = phone.substring(0, 3);
-    const suffix = phone.substring(phone.length - 4);
-    form.phone = prefix + '****' + suffix;
-  } else if (phone) {
-    // 如果手机号长度不足7位，部分脱敏
-    if (phone.length >= 4) {
-      const prefix = phone.substring(0, 2);
-      const suffix = phone.substring(phone.length - 2);
-      form.phone = prefix + '**' + suffix;
-    } else {
-      form.phone = phone;
-    }
-  } else {
-    form.phone = '';
-  }
-  
-  // 挂号科室 - 从 organizationName 字段获取
+  // 其他表单字段填充
+  form.name = row.patientName || row.name || (row.patient ? row.patient.name : '') || '';
   form.organizationName = row.organizationName || '';
-  
-  // 医生姓名 - 从 practitionerName 字段获取
   form.practitionerName = row.practitionerName || '';
   
-  // 挂号费 - 如果没有单独的 price，将 totalPrice 作为挂号费
-  // 实际系统中，可能需要查询更详细的费用明细
-  form.price = row.price ? parseFloat(row.price).toFixed(2) : 
-               (row.totalPrice ? parseFloat(row.totalPrice).toFixed(2) : '0.00');
+  // 价格相关字段
+  form.price = row.price ? parseFloat(row.price).toFixed(2) : (row.registrationFee ? parseFloat(row.registrationFee).toFixed(2) : '0.00');
+  form.activityPrice = row.activityPrice ? parseFloat(row.activityPrice).toFixed(2) : (row.diagnosisFee ? parseFloat(row.diagnosisFee).toFixed(2) : '0.00');
+  form.totalPrice = row.totalPrice ? parseFloat(row.totalPrice).toFixed(2) : '0.00';
   
-  // 诊疗费 - API 未返回，暂时设为 0.00
-  form.activityPrice = row.activityPrice ? parseFloat(row.activityPrice).toFixed(2) : '0.00';
-  
-  // 病历费 - API 未返回，暂时设为 0.00
-  form.medicalRecordFee = row.medicalRecordFee ? parseFloat(row.medicalRecordFee).toFixed(2) : '0.00';
-  
-  // 流水号 - 使用 encounterId 的后3位，如果为空则生成001-999的序列号
-  let serialNo = '';
-  if (row.encounterId) {
-    // 使用 encounterId 的后3位作为流水号
-    const idStr = String(row.encounterId);
-    const lastThree = idStr.slice(-3);
-    const num = parseInt(lastThree) || 0;
-    serialNo = String((num % 999) + 1).padStart(3, '0');
-  } else {
-    // 如果 encounterId 为空，生成一个001-999的序列号
-    const timestamp = Date.now();
-    const serial = (timestamp % 999) + 1;
-    serialNo = String(serial).padStart(3, '0');
-  }
-  form.serialNo = serialNo;
-  
-  // 合计 - 优先使用 totalPrice，否则计算各项费用之和
-  if (row.totalPrice) {
-    form.totalPrice = parseFloat(row.totalPrice).toFixed(2);
-  } else {
-    const total = parseFloat(form.price || 0) + parseFloat(form.activityPrice || 0) + parseFloat(form.medicalRecordFee || 0);
-    form.totalPrice = total.toFixed(2);
-  }
-  
-  // 预约/挂号时间 - 从 registerTime 字段获取
-  if (row.registerTime) {
-    form.visitTime = parseTime(row.registerTime, '{y}-{m}-{d} {h}:{i}:{s}');
-  } else {
-    form.visitTime = formatDateTime(new Date());
-  }
-  
-  // 就诊地点 - 暂时设为空，后续可根据实际需求填充
-  form.visitLocation = row.visitLocation || row.locationName || '';
-  
-  // 预约状态 - 从 statusEnum_enumText 字段获取，如果没有则根据 statusEnum 判断
-  if (row.statusEnum_enumText) {
-    form.statusText = row.statusEnum_enumText;
-  } else if (row.statusEnum !== undefined) {
-    // 根据 statusEnum 判断状态
-    // 状态枚举可能需要根据实际情况调整
-    const statusMap = {
-      1: '已预约',
-      2: '已完成',
-      3: '已取消',
-      4: '进行中'
-    };
-    form.statusText = statusMap[row.statusEnum] || '已预约';
-  } else {
-    form.statusText = '已预约';
-  }
-  
-  // 打印时间（当前时间）
-  form.printTime = formatDateTime(new Date());
-  
-  // 保存encounterId用于提交 - 注意字段名是 encounterId
+  // 就诊时间设置为当前时间
+  const now = new Date();
+  form.visitTime = formatDateTime(now);
   form.encounterId = row.encounterId || row.id || '';
   
-  console.log('fillForm form:', form); // 调试日志
+  console.log('填充的表单数据:', form);
 }
 
 // 格式化日期时间
@@ -516,62 +325,43 @@ function formatDateTime(date) {
 }
 
 // 提交补打挂号
-async function handleSubmit() {
-  if (!form.encounterId) {
-    proxy.$modal.msgWarning('请先搜索并选择挂号记录');
-    loading.value = false;
-    return;
-  }
-  
-  try {
-    // 如果 reprintFormRef 不存在，跳过验证
-    let valid = true;
-    if (reprintFormRef.value) {
-      valid = await reprintFormRef.value.validate().catch(() => false);
+function handleSubmit() {
+  reprintFormRef.value.validate((valid) => {
+    if (valid) {
+      loading.value = true;
+      const submitData = {
+        encounterId: form.encounterId,
+        cardNo: form.cardNo,
+        name: form.name,
+        organizationName: form.organizationName,
+        practitionerName: form.practitionerName,
+        price: parseFloat(form.price),
+        activityPrice: parseFloat(form.activityPrice),
+        totalPrice: parseFloat(form.totalPrice),
+        visitTime: form.visitTime,
+      };
+      reprintRegistration(submitData)
+        .then((res) => {
+          if (res.code === 200) {
+            proxy.$modal.msgSuccess('补打挂号成功');
+            emit('close', 'success');
+            dialogVisible.value = false;
+          } else {
+            proxy.$modal.msgError(res.msg || '补打挂号失败');
+          }
+        })
+        .catch((error) => {
+          console.error('补打挂号失败:', error);
+          proxy.$modal.msgError('补打挂号失败');
+        })
+        .finally(() => {
+          loading.value = false;
+        });
     }
-    if (!valid) {
-      loading.value = false;
-      return;
-    }
-    
-    // 在提交前，验证表单数据是否已正确填充
-    console.log('handleSubmit form before submit:', form); // 调试日志
-    
-    const submitData = {
-      encounterId: form.encounterId,
-      cardNo: form.cardNo,
-      name: form.name,
-      organizationName: form.organizationName,
-      practitionerName: form.practitionerName,
-      price: parseFloat(form.price) || 0,
-      activityPrice: parseFloat(form.activityPrice) || 0,
-      medicalRecordFee: parseFloat(form.medicalRecordFee || 0),
-      totalPrice: parseFloat(form.totalPrice) || 0,
-      visitTime: form.visitTime,
-    };
-    
-    console.log('handleSubmit submitData:', submitData); // 调试日志
-    
-    const res = await reprintRegistration(submitData);
-    if (res.code === 200) {
-      proxy.$modal.msgSuccess('补打挂号成功');
-      
-      // 不关闭补打对话框，直接显示打印预览
-      // 这样可以确保 form 数据不会丢失
-      loading.value = false;
-      showPrintPreview();
-    } else {
-      proxy.$modal.msgError(res.msg || '补打挂号失败');
-      loading.value = false;
-    }
-  } catch (error) {
-    console.error('补打挂号失败:', error);
-    proxy.$modal.msgError('补打挂号失败: ' + (error.message || '未知错误'));
-    loading.value = false;
-  }
+  });
 }
 
-// 取消（实际执行提交操作，因为确认按钮触发搜索）
+// 取消
 function handleCancel() {
   dialogVisible.value = false;
 }
@@ -581,19 +371,12 @@ function resetForm() {
   Object.assign(form, {
     cardNo: '',
     name: '',
-    idCard: '',
-    phone: '',
     organizationName: '',
     practitionerName: '',
     price: '',
     activityPrice: '',
-    medicalRecordFee: '',
-    serialNo: '',
     totalPrice: '',
     visitTime: '',
-    visitLocation: '',
-    statusText: '',
-    printTime: '',
     encounterId: '',
   });
   if (reprintFormRef.value) {
@@ -604,328 +387,14 @@ function resetForm() {
 // 重置搜索
 function resetSearch() {
   searchForm.cardNo = '';
+  registrationList.value = [];
+  hasSearched.value = false;
 }
-
-// 显示打印预览
-function showPrintPreview() {
-  // 直接使用浏览器打印预览，避免 hiprint 连接错误
-  // 因为 hiprint 需要本地服务运行，如果服务未运行会导致连接失败
-  // 确保 loading 已关闭
-  loading.value = false;
-  
-  // 验证表单数据是否已正确填充
-  console.log('showPrintPreview form:', form); // 调试日志
-  console.log('showPrintPreview currentRecord:', currentRecord.value); // 调试日志
-  
-  // 如果 form 的关键字段为空，尝试从 currentRecord 重新填充
-  if (!form.name && currentRecord.value) {
-    console.log('重新填充表单数据...');
-    fillForm(currentRecord.value);
-  }
-  
-  // 显示打印预览对话框
-  printPreviewVisible.value = true;
-}
-
-// 浏览器打印
-function handleBrowserPrint() {
-  const printContent = document.getElementById('print-content');
-  if (!printContent) {
-    proxy.$modal.msgError('打印内容不存在');
-    return;
-  }
-  
-  // 创建新窗口用于打印
-  const printWindow = window.open('', '_blank');
-  if (!printWindow) {
-    proxy.$modal.msgError('无法打开打印窗口，请检查浏览器弹窗设置');
-    return;
-  }
-  
-  // 写入打印内容
-  printWindow.document.write(`
-    <!DOCTYPE html>
-    <html>
-    <head>
-      <meta charset="UTF-8">
-      <title>门诊预约挂号凭条</title>
-      <style>
-        body {
-          font-family: Arial, sans-serif;
-          padding: 20px;
-          margin: 0;
-        }
-        .print-header {
-          margin-bottom: 20px;
-          position: relative;
-        }
-        .reprint-label-left {
-          position: absolute;
-          top: 0;
-          left: 0;
-          color: red;
-          font-size: 16px;
-          font-weight: bold;
-        }
-        .header-content {
-          text-align: center;
-        }
-        .document-title {
-          font-size: 16px;
-          font-weight: bold;
-          margin-bottom: 10px;
-        }
-        .print-time {
-          font-size: 12px;
-          color: #666;
-          text-align: right;
-        }
-        .print-section {
-          margin-bottom: 20px;
-        }
-        .section-title {
-          font-size: 14px;
-          font-weight: bold;
-          margin-bottom: 10px;
-          border-bottom: 1px solid #ddd;
-          padding-bottom: 5px;
-        }
-        .info-row {
-          margin-bottom: 8px;
-          font-size: 13px;
-        }
-        .label {
-          display: inline-block;
-          width: 100px;
-          font-weight: bold;
-        }
-        .value {
-          display: inline-block;
-        }
-        .fee-table {
-          width: 100%;
-          border-collapse: collapse;
-          margin-top: 10px;
-        }
-        .fee-table th,
-        .fee-table td {
-          border: 1px solid #ddd;
-          padding: 8px;
-          text-align: left;
-        }
-        .fee-table th {
-          background-color: #f5f5f5;
-          font-weight: bold;
-        }
-        .total-label {
-          font-weight: bold;
-          text-align: right;
-        }
-        .total-value {
-          font-weight: bold;
-          color: red;
-        }
-        .print-footer {
-          margin-top: 20px;
-          font-size: 12px;
-          color: #666;
-        }
-        @media print {
-          body {
-            padding: 0;
-          }
-        }
-      </style>
-    </head>
-    <body>
-      ${printContent.innerHTML}
-    </body>
-    </html>
-  `);
-  
-  printWindow.document.close();
-  
-  // 等待内容加载完成后打印
-  printWindow.onload = function() {
-    setTimeout(() => {
-      printWindow.print();
-      // 打印后关闭窗口（可选）
-      // printWindow.close();
-    }, 250);
-  };
-}
-
-// 选择挂号记录
-function handleRecordSelect(row) {
-  selectedRecord.value = row;
-}
-
-// 确认选择记录
-async function handleConfirmSelect() {
-  if (!selectedRecord.value) {
-    proxy.$modal.msgWarning('请选择一条挂号记录');
-    return;
-  }
-  
-  loading.value = true;
-  selectDialogVisible.value = false;
-  
-  try {
-    // 保存当前记录，用于打印
-    currentRecord.value = selectedRecord.value;
-    
-    // 填充表单 - 确保数据正确填充
-    fillForm(selectedRecord.value);
-    
-    // 等待一小段时间，确保 form 数据已更新
-    await new Promise(resolve => setTimeout(resolve, 50));
-    
-    // 验证表单数据是否已正确填充
-    if (!form.encounterId) {
-      proxy.$modal.msgError('获取挂号记录ID失败，请重试');
-      loading.value = false;
-      return;
-    }
-    
-    // 提交补打操作（handleSubmit 内部会管理 loading 状态）
-    await handleSubmit();
-  } catch (error) {
-    console.error('确认选择记录失败:', error);
-    proxy.$modal.msgError('处理失败: ' + (error.message || '未知错误'));
-    loading.value = false;
-  }
-}
-
 </script>
 
 <style scoped>
-/* 确保对话框内容区域的背景色 */
-:deep(.el-dialog__body) {
-  padding: 0;
-  background-color: #ffffff;
-}
-
-/* 输入框样式 */
-:deep(.el-input__inner) {
-  background-color: #ffffff;
-}
-
-/* 标签样式 */
-:deep(.el-form-item__label) {
-  font-weight: normal;
-  color: #333;
-}
-
-/* 打印预览对话框样式 */
-.print-preview-dialog {
-  :deep(.el-dialog__body) {
-    padding: 20px;
-    max-height: 70vh;
-    overflow-y: auto;
-  }
-}
-
-.print-content {
-  background: white;
-  padding: 20px;
-  font-family: Arial, sans-serif;
-}
-
-.print-header {
-  margin-bottom: 20px;
-  position: relative;
-}
-
-.reprint-label-left {
-  position: absolute;
-  top: 0;
-  left: 0;
-  color: red;
-  font-size: 16px;
-  font-weight: bold;
-}
-
-.header-content {
-  text-align: center;
-}
-
-.document-title {
-  font-size: 16px;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
-
-.print-time {
-  font-size: 12px;
-  color: #666;
+.dialog-footer {
   text-align: right;
 }
-
-.print-section {
-  margin-bottom: 20px;
-}
-
-.section-title {
-  font-size: 14px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  border-bottom: 1px solid #ddd;
-  padding-bottom: 5px;
-}
-
-.info-row {
-  margin-bottom: 8px;
-  font-size: 13px;
-}
-
-.info-row .label {
-  display: inline-block;
-  width: 100px;
-  font-weight: bold;
-}
-
-.info-row .value {
-  display: inline-block;
-}
-
-.fee-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-top: 10px;
-}
-
-.fee-table th,
-.fee-table td {
-  border: 1px solid #ddd;
-  padding: 8px;
-  text-align: left;
-}
-
-.fee-table th {
-  background-color: #f5f5f5;
-  font-weight: bold;
-}
-
-.total-label {
-  font-weight: bold;
-  text-align: right;
-}
-
-.total-value {
-  font-weight: bold;
-  color: red;
-}
-
-.print-footer {
-  margin-top: 20px;
-  font-size: 12px;
-  color: #666;
-}
-
-.reminder {
-  text-align: center;
-  padding: 10px;
-  background-color: #f9f9f9;
-  border-radius: 4px;
-}
 </style>
+
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 0de63a26..2001d9b4 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -4,9 +4,9 @@
       <el-col :span="24" class="card-box">
         <el-card>
           <template #header>
-            <div style="display: flex; align-items: center; width: 100%">
-              <span style="font-size: 16px; font-weight: bold; margin-right: 20px;">门诊挂号</span>
-              <div style="flex: 1; display: flex; justify-content: center; align-items: center;">
+            <div style="display: flex; align-items: center; justify-content: space-between; width: 100%">
+              <span style="vertical-align: middle; font-size: 16px; font-weight: bold;">门诊挂号</span>
+              <div class="header-buttons">
                 <el-button type="primary" icon="Document" @click="goToPatientRecord" size="small">档案</el-button>
                 <el-button type="primary" icon="Plus" @click="handleAddPatient" size="small">新建</el-button>
                 <el-button type="primary" plain icon="Search" @click="handleSearch" size="small">查询</el-button>
@@ -420,16 +420,6 @@
               prop="genderEnum_enumText"
             />
             <el-table-column label="联系电话" align="center" key="phone" prop="phone" />
-            <el-table-column
-              label="就诊卡号"
-              align="center"
-              key="identifierNo"
-              width="150"
-            >
-              <template #default="scope">
-                {{ scope.row.identifierNo || scope.row.cardNo || scope.row.card || scope.row.patientCardNo || scope.row.patient?.identifierNo || '-' }}
-              </template>
-            </el-table-column>
             <el-table-column
               label="科室名称"
               align="center"
@@ -603,18 +593,6 @@
       :chargeItemIds="chargeItemIdList"
       :eventType="eventType"
     />
-    <ReprintDialog
-      :open="openReprintDialog"
-      @close="
-        (value) => {
-          if (value == 'success') {
-            proxy.$modal.msgSuccess('操作成功');
-            getList();
-          }
-          openReprintDialog = false;
-        }
-      "
-    />
   </div>
 </template>
 
@@ -639,7 +617,6 @@ import patientList from './components/patientList';
 import {nextTick, onMounted, onUnmounted, ref} from 'vue';
 import ChargeDialog from './components/chargeDialog.vue';
 import RefundDialog from './components/refundDialog.vue';
-import ReprintDialog from './components/reprintDialog.vue';
 import {handleColor} from '@/utils/his';
 import useUserStore from '@/store/modules/user';
 import {formatDateStr} from '@/utils/index';
@@ -732,6 +709,7 @@ const data = reactive({
     contractNo: [{ required: true, message: '费用性质', trigger: 'blur' }],
     patientId: [{ required: true, message: '病人不能为空', trigger: 'blur' }],
     priorityEnum: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
+    serviceTypeId: [{ required: true, message: '挂号类型不能为空', trigger: 'blur' }],
     organizationId: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
     orgId: [{ required: true, message: '就诊科室不能为空', trigger: 'blur' }],
     practitionerId: [{ required: true, message: '医生不能为空', trigger: 'blur' }],
@@ -1048,18 +1026,10 @@ function getList() {
     outpatientRegistrationList.value = res.data.records;
     total.value = res.data.total;
     
-    // 调试：查看返回的数据结构，查找就诊卡号字段
-    if (res.data.records && res.data.records.length > 0) {
-      console.log('当日已挂号数据结构:', res.data.records[0]);
+    // 调试：查看返回的数据结构（仅退号记录查询时）
+    if (queryType.value === 'returned' && res.data.records && res.data.records.length > 0) {
+      console.log('退号记录数据结构:', res.data.records[0]);
       console.log('所有字段:', Object.keys(res.data.records[0]));
-      // 查找可能的就诊卡号字段
-      const firstRecord = res.data.records[0];
-      const possibleCardFields = ['identifierNo', 'cardNo', 'card', 'patientCardNo', 'identifier', 'medicalCardNo'];
-      possibleCardFields.forEach(field => {
-        if (firstRecord[field] !== undefined) {
-          console.log(`找到可能的就诊卡号字段 ${field}:`, firstRecord[field]);
-        }
-      });
     }
   });
 }
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
index 776e2f8e..3faf153f 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/components/PackageSettings.vue
@@ -1144,7 +1144,6 @@ async function handleSave() {
       remark: formData.remark || '',
       createDate: formData.createDate,
       items: detailData.value.map((item, index) => ({
-        // 基本字段（与检查套餐 CheckPackageDetail 对应）
         itemCode: item.code || '',
         itemName: item.itemName || '',
         checkItemId: item.itemId || null,
@@ -1158,13 +1157,7 @@ async function handleSave() {
         serviceCharge: parseFloat(item.serviceCharge) || 0,
         total: parseFloat(item.total) || 0,
         origin: item.origin || '',
-        orderNum: index + 1,
-        // 兼容字段（部分日志/历史代码使用的命名：dosage/route/serviceFee/totalAmount）
-        // 后端当前不会用到这些别名字段，但保留便于排查和兼容
-        dosage: item.dose || '',
-        route: item.method || '',
-        serviceFee: parseFloat(item.serviceCharge) || 0,
-        totalAmount: parseFloat(item.total) || 0
+        orderNum: index + 1
       }))
     }