测试合并v14

Reviewed-on: #2

.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条专家号记录。

.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条专家号记录。

.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. 检查日志，确认没有类型转换异常

.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" 转换为 "专家"
+
+## 预期效果
+修复后，前端选择"普通号"或"专家号"时，系统能正确查询到对应的号源数据，不再出现"没有更多数据了"的提示。

.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条专家号数据
+
+* 保持与现有代码的兼容性
+

LICENSE

@@ -1,4 +1,4 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>

README.md

@@ -1,68 +0,0 @@
-# 平台介绍
-
-## 🏠【关于我们】
-
-![天天开源](https://open.tntlinking.com/assets/logo-b-BzFUYaRU.png) 
-
-天天开源致⼒于打造中国应⽤管理 软件开源⽣态，⾯向医疗、企业、教育三⼤⾏业信息化需求，提供优质的开源软件产品与解决⽅案。平台现已发布OpenHIS、OpenCOM、OpenEDU系列开源产品，并持续招募⽣态合作伙伴，期待共同构建开源创新的⾏业协作模式，加速⾏业的数字化进程。
-
-天天开源的前⾝是新致开源，最早于2022年6⽉发布开源医疗软件平台OpenHIS.org.cn，于2023年6⽉发布开源企业软件平台OpenCOM.com.cn。2025年7⽉，新致开源品牌更新为天天开源，我们始终秉持开源、专业、协作的理念，致⼒于为医疗、教育、中⼩企业等⾏业提供优质的开源解决⽅案。
-
-了解我们a：https://open.tntlinking.com/about?site=gitee
-
-## 💾【部署包下载】
-
-请访问官网产品中心下载部署包：https://open.tntlinking.com/resource/productCenter?site=gitee
-
-## 📚【支持文档】
-
-技术支持资源：https://open.tntlinking.com/resource/openProductDoc?site=gitee
-（含演示环境、操作手册、部署手册、开发手册、常见问题等）
-
-产品介绍：https://open.tntlinking.com/resource/productPresentation?site=gitee
-
-操作教程：https://open.tntlinking.com/resource/operationTutorial?site=gitee
-
-沙龙回顾：https://open.tntlinking.com/resource/openSourceSalon#23?site=gitee
-
-## 🤝【合作方式】
-
-产品服务价格：https://open.tntlinking.com/cost?site=gitee
-
-加入生态伙伴：https://open.tntlinking.com/ecology/becomePartner?site=gitee
-
-## 🤗【技术社区】
-
-请访问官网扫码加入技术社区交流：https://open.tntlinking.com/ecology/joinCommunity?site=gitee
-
-请关注公众号【天天开源软件】以便获得最新产品更新信息。
-
-
-
-# 项目介绍
-
-OpenHIS医院系统（信创版）集十大核心模块于一体，涵盖目录管理、基础数据配置、个性化设置、门诊/住院全流程管理、药房药库智能管控、精细化耗材管理、财务核算体系、医保合规对接及多维报表分析等功能模块，共计372项标准化功能。
-
-系统深度适配民营及公立一二级医院业务场景，支持单体医院、集团化运营及区域医疗协同等多种部署模式，并通过国家信创认证体系，确保全栈技术自主可控。如有项目需求，可联系官方平台合作。
-
-
-
-## 运行环境
-
-    jdk17 (必须)
-    node.js-v16.15 (推荐)
-    PostgreSQL-v16.2 (必须)
-    redis (常用稳定版本即可)
-
-## 开发提示
-
-    需要修改数据库和redis的连接信息,详见:
-        application.yml
-        application-druid.yml
-
-## 目录解释
-	
-    前端: openhis-ui-vue3
-    后端: openhis-server
-        启动类: OpenHisApplication
-		

check_display_order.sql

@@ -0,0 +1,104 @@
+-- 检查流水号（display_order）是否按“科室+医生+当天”正确递增
+-- 
+-- 说明：
+-- 1. display_order 存的是纯数字（1, 2, 3...），不带时间戳前缀
+-- 2. 时间戳前缀（如 20260109）是在前端显示时加上的
+-- 3. 后端用 Redis key "ORG-{科室ID}-DOC-{医生ID}" 按天自增
+-- 
+-- 如何判断逻辑是否正确：
+--   同一科室、同一医生、同一天的记录，display_order 应该递增（1, 2, 3...）
+--   不同科室、不同医生、不同天的记录，可能都是 1（这是正常的）
+
+-- ========================================
+-- 查询1：按“科室+医生+日期”分组，看每组内的 display_order 是否递增
+-- ========================================
+SELECT 
+    DATE(start_time) AS 日期,
+    organization_id AS 科室ID,
+    registrar_id AS 医生ID,
+    COUNT(*) AS 该组记录数,
+    MIN(display_order) AS 最小序号,
+    MAX(display_order) AS 最大序号,
+    STRING_AGG(display_order::text, ', ' ORDER BY start_time) AS 序号列表,
+    STRING_AGG(id::text, ', ' ORDER BY start_time) AS 记录ID列表
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND start_time >= CURRENT_DATE - INTERVAL '7 days'  -- 只看最近7天
+  AND display_order IS NOT NULL
+GROUP BY DATE(start_time), organization_id, registrar_id
+ORDER BY 日期 DESC, 科室ID, 医生ID;
+
+-- ========================================
+-- 查询2：详细查看每条记录，看同组内的序号是否连续
+-- ========================================
+SELECT 
+    id AS 记录ID,
+    DATE(start_time) AS 日期,
+    organization_id AS 科室ID,
+    registrar_id AS 医生ID,
+    start_time AS 挂号时间,
+    display_order AS 流水号,
+    -- 计算：同组内的序号应该是 1, 2, 3...，看是否有重复或跳号
+    ROW_NUMBER() OVER (
+        PARTITION BY DATE(start_time), organization_id, registrar_id 
+        ORDER BY start_time
+    ) AS 应该是第几个,
+    CASE 
+        WHEN display_order = ROW_NUMBER() OVER (
+            PARTITION BY DATE(start_time), organization_id, registrar_id 
+            ORDER BY start_time
+        ) THEN '✓ 正常'
+        ELSE '✗ 异常'
+    END AS 是否正常
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND start_time >= CURRENT_DATE - INTERVAL '7 days'
+  AND display_order IS NOT NULL
+ORDER BY DATE(start_time) DESC, organization_id, registrar_id, start_time;
+
+-- ========================================
+-- 查询3：只看今天的数据（最直观）
+-- ========================================
+SELECT 
+    id AS 记录ID,
+    organization_id AS 科室ID,
+    registrar_id AS 医生ID,
+    start_time AS 挂号时间,
+    display_order AS 流水号
+FROM adm_encounter
+WHERE delete_flag = '0'
+  AND DATE(start_time) = CURRENT_DATE
+  AND display_order IS NOT NULL
+ORDER BY organization_id, registrar_id, start_time;
+
+-- ========================================
+-- 查询4：发现问题 - 找出同组内 display_order 重复的记录
+-- ========================================
+WITH ranked AS (
+    SELECT 
+        id,
+        DATE(start_time) AS reg_date,
+        organization_id,
+        registrar_id,
+        start_time,
+        display_order,
+        ROW_NUMBER() OVER (
+            PARTITION BY DATE(start_time), organization_id, registrar_id 
+            ORDER BY start_time
+        ) AS should_be_order
+    FROM adm_encounter
+    WHERE delete_flag = '0'
+      AND start_time >= CURRENT_DATE - INTERVAL '7 days'
+      AND display_order IS NOT NULL
+)
+SELECT 
+    reg_date AS 日期,
+    organization_id AS 科室ID,
+    registrar_id AS 医生ID,
+    COUNT(*) AS 重复数量,
+    STRING_AGG(id::text || '->' || display_order::text, ', ') AS 问题记录
+FROM ranked
+WHERE display_order != should_be_order
+GROUP BY reg_date, organization_id, registrar_id
+ORDER BY reg_date DESC;
+

md/test.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>测试合并11112</title>
+</head>
+<body>
+
+</body>
+</html>

md/需求/94-手术室维护界面_2026-1-9.md

@@ -0,0 +1,287 @@
+## 手术室维护界面PRD文档
+
+### 一、页面概述
+
+**页面名称**：手术室维护界面  
+**页面目标**：提供手术室基础数据的维护功能，包括新增、编辑、启用/停用手术室信息，为手术安排提供基础数据支持  
+**适用场景**：医院管理员需要新增、修改、启用/停用手术室信息时使用  
+**页面类型**：列表页+表单页（含模态框）
+
+**原型图地址：**https://static.pm-ai.cn/prototype/20260104/ee5d222231effefcb39624d1646a2e20/index.html
+
+**核心功能**：
+
+1.  手术室列表展示与查询
+2.  新增手术室信息
+3.  编辑现有手术室信息
+4.  启用/停用手术室状态
+5.  数据有效性校验
+
+**用户价值**：
+
+-   管理员可集中管理所有手术室基础信息
+-   确保手术安排时能获取准确的手术室数据
+-   通过状态管理控制手术室可用性
+
+**流程图：**
+
+![](media/6a369a41c55f8727aa574bf43fa7500b.png)
+
+```mermaid
+flowchart TD
+    A[手术室维护界面] --> B[手术室列表展示]
+
+    B --> C[新增手术室]
+
+    B --> D[编辑手术室]
+
+    B --> E[启用/停用手术室]
+
+    B --> F[查询手术室]
+
+    C --> G[点击新增按钮]
+
+    G --> H[打开新增模态框]
+
+    H --> I[填写表单字段]
+
+    I --> J{必填字段校验}
+
+    J -->|通过| K[提交数据]
+
+    J -->|不通过| L[提示请填写所有必填项]
+
+    K --> M[表格新增数据行]
+
+    D --> N[点击修改按钮]
+
+    N --> O[打开编辑模态框]
+
+    O --> P[修改表单字段]
+
+    P --> Q{必填字段校验}
+
+    Q -->|通过| R[保存数据]
+
+    Q -->|不通过| S[提示请填写所有必填项]
+
+    R --> T[更新表格对应行]
+
+    E --> U[点击启用/停用按钮]
+
+    U --> V{二次确认}
+
+    V -->|确认| W[切换状态标签]
+
+    V -->|取消| X[取消操作]
+
+    W --> Y[更新按钮状态]
+
+    F --> Z[输入查询条件]
+
+    Z --> AA[筛选表格数据]
+
+    K --> AB{房间号重复校验}
+
+    AB -->|不重复| AC[提示房间号已存在]
+
+    AB -->|重复| AD[更新按钮状态]
+```
+
+### 二、整体布局分析
+
+**页面宽度**：自适应布局  
+**主要区域划分**：
+
+1.  页头区域（15%高度）
+2.  表格展示区（85%高度）  
+    **布局特点**：上下布局，表格采用固定表头+滚动内容区设计  
+    **响应式要求**：移动端适配时改为纵向堆叠布局，操作按钮组变为纵向排列
+
+### 三、页面区域详细描述
+
+#### 1. 页头区域
+
+**区域位置**：页面顶部  
+**区域尺寸**：高度60px，宽度100%  
+**区域功能**：展示标题和主要操作入口  
+**包含元素**：
+
+-   **标题文本**
+    -   元素类型：H1标题
+    -   显示内容："手术室列表"
+    -   样式特征：1.75rem/600字重，深灰色(#333)
+-   **新增按钮**
+    -   元素类型：主要操作按钮
+    -   显示内容："新增"（带+图标）
+    -   交互行为：点击触发新增模态框
+    -   样式特征：蓝色背景(#5a7cff)，白色文字，8px圆角，悬停上浮1px
+
+#### 2. 表格展示区（手术室列表表格）
+
+**区域位置**：页头下方  
+**区域尺寸**：高度自适应，宽度100%  
+**区域功能**：展示手术室数据并支持行级操作  
+**包含元素**：
+
+-   **数据表格**
+    -   展示方式：固定表头表格
+    -   数据字段：
+        -   房间号：文本 - OR01 - 不可操作
+        -   手术室名称：文本 - 第一手术室 - 不可操作
+        -   类型：文本 - 普通/日间/复合 - 不可操作
+        -   所属科室：文本 - 外科 - 不可操作
+        -   状态：标签 - 有效/无效 - 通过操作按钮切换
+    -   操作功能：每行包含"修改"和"状态切换（停用-黄色/启用-绿色）"按钮
+-   **表格样式**：
+    -   表头：浅灰色背景(#f8f9fa)，大写字母，14px字号
+    -   行悬停：浅灰色背景(#f8f9fa)
+    -   状态标签：
+        -   有效：绿色背景+文字(#28a745)
+        -   无效：灰色背景+文字(#6c757d)
+
+#### 3. 新增手术室弹窗
+
+**区域位置**：页面居中模态弹窗  
+**区域功能**：收集新增手术室所需信息  
+**包含元素**：
+
+-   表单字段：
+    1.  房间号输入框
+    2.  类型：文本输入
+    3.  必填：是
+    4.  示例值：OR04
+    5.  校验规则：非空校验
+    6.  手术室名称输入框
+    -   类型：文本输入
+    -   必填：是
+    -   示例值：第四手术室
+    1.  手术室类型下拉框
+    -   类型：单选下拉
+    -   选项：普通/日间/复合/特殊
+    -   默认值：普通
+    1.  所属科室下拉框
+    -   类型：单选下拉
+    -   必填：是
+    -   选项：外科/妇产科等8个科室
+    -   默认提示："请选择科室"
+-   操作按钮：
+    -   取消按钮（灰色边框）
+    -   确认按钮（蓝色填充）
+        -   校验逻辑：必填字段非空校验
+        -   成功反馈：提示"手术室添加成功"
+        -   失败反馈：提示"请填写所有必填项"
+
+#### 4. 编辑手术室弹窗
+
+**区域位置**：页面居中模态弹窗  
+**区域功能**：修改现有手术室信息  
+**包含元素**：
+
+-   表单字段（同新增弹窗，带初始值）
+-   操作按钮：
+    -   取消按钮
+    -   保存按钮
+        -   校验逻辑：同新增弹窗
+        -   成功反馈：提示"手术室信息已更新"
+
+### 四、交互功能详细说明
+
+#### 1. 新增手术室
+
+**功能描述**：添加新的手术室记录  
+**触发条件**：点击页头"新增"按钮  
+**操作流程**：
+
+1.  打开新增模态框
+2.  填写必填字段（房间号、名称、科室）
+3.  点击确认提交（插入his_or_room表）
+4.  表格末尾新增数据行  
+    **异常处理**：
+-   必填项为空时弹出"请填写所有必填项"提示
+-   房间号重复需在后端校验并提示
+
+#### 2. 编辑手术室
+
+**功能描述**：修改现有手术室信息  
+**触发条件**：点击行内"修改"按钮  
+**操作流程**：
+
+1.  打开编辑模态框（自动填充当前行数据）
+2.  用户修改数据
+3.  点击"保存"时校验并更新对应行数据  
+    **状态保持**：记录当前编辑行索引确保数据更新准确
+
+#### 3. 状态切换
+
+**功能描述**：启用/停用手术室  
+**触发条件**：点击"停用"或"启用"按钮  
+**操作流程**：
+
+1.  弹出二次确认对话框
+2.  用户确认后切换状态标签
+3.  按钮变为相反操作（停用↔启用）
+4.  、停用手术室
+-   **步骤**：
+    1.  查询需要停用的手术室记录。
+    2.  将 valid_flag 设置为 0（无效）。
+-   **示例**：
+
+    UPDATE his_or_room
+
+    SET valid_flag = '0'
+
+    WHERE room_code = 'OR06';
+
+5\. 启用手术室
+
+**步骤**：
+
+1.  查询需要启用的手术室记录。
+    1.  将 valid_flag 设置为 1（有效）。
+-   **示例**：
+
+    UPDATE his_or_room
+
+    SET valid_flag = '1'
+
+    WHERE room_code = 'OR06';
+
+    **防误操作**：所有状态变更需二次确认
+
+### 五、数据结构说明（HIS_OR_ROOM手术室字典表）
+
+| **字段名称** | **数据类型** | **是否为空** | **说明/典型值** | **外键/来源**                 |
+|--------------|--------------|--------------|-----------------|-------------------------------|
+| room_id      | VARCHAR(10)  | N            | 主键            | 自增主键                      |
+| room_code    | VARCHAR(10)  | N            | 手术室房间号    | 自定义编码，如 OR01、OR02     |
+| room_name    | VARCHAR(100) | N            | 手术室名称      | 如 "第一手术室"、"第二手术室" |
+| room_type    | VARCHAR(10)  | N            | 手术室类型      | 普通、日间、复合              |
+| dept_code    | VARCHAR(10)  | N            | 所属科室        | FK → 科室管理的科室代码       |
+| valid_flag   | CHAR(1)      | N            | 是否有效        | 1有效，0无效                  |
+| created_time | DATETIME     | N            | 创建时间        | 默认当前时间                  |
+| updated_time | DATETIME     | N            | 更新时间        | 默认当前时间，自动更新        |
+
+### 六、开发实现要点
+
+**样式规范**：
+
+-   主色调：#5a7cff（按钮/交互元素）
+-   辅助色：#7b8a8b（次要文本）
+-   字体：
+    -   标题：1.75rem/600字重
+    -   正文：0.875rem/400字重
+-   间距系统：
+    -   卡片内边距：24px
+    -   表单字段间距：16px
+
+**技术要求**：
+
+**注意事项**：
+
+1.  数据安全：
+    -   所有变更操作需记录操作日志
+    -   停用状态的手术室需在前端标记不可预约
+2.  性能优化：
+    -   表格数据分页加载
+    -   模态框使用懒加载

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
      */

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()) {

openhis-server-new/openhis-application/pom.xml

@@ -64,6 +64,11 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+        </dependency>
         <!-- rabbitMQ -->
         <!-- <dependency>
             <groupId>org.springframework.boot</groupId>

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();
+}

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;
+    }
+}

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);
+    }
+}

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;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
+import com.core.common.utils.DictUtils;
 import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.OperatingRoom;
 import com.openhis.administration.mapper.OperatingRoomMapper;
@@ -76,6 +77,15 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
         operatingRoomPage.getRecords().forEach(e -> {
             // 状态
             e.setStatusEnum_dictText(e.getStatusEnum() != null && e.getStatusEnum() == 1 ? "启用" : "停用");
+            // 类型
+            if (e.getRoomTypeEnum() != null) {
+                e.setRoomTypeEnum_dictText(DictUtils.getDictLabel("operating_room_type", String.valueOf(e.getRoomTypeEnum())));
+            }
+            // 如果有机构ID，查询机构名称
+            if (e.getOrganizationId() != null) {
+                String orgName = commonService.getOrgNameById(e.getOrganizationId());
+                e.setOrganizationName(orgName);
+            }
             // 拼音码
             e.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(e.getName()));
             // 五笔码
@@ -105,6 +115,11 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
         operatingRoomDto.setStatusEnum_dictText(
             operatingRoom.getStatusEnum() != null && operatingRoom.getStatusEnum() == 1 ? "启用" : "停用");
 
+        // 类型描述
+        if (operatingRoom.getRoomTypeEnum() != null) {
+            operatingRoomDto.setRoomTypeEnum_dictText(DictUtils.getDictLabel("operating_room_type", String.valueOf(operatingRoom.getRoomTypeEnum())));
+        }
+
         // 如果有机构ID，查询机构名称
         if (operatingRoom.getOrganizationId() != null) {
             String orgName = commonService.getOrgNameById(operatingRoom.getOrganizationId());
@@ -127,6 +142,11 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
             return R.fail("手术室名称不能为空");
         }
 
+        // 校验房间号不能为空
+        if (StringUtils.isEmpty(operatingRoomDto.getBusNo())) {
+            return R.fail("房间号不能为空");
+        }
+
         // 去除空格
         String name = operatingRoomDto.getName().replaceAll("[ 　]", "");
         operatingRoomDto.setName(name);
@@ -136,13 +156,14 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
             return R.fail("【" + name + "】已存在");
         }
 
+        // 判断房间号是否已存在
+        if (isExistBusNo(operatingRoomDto.getBusNo(), null)) {
+            return R.fail("房间号【" + operatingRoomDto.getBusNo() + "】已存在");
+        }
+
         OperatingRoom operatingRoom = new OperatingRoom();
         BeanUtils.copyProperties(operatingRoomDto, operatingRoom);
 
-        // 生成编码
-        String code = assignSeqUtil.getSeq(AssignSeqEnum.OPERATING_ROOM_BUS_NO.getPrefix(), 3);
-        operatingRoom.setBusNo(code);
-
         // 拼音码
         operatingRoom.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(operatingRoomDto.getName()));
         // 五笔码
@@ -174,6 +195,11 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
             return R.fail("手术室名称不能为空");
         }
 
+        // 校验房间号不能为空
+        if (StringUtils.isEmpty(operatingRoomDto.getBusNo())) {
+            return R.fail("房间号不能为空");
+        }
+
         // 去除空格
         String name = operatingRoomDto.getName().replaceAll("[ 　]", "");
         operatingRoomDto.setName(name);
@@ -183,6 +209,11 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
             return R.fail("【" + name + "】已存在");
         }
 
+        // 判断房间号是否已存在（排除自己）
+        if (isExistBusNo(operatingRoomDto.getBusNo(), operatingRoomDto.getId())) {
+            return R.fail("房间号【" + operatingRoomDto.getBusNo() + "】已存在");
+        }
+
         OperatingRoom operatingRoom = new OperatingRoom();
         BeanUtils.copyProperties(operatingRoomDto, operatingRoom);
 
@@ -290,4 +321,20 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
         }
         return operatingRoomService.count(queryWrapper) > 0;
     }
+
+    /**
+     * 判断房间号是否已存在
+     *
+     * @param busNo 房间号
+     * @param excludeId 排除的ID
+     * @return 是否存在
+     */
+    private boolean isExistBusNo(String busNo, Long excludeId) {
+        LambdaQueryWrapper<OperatingRoom> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OperatingRoom::getBusNo, busNo);
+        if (excludeId != null) {
+            queryWrapper.ne(OperatingRoom::getId, excludeId);
+        }
+        return operatingRoomService.count(queryWrapper) > 0;
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OperatingRoomDto.java

@@ -2,6 +2,7 @@ package com.openhis.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -35,6 +36,13 @@ public class OperatingRoomDto implements Serializable {
      */
     private String name;
 
+    /**
+     * 手术室类型
+     */
+    @Dict(dictCode = "operating_room_type")
+    private Integer roomTypeEnum;
+    private String roomTypeEnum_dictText;
+
     /**
      * 所属机构ID
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java

@@ -65,8 +65,16 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer
     @Override
     public IPage<AdviceBaseDto> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto, String searchKey, Long locationId,
         Long organizationId, Integer pageNo, Integer pageSize) {
+        // 根据前端传入的adviceType动态构建查询类型列表
+        // 如果adviceType不为空，只查询该类型；如果为空，查询所有类型（1:药品, 2:耗材, 3:诊疗）
+        List<Integer> adviceTypes;
+        if (adviceBaseDto != null && adviceBaseDto.getAdviceType() != null) {
+            adviceTypes = List.of(adviceBaseDto.getAdviceType());
+        } else {
+            adviceTypes = List.of(1, 2, 3);
+        }
         return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null,
-            organizationId, pageNo, pageSize, Whether.YES.getValue(), List.of(1, 2, 3), null);
+            organizationId, pageNo, pageSize, Whether.YES.getValue(), adviceTypes, null);
     }
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java

@@ -141,4 +141,9 @@ public class CurrentDayEncounterDto {
      */
     private String identifierNo;
 
+    /**
+     * 流水号（就诊当日序号）
+     */
+    private Integer displayOrder;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ReprintRegistrationDto.java

@@ -0,0 +1,71 @@
+package com.openhis.web.chargemanage.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 补打挂号 DTO
+ */
+@Data
+@Accessors(chain = true)
+public class ReprintRegistrationDto {
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 就诊卡号
+     */
+    private String cardNo;
+
+    /**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 挂号科室
+     */
+    private String organizationName;
+
+    /**
+     * 医生姓名
+     */
+    private String practitionerName;
+
+    /**
+     * 挂号费
+     */
+    private BigDecimal price;
+
+    /**
+     * 诊疗费
+     */
+    private BigDecimal activityPrice;
+
+    /**
+     * 病历费
+     */
+    private BigDecimal medicalRecordFee;
+
+    /**
+     * 合计
+     */
+    private BigDecimal totalPrice;
+
+    /**
+     * 预约/挂号时间
+     */
+    private String visitTime;
+}
+
+
+
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java

@@ -4,7 +4,7 @@ import com.core.common.core.domain.R;
 import com.openhis.check.domain.LisGroupInfo;
 
 public interface ILisGroupInfoAppService {
-    R<?> getLisGroupInfoList();
+    R<?> getLisGroupInfoList(Integer pageNum, Integer pageSize);
 
     R<?> add(LisGroupInfo lisGroupInfo);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java

@@ -1,6 +1,7 @@
 package com.openhis.web.check.appservice.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.check.domain.LisGroupInfo;
 import com.openhis.check.service.ILisGroupInfoService;
@@ -17,11 +18,14 @@ public class LisGroupInfoAppServiceImpl implements ILisGroupInfoAppService {
     @Resource
     private ILisGroupInfoService lisGroupInfoService;
     @Override
-    public R<?> getLisGroupInfoList() {
-        List<LisGroupInfo> list = lisGroupInfoService.list();
+    public R<?> getLisGroupInfoList(Integer pageNum, Integer pageSize) {
+        Page<LisGroupInfo> page = new Page<>(pageNum, pageSize);
+        Page<LisGroupInfo> list = lisGroupInfoService.page(page);
         return R.ok(list);
     }
 
+
+
     @Override
     public R<?> add(LisGroupInfo lisGroupInfo) {
         if (ObjectUtil.isEmpty(lisGroupInfo)) {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java

@@ -19,8 +19,8 @@ public class LisGroupInfoController {
     *
     * */
     @GetMapping("/list")
-    public R<?> getLisGroupInfoList(){
-        return R.ok(lisGroupInfoAppService.getLisGroupInfoList());
+    public R<?> getLisGroupInfoList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize){
+        return R.ok(lisGroupInfoAppService.getLisGroupInfoList(pageNum, pageSize));
     }
 
     /*

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java

@@ -167,6 +167,14 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         Long encounterId = saveDiagnosisParam.getEncounterId();
         // 诊断定义集合
         List<SaveDiagnosisChildParam> diagnosisChildList = saveDiagnosisParam.getDiagnosisChildList();
+        // 如果本次保存中有设置主诊断，则先清空该就诊下所有的主诊断标记，确保唯一性
+        boolean hasMain = diagnosisChildList.stream().anyMatch(d -> Integer.valueOf(1).equals(d.getMaindiseFlag()));
+        if (hasMain) {
+            iEncounterDiagnosisService.update(new LambdaUpdateWrapper<EncounterDiagnosis>()
+                    .eq(EncounterDiagnosis::getEncounterId, encounterId)
+                    .set(EncounterDiagnosis::getMaindiseFlag, 0));
+        }
+
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
@@ -240,6 +248,14 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         Long encounterId = saveDiagnosisParam.getEncounterId();
         // 诊断定义集合
         List<SaveDiagnosisChildParam> diagnosisChildList = saveDiagnosisParam.getDiagnosisChildList();
+        // 如果本次保存中有设置主诊断，则先清空该就诊下所有的主诊断标记，确保唯一性
+        boolean hasMain = diagnosisChildList.stream().anyMatch(d -> Integer.valueOf(1).equals(d.getMaindiseFlag()));
+        if (hasMain) {
+            iEncounterDiagnosisService.update(new LambdaUpdateWrapper<EncounterDiagnosis>()
+                    .eq(EncounterDiagnosis::getEncounterId, encounterId)
+                    .set(EncounterDiagnosis::getMaindiseFlag, 0));
+        }
+
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
@@ -259,21 +275,21 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         EncounterDiagnosis encounterDiagnosis;
 
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
+            encounterDiagnosis = new EncounterDiagnosis();
             if (saveDiagnosisChildParam.getUpdateId() != null) {
                 String updateId = saveDiagnosisChildParam.getUpdateId();
-                encounterDiagnosis = new EncounterDiagnosis();
                 encounterDiagnosis.setId(Long.parseLong(updateId));
-                encounterDiagnosis.setEncounterId(encounterId);
-                encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
-                encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
-                encounterDiagnosis.setDiagSrtNo(saveDiagnosisChildParam.getDiagSrtNo()); // 排序号
-                encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
-                encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
-                encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
-                iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
-            } else {
-
             }
+            encounterDiagnosis.setEncounterId(encounterId);
+            encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
+            encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
+            encounterDiagnosis.setDiagSrtNo(saveDiagnosisChildParam.getDiagSrtNo()); // 排序号
+            encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
+            encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
+            encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
+            encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
+            encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号
+            iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
         }
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"中医诊断"}));
     }
@@ -385,6 +401,20 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         // 删除
         List<AdviceSaveDto> deleteList = medicineList.stream()
                 .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+        
+        // 校验删除的医嘱是否已经收费
+        List<Long> delRequestIdList = deleteList.stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
+        if (!delRequestIdList.isEmpty()) {
+            List<ChargeItem> chargeItemList = iChargeItemService.getChargeItemInfoByReqId(delRequestIdList);
+            if (chargeItemList != null && !chargeItemList.isEmpty()) {
+                for (ChargeItem ci : chargeItemList) {
+                    if (ChargeItemStatus.BILLED.getValue().equals(ci.getStatusEnum())) {
+                        return R.fail("已收费的项目无法删除，请刷新页面后重试");
+                    }
+                }
+            }
+        }
+        
         for (AdviceSaveDto adviceSaveDto : deleteList) {
             iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
             // 删除已经产生的药品发放信息

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -251,6 +252,15 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         List<SaveDiagnosisChildParam> diagnosisChildList = saveDiagnosisParam.getDiagnosisChildList();
         // 先删除再保存
         // iEncounterDiagnosisService.deleteEncounterDiagnosisInfos(encounterId);
+
+        // 如果本次保存中有设置主诊断，则先清空该就诊下所有的主诊断标记，确保唯一性
+        boolean hasMain = diagnosisChildList.stream().anyMatch(d -> Integer.valueOf(1).equals(d.getMaindiseFlag()));
+        if (hasMain) {
+            iEncounterDiagnosisService.update(new LambdaUpdateWrapper<EncounterDiagnosis>()
+                    .eq(EncounterDiagnosis::getEncounterId, encounterId)
+                    .set(EncounterDiagnosis::getMaindiseFlag, 0));
+        }
+
         // 保存诊断管理
         Condition condition;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
@@ -285,11 +295,17 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
                     encounterDiagnosis.setId(Long.parseLong(s));
                     encounterDiagnosis.setEncounterId(encounterId);
 //                    encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
-                    encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
+                    // 只有第一个ID（病）设置为主诊断标记，其他的（证）设置为0
+                    if (i == 1) {
+                        encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());
+                    } else {
+                        encounterDiagnosis.setMaindiseFlag(0);
+                    }
                     encounterDiagnosis.setDiagSrtNo(saveDiagnosisChildParam.getDiagSrtNo()); // 排序号
                     encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
                     encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
                     encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
+                    encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
                     iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
                     i++;
                 }
@@ -466,4 +482,4 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
 
         return R.ok(encounterDiagnosis);
     }
-}
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -22,6 +22,7 @@ import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
 import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
 import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto;
 import com.openhis.web.doctorstation.mapper.DoctorStationMainAppMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 /**
  * 医生站-主页面 应用实现类
  */
+//@Slf4j
 @Service
 public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppService {
 
@@ -95,6 +97,9 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             ParticipantType.REGISTRATION_DOCTOR.getCode(), ParticipantType.ADMITTER.getCode(), userId,
             currentUserOrganizationId, pricingFlag, EncounterStatus.PLANNED.getValue(),
             EncounterActivityStatus.ACTIVE.getValue(), queryWrapper);
+        //日志输出就诊患者信息,patientInfo
+//        log.debug("就诊患者信息: 总数={}, 记录数={}, 数据={}",
+//                patientInfo.getTotal(), patientInfo.getRecords().size(), patientInfo.getRecords());
         patientInfo.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java

@@ -123,4 +123,8 @@ public class PatientInfoDto {
      * 病历号
      */
     private String busNo;
+    /**
+     * 就诊卡号
+     */
+    private String identifierNo;
 }

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);
 
     /**
      * 更新患者手机号

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java

@@ -143,29 +143,35 @@ public class PatientInformationServiceImpl implements IPatientInformationService
                         CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
                 request);
         
-        // 查询当前用户对应的医生信息
-        LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
-        practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
-        // 使用list()避免TooManyResultsException异常，然后取第一个记录
-        List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
-        com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
+        // 检查是否是精确ID查询（从门诊挂号页面跳转时使用）
+        boolean hasExactIdQuery = (patientBaseInfoDto.getId() != null);
         
-        // 如果当前用户是医生，添加医生患者过滤条件
-        if (practitioner != null) {
-            // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
-            List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
-                    practitioner.getId(), 
-                    Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()));
+        // 只有非精确ID查询时，才添加医生患者过滤条件
+        if (!hasExactIdQuery) {
+            // 查询当前用户对应的医生信息
+            LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
+            practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
+            // 使用list()避免TooManyResultsException异常，然后取第一个记录
+            List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
+            com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
             
-            if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
-                // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
-                queryWrapper.in("id", doctorPatientIds);
-            } else {
-                // 如果没有相关患者，返回空结果
-                queryWrapper.eq("id", -1); // 设置一个不存在的ID
+            // 如果当前用户是医生，添加医生患者过滤条件
+            if (practitioner != null) {
+                // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
+                List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
+                        practitioner.getId(), 
+                        Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()));
+                
+                if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
+                    // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
+                    queryWrapper.in("id", doctorPatientIds);
+                } else {
+                    // 如果没有相关患者，返回空结果
+                    queryWrapper.eq("id", -1); // 设置一个不存在的ID
+                }
             }
+            // 如果不是医生，查询所有患者
         }
-        // 如果不是医生，查询所有患者
         
         IPage<PatientBaseInfoDto> patientInformationPage
                 = patientManageMapper.getPatientPage(new Page<>(pageNo, pageSize), queryWrapper);
@@ -254,31 +260,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();

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);
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java

@@ -59,6 +59,13 @@ public interface IEleInvoiceService {
      */
     R<?> invoiceWriteoff(Long paymentId, String reason);
 
+    /**
+     * 获取发票HTML
+     * @param busNo 业务流水号
+     * @return HTML字符串
+     */
+    String getInvoiceHtml(String busNo);
+
     /**
      * 查询已开发票
      * @param invoiceId 主键id

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java

@@ -30,6 +30,7 @@ import com.openhis.financial.domain.PaymentRecDetail;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.service.IPaymentRecDetailService;
 import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.web.paymentmanage.appservice.IChargeBillService;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.dto.*;
 import com.openhis.web.paymentmanage.mapper.EleInvoiceMapper;
@@ -38,6 +39,11 @@ import com.openhis.yb.service.IClinicSettleService;
 import com.openhis.yb.service.IRegService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -56,6 +62,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.Charset;
@@ -64,6 +71,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -97,153 +105,180 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
     @Resource
     IEncounterService encounterService;
     @Resource
+    IChargeBillService chargeBillService;
+    @Resource
     private AssignSeqUtil assignSeqUtil;
     @Autowired
     private HttpConfig httpConfig;
 
-    public static JSONObject PreInvoicePostForward(JSONObject bill, String endpoint) {
-        String resultString = "";
-        // JSONObject result = new JSONObject();
-        // 获取当前租户的option信息
+    static {
+        Properties p = new Properties();
+        p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+        p.setProperty(Velocity.INPUT_ENCODING, "UTF-8");
+        Velocity.init(p);
+    }
+
+    private static final Map<String, JSONObject> invoiceDataMap = new ConcurrentHashMap<>();
+
+    private JSONObject internalRegistration(JSONObject bill) {
+        return createInternalSuccessResponse(bill, "REG");
+    }
+
+    private JSONObject internalOutpatient(JSONObject bill) {
+        return createInternalSuccessResponse(bill, "OUT");
+    }
+
+    private JSONObject internalHospitalized(JSONObject bill) {
+        return createInternalSuccessResponse(bill, "HOS");
+    }
+
+    private JSONObject internalWriteOff(JSONObject bill) {
+        JSONObject message = new JSONObject();
+        message.put("eScarletBillBatchCode", "SC" + System.currentTimeMillis());
+        message.put("eScarletBillNo", UUID.randomUUID().toString().substring(0, 8));
+        message.put("eScarletRandom", "666888");
+        message.put("createTime", "20251101143028");
+        message.put("billQRCode", "QR_DATA_SCARLET");
+
         JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
         String baseUrl = optionJson.getString(CommonConstants.Option.URL);
-        String appID = optionJson.getString(CommonConstants.Option.APP_ID);
-        String appKey = optionJson.getString(CommonConstants.Option.KEY);
+        message.put("pictureUrl", baseUrl + "/invoice/view?busNo=scarlet");
+        message.put("pictureNetUrl", baseUrl + "/invoice/view?busNo=scarlet");
 
-        EleInvioceBillDto eleInvioceBillDto = new EleInvioceBillDto();
-        eleInvioceBillDto.setBaseUrl(baseUrl);
-        eleInvioceBillDto.setEndpoint(endpoint);
-        eleInvioceBillDto.setAppKey(appKey);
-        eleInvioceBillDto.setAppID(appID);
-        eleInvioceBillDto.setJsonObject(bill);
+        JSONObject result = new JSONObject();
+        result.put("result", "S0000");
+        result.put("message", Base64.getEncoder().encodeToString(message.toJSONString().getBytes(StandardCharsets.UTF_8)));
+        return result;
+    }
 
-        // 创建Http请求
-        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000).setConnectionRequestTimeout(30000)
-                .setSocketTimeout(30000).build();
-        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
-        CloseableHttpResponse response = null;
-        // 发送请求
-        try {
-            HttpPost httpPost = new HttpPost(optionJson.getString("invoiceUrl") + "/eleInvoice/forward");
-            System.out.println(optionJson.getString("invoiceUrl") + "/eleInvoice/forward");
-            StringEntity stringEntity = new StringEntity(com.alibaba.fastjson2.JSON.toJSONString(eleInvioceBillDto),
-                    ContentType.APPLICATION_JSON);
-            httpPost.setEntity(stringEntity);
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            if (response == null) {
-                throw new ServiceException("Http请求异常，未接受返回参数");
+    private JSONObject createInternalSuccessResponse(JSONObject bill, String prefix) {
+        String busNo = bill.getString("busNo");
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        String baseUrl = optionJson.getString(CommonConstants.Option.URL);
+
+        JSONObject message = new JSONObject();
+        message.put("billBatchCode", prefix + "BC" + System.currentTimeMillis());
+        message.put("billNo", UUID.randomUUID().toString().substring(0, 8));
+        message.put("random", "123456");
+        message.put("createTime", new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
+        message.put("billQRCode", "QR_" + busNo);
+        message.put("pictureUrl", baseUrl + "/invoice/view?busNo=" + busNo);
+        message.put("pictureNetUrl", baseUrl + "/invoice/view?busNo=" + busNo);
+
+        JSONObject result = new JSONObject();
+        result.put("result", "S0000");
+        result.put("message", Base64.getEncoder().encodeToString(message.toJSONString().getBytes(StandardCharsets.UTF_8)));
+        return result;
+    }
+
+    private JSONObject createInternalErrorResponse(String msg) {
+        JSONObject result = new JSONObject();
+        result.put("result", "E0001");
+        result.put("message", Base64.getEncoder().encodeToString(msg.getBytes(StandardCharsets.UTF_8)));
+        return result;
+    }
+
+    @Override
+    public String getInvoiceHtml(String busNo) {
+        JSONObject bill = invoiceDataMap.get(busNo);
+        if (bill == null) {
+            return "<html><body><h2>未找到流水号为 " + busNo + " 的发票数据</h2></body></html>";
+        }
+
+        JSONObject receiptData = bill.getJSONObject("receiptData");
+        
+        VelocityContext context = new VelocityContext();
+        context.put("hospitalName", receiptData != null ? receiptData.getString("fixmedinsName") : "HIS 医疗机构");
+        context.put("patientName", bill.getString("payer"));
+        context.put("outpatientNo", receiptData != null ? receiptData.getString("regNo") : bill.getString("busNo"));
+        context.put("idCard", bill.getString("cardNo"));
+        context.put("tel", bill.getString("tel"));
+        context.put("deptName", bill.getString("patientCategory"));
+        context.put("doctorName", receiptData != null ? receiptData.getString("doctor") : "-");
+        context.put("appointmentTime", bill.getString("consultationDate"));
+        context.put("totalAmt", bill.getString("totalAmt"));
+        context.put("busNo", busNo);
+        context.put("printTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+
+        List<Map<String, Object>> items = new ArrayList<>();
+        if (receiptData != null && receiptData.containsKey("chargeItem")) {
+            com.alibaba.fastjson2.JSONArray chargeItems = receiptData.getJSONArray("chargeItem");
+            for (int i = 0; i < chargeItems.size(); i++) {
+                JSONObject item = chargeItems.getJSONObject(i);
+                Map<String, Object> itemMap = new HashMap<>();
+                itemMap.put("chargeItemName", item.getString("chargeItemName"));
+                itemMap.put("quantityValue", item.getString("quantityValue"));
+                itemMap.put("totalPrice", item.getString("totalPrice"));
+                items.add(itemMap);
             }
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+        } else {
+            Map<String, Object> itemMap = new HashMap<>();
+            itemMap.put("chargeItemName", "挂号费");
+            itemMap.put("quantityValue", "1");
+            itemMap.put("totalPrice", bill.getString("totalAmt"));
+            items.add(itemMap);
+        }
+        context.put("items", items);
+
+        try {
+            Template template = Velocity.getTemplate("vm/invoice/invoice.vm");
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+            return writer.toString();
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new ServiceException("Http请求异常，请稍后再试。");
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (IOException e) {
-                    // logger.error("关闭响应异常", e);
-                    throw new ServiceException("未关闭系统资源：" + e.getStackTrace());
-                }
+            log.error("渲染发票模板失败", e);
+            return "<html><body><h2>渲染发票凭条失败：" + e.getMessage() + "</h2></body></html>";
+        }
+    }
+
+    public JSONObject PreInvoicePostForward(JSONObject bill, String endpoint) {
+        // 参考补打小票逻辑，动态获取小票详细信息
+        Long paymentId = bill.getLong("paymentId");
+        if (paymentId != null) {
+            try {
+                Map<String, Object> receiptDetail = chargeBillService.getDetail(paymentId);
+                bill.put("receiptData", receiptDetail);
+                log.info("已成功获取并注入小票动态数据，paymentId: {}", paymentId);
+            } catch (Exception e) {
+                log.error("获取小票数据失败，paymentId: {}", paymentId, e);
             }
         }
-        return JSONObject.parseObject(resultString);
+
+        // 内部调用逻辑：不再使用 Http 客户端，直接分发到本地逻辑
+        String busNo = bill.getString("busNo");
+        if (busNo != null) {
+            invoiceDataMap.put(busNo, bill);
+        }
+
+        JSONObject internalResult;
+        if (endpoint.contains("invEBillRegistration")) {
+            internalResult = internalRegistration(bill);
+        } else if (endpoint.contains("invoiceEBillOutpatient")) {
+            internalResult = internalOutpatient(bill);
+        } else if (endpoint.contains("invEBillHospitalized")) {
+            internalResult = internalHospitalized(bill);
+        } else if (endpoint.contains("writeOffEBill")) {
+            internalResult = internalWriteOff(bill);
+        } else {
+            internalResult = createInternalErrorResponse("未知接口: " + endpoint);
+        }
+
+        JSONObject finalResponse = new JSONObject();
+        finalResponse.put("success", true);
+        finalResponse.put("result", internalResult);
+        return finalResponse;
     }
 
     /**
-     * 发送请求
+     * 发送请求 (内部调用版本)
      *
      * @param bill 请求参数
      * @param endpoint 请求后缀url
      * @return 返回值
      */
-    public static JSONObject PreInvoicePost(JSONObject bill, String endpoint) {
-
-        JSONObject result = new JSONObject();
-        // 获取当前租户的option信息
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-
-        String baseUrl = optionJson.getString(CommonConstants.Option.URL);
-        // 拼接成完整 URL（作为路径）
-        String cleanUrl = baseUrl + "/" + endpoint; // 确保用 "/" 分隔
-        String url = cleanUrl.trim().replaceAll("^\"|\"$", "") // 去除首尾引号
-                .replaceAll("\\s+", "")// 去除首尾引号
-                .replaceAll("\"", ""); // 去除中间引号
-
-        String appID = optionJson.getString(CommonConstants.Option.APP_ID);
-        String appKey = optionJson.getString(CommonConstants.Option.KEY);
-        String data = bill.toJSONString();
-        String version = "1.0";
-        // 请求随机标识 noise
-        String noise = UUID.randomUUID().toString();
-
-        data = Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8));
-
-        StringBuilder str = new StringBuilder();
-        str.append("appid=").append(appID);
-        str.append("&data=").append(data);
-        str.append("&noise=").append(noise);
-        str.append("&key=").append(appKey);
-        str.append("&version=").append(version);
-        String sign = DigestUtils.md5Hex(str.toString().getBytes(Charset.forName("UTF-8"))).toUpperCase();
-
-        Map<String, String> map = new HashMap<>();
-        map.put("appid", appID);
-        map.put("data", data);
-        map.put("noise", noise);
-        map.put("sign", sign);
-        map.put("version", version);
-
-        try {
-            HttpPost httpPost = new HttpPost(url);
-            CloseableHttpClient client = HttpClients.createDefault();
-            String respContent = null;
-            // 请求参数转JOSN字符串
-            StringEntity entity = new StringEntity(new ObjectMapper().writeValueAsString(map), "utf-8");
-            entity.setContentEncoding("UTF-8");
-            entity.setContentType("application/json");
-            httpPost.setEntity(entity);
-            HttpResponse resp = client.execute(httpPost);
-
-            if (resp.getStatusLine().getStatusCode() == 200) {
-                String rev = EntityUtils.toString(resp.getEntity());
-                // System.out.println("返回串--》"+rev);
-                Map resultData = new ObjectMapper().readValue(rev, Map.class);
-                String rdata = resultData.get("data").toString();
-                String rnoise = resultData.get("noise").toString();
-                // 1、拼接返回验签参数
-                StringBuilder str1 = new StringBuilder();
-                str1.append("appid=").append(appID);
-                str1.append("&data=").append(rdata);
-                str1.append("&noise=").append(rnoise);
-                str1.append("&key=").append(appKey);
-                str1.append("&version=").append(version);
-                // 3.MD5加密 生成sign
-                String rmd5 = DigestUtils.md5Hex(str1.toString().getBytes(Charset.forName("UTF-8"))).toUpperCase();
-                String rsign = resultData.get("sign").toString();
-                System.out.println("验签-》" + (StringUtils.equals(rsign, rmd5)));
-                String busData
-                        = new String(Base64.getDecoder().decode(resultData.get("data").toString()), StandardCharsets.UTF_8);
-                System.out.println("返回业务数据--》" + busData);
-                Map busDataMap = new ObjectMapper().readValue(busData, Map.class);
-                System.out
-                        .println("业务信息解密--》" + new String(Base64.getDecoder().decode(busDataMap.get("message").toString()),
-                                StandardCharsets.UTF_8));
-
-                JSONObject resobj = JSONObject.parseObject(busData);
-                result.put("success", true);
-                result.put("result", resobj);
-            } else {
-                result.put("msg", "web响应失败!");
-                result.put("success", false);
-            }
-        } catch (Exception e) {
-            result.put("msg", e.getMessage());
-            result.put("success", false);
-        }
-        return result;
-
+    public JSONObject PreInvoicePost(JSONObject bill, String endpoint) {
+        return PreInvoicePostForward(bill, endpoint);
     }
 
     /**
@@ -339,6 +374,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
 
             // --------------------请求业务参数 data--------------------START
             JSONObject bill = commomSet(patientInfo, paymentInfo, clinicSettle);
+            bill.put("paymentId", paymentId);
 
             // ------票据信息------
             // busType 业务标识 String 20 是 06，标识挂号
@@ -580,6 +616,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
 
             // --------------------请求业务参数 data--------------------START
             JSONObject bill = commomSet(patientInfo, paymentInfo, clinicSettle);
+            bill.put("paymentId", paymentId);
 
             // ------票据信息------
             // busType 业务标识 String 20 是 直接填写业务系统内部编码值，由医疗平台配置对照，例如：附录5 业务标识列表
@@ -890,6 +927,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
 
             // --------------------请求业务参数 data--------------------START
             JSONObject bill = commomSet(patientInfo, paymentInfo, clinicSettle);
+            bill.put("paymentId", paymentId);
 
             // ------票据信息------
             // busType 业务标识 String 20 是 直接填写业务系统内部编码值，由医疗平台配置对照，例如：附录5 业务标识列表

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java

@@ -1818,6 +1818,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 保存就诊信息
         Encounter encounter = new Encounter();
         BeanUtils.copyProperties(encounterFormData, encounter);
+        // 将挂号医生ID提前塞入 encounter 的 registrarId，便于生成“科室+医生+当日”序号
+        if (encounterParticipantFormData.getPractitionerId() != null) {
+            encounter.setRegistrarId(encounterParticipantFormData.getPractitionerId());
+        }
         encounter.setBusNo(outpatientRegistrationSettleParam.getBusNo());
         // 就诊ID
         Long encounterId = iEncounterService.saveEncounterByRegister(encounter);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java

@@ -41,22 +41,23 @@ public class EleInvoiceController {
     public R<?> invoiceReissue(@RequestBody MakeInvoiceDto makeInvoiceDto) {
         // 付款成功后，开具发票
         R<?> result = eleInvoiceService.invoiceReissue(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
+        R<?> eleResult = null;
         if (result.getCode() == 200) {
             if (result.getData() == YbEncounterClass.REG.getValue()) {
                 // 付款成功后，开具发票
-                R<?> eleResult = eleInvoiceService.invoiceRegMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
+                eleResult = eleInvoiceService.invoiceRegMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
                 if (eleResult.getCode() != 200) {
                     return R.ok(" 挂号电子发票开具失败 :" + eleResult.getMsg());
                 }
             } else if (result.getData() == YbEncounterClass.AMB.getValue()) {
                 // 付款成功后，开具发票
-                R<?> eleResult = eleInvoiceService.invoiceMZMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
+                eleResult = eleInvoiceService.invoiceMZMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
                 if (eleResult.getCode() != 200) {
                     return R.ok(" 门诊电子发票开具失败 :" + eleResult.getMsg());
                 }
             } else if (result.getData() == YbEncounterClass.IMP.getValue()) {
                 // 付款成功后，开具发票
-                R<?> eleResult = eleInvoiceService.invoiceZYMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
+                eleResult = eleInvoiceService.invoiceZYMake(makeInvoiceDto.getPaymentId(), makeInvoiceDto.getEncounterId());
                 if (eleResult.getCode() != 200) {
                     return R.ok(" 住院电子发票开具失败 :" + eleResult.getMsg());
                 }
@@ -64,7 +65,11 @@ public class EleInvoiceController {
                 return R.ok("电子发票类型不明确！");
             }
         }
-        Map detail = iChargeBillService.getDetail(makeInvoiceDto.getPaymentId());
+        Map<String, Object> detail = iChargeBillService.getDetail(makeInvoiceDto.getPaymentId());
+        if (eleResult != null && eleResult.getCode() == 200 && eleResult.getData() instanceof Invoice) {
+            Invoice invoice = (Invoice) eleResult.getData();
+            detail.put("pictureUrl", invoice.getPictureUrl());
+        }
         return R.ok(detail);
     }
 
@@ -95,10 +100,18 @@ public class EleInvoiceController {
     public R<?> invoiceOpen(@RequestParam("invoiceId") String invoiceId) {
         // 退款成功后，开具发票
         Invoice invoice = eleInvoiceService.getInvoiceById(Long.parseLong(invoiceId));
-        if(invoice ==null){
+        if (invoice == null) {
             throw new ServiceException("未查询到发票信息");
         }
         return R.ok(invoice.getPictureUrl());
     }
 
+    /**
+     * 获取发票HTML凭条预览
+     */
+    @GetMapping(value = "/view", produces = "text/html;charset=UTF-8")
+    @ResponseBody
+    public String viewInvoice(@RequestParam("busNo") String busNo) {
+        return eleInvoiceService.getInvoiceHtml(busNo);
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java

@@ -6,6 +6,7 @@ package com.openhis.web.paymentmanage.controller;
 import com.core.common.core.domain.R;
 import com.core.common.enums.TenantOptionDict;
 import com.core.web.util.TenantOptionUtil;
+import com.openhis.administration.domain.Invoice;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
@@ -92,10 +93,12 @@ public class PaymentReconciliationController {
                 if (eleResult.getCode() != 200) {
                     // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                     return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+                } else if (eleResult.getData() instanceof Invoice) {
+                    Invoice invoice = (Invoice) eleResult.getData();
+                    detail.put("pictureUrl", invoice.getPictureUrl());
                 }
+                return R.ok(detail);
             }
-
-            // Map detail = iChargeBillService.getDetail(paymentRecon.getId());
         }
         return result;
     }
@@ -194,7 +197,11 @@ public class PaymentReconciliationController {
                 if (eleResult.getCode() != 200) {
                     // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                     return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+                } else if (eleResult.getData() instanceof Invoice) {
+                    Invoice invoice = (Invoice) eleResult.getData();
+                    detail.put("pictureUrl", invoice.getPictureUrl());
                 }
+                return R.ok(detail);
             }
         }
         return result;
@@ -233,6 +240,9 @@ public class PaymentReconciliationController {
             if (eleResult.getCode() != 200) {
                 // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                 return R.ok(detail, " 收费成功，电子发票开具失败 :" + eleResult.getMsg());
+            } else if (eleResult.getData() instanceof Invoice) {
+                Invoice invoice = (Invoice) eleResult.getData();
+                detail.put("pictureUrl", invoice.getPictureUrl());
             }
             return R.ok(detail);
         }
@@ -260,8 +270,9 @@ public class PaymentReconciliationController {
                 // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                 return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
             }
+            return R.ok("取消结算成功");
         }
-        return R.ok("取消结算失败，请确认");
+        return R.fail("取消结算失败，请确认");
     }
 
     /**

openhis-server-new/openhis-application/src/main/resources/i18n/messages_zh_CN.properties

@@ -0,0 +1,55 @@
+#\u9519\u8BEF\u6D88\u606F
+not.null=* \u5FC5\u987B\u586B\u5199
+user.jcaptcha.error=\u9A8C\u8BC1\u7801\u9519\u8BEF
+user.jcaptcha.expire=\u9A8C\u8BC1\u7801\u5DF2\u5931\u6548
+user.not.exists=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
+user.password.not.match=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
+user.password.retry.limit.count=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21
+user.password.retry.limit.exceed=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F
+user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88AB\u5220\u9664
+user.blocked=\u7528\u6237\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+login.blocked=\u5F88\u9057\u61BE\uFF0C\u8BBF\u95EEIP\u5DF2\u88AB\u5217\u5165\u7CFB\u7EDF\u9ED1\u540D\u5355
+user.logout.success=\u9000\u51FA\u6210\u529F
+length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4
+user.username.not.valid=* 2\u523020\u4E2A\u6C49\u5B57\u3001\u5B57\u6BCD\u3001\u6570\u5B57\u6216\u4E0B\u5212\u7EBF\u7EC4\u6210\uFF0C\u4E14\u5FC5\u987B\u4EE5\u975E\u6570\u5B57\u5F00\u5934
+user.password.not.valid=* 5-50\u4E2A\u5B57\u7B26
+user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF
+user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF
+user.login.success=\u767B\u5F55\u6210\u529F
+user.register.success=\u6CE8\u518C\u6210\u529F
+user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55
+user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55
+user.unknown.error=\u672A\u77E5\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55
+##\u6587\u4EF6\u4E0A\u4F20\u6D88\u606F
+upload.exceed.maxSize=\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F\u8D85\u51FA\u9650\u5236\u7684\u6587\u4EF6\u5927\u5C0F\uFF01<br/>\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u5927\u5C0F\u662F\uFF1A{0}MB\uFF01
+upload.filename.exceed.length=\u4E0A\u4F20\u7684\u6587\u4EF6\u540D\u6700\u957F{0}\u4E2A\u5B57\u7B26
+##\u6743\u9650
+no.permission=\u60A8\u6CA1\u6709\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.create.permission=\u60A8\u6CA1\u6709\u521B\u5EFA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.update.permission=\u60A8\u6CA1\u6709\u4FEE\u6539\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+apl.common.M00001={0}\u6DFB\u52A0\u6210\u529F
+apl.common.M00002={0}\u4FDD\u5B58\u6210\u529F
+apl.common.M00003={0}\u5DF2\u7ECF\u5B58\u5728
+apl.common.M00004={0}\u64CD\u4F5C\u6210\u529F
+apl.common.M00005={0}\u5220\u9664\u6210\u529F
+apl.common.M00006=\u64CD\u4F5C\u5931\u8D25,\u8BE5\u6570\u636E\u5DF2\u88AB\u4ED6\u4EBA\u5220\u9664,\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5
+apl.common.M00007=\u64CD\u4F5C\u5931\u8D25,\u8BE5\u6570\u636E\u5DF2\u88AB\u4ED6\u4EBA\u66F4\u6539,\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5
+apl.common.M00008=\u8BF7\u52FF\u91CD\u590D\u63D0\u4EA4
+apl.common.M00009=\u67E5\u8BE2\u6210\u529F
+apl.common.M00010=\u64CD\u4F5C\u5931\u8D25,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+apl.chargeRefund.M00001=\u8BE5\u6536\u8D39\u5355\u76F8\u5173{0}\u5DF2\u7ECF\u53D1\u51FA\uFF0C\u8BF7\u5148\u9000\u836F\u540E\u518D\u8FDB\u884C\u9000\u8D39
+apl.payment.M00001=\u5404\u7F34\u8D39\u6E20\u9053\u5B9E\u6536\u91D1\u989D\u5408\u8BA1\u4E0D\u7B49\u4E8E\u5B9E\u6536\u91D1\u989D
+apl.payment.M00002=\u5B9E\u6536\u91D1\u989D\u5408\u8BA1\u4E0D\u7B49\u4E8E\u5E94\u6536\u91D1\u989D
+apl.payment.M00003=\u8BF7\u9009\u62E9\u652F\u4ED8\u65B9\u5F0F
+apl.payment.M00004=\u67E5\u8BE2\u6210\u529F
+apl.payment.M00005=\u64CD\u4F5C\u5931\u8D25,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+apl.payment.M00006=\u6210\u529F\u6536\u8D39
+apl.payment.M00007=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE
+apl.payment.M00008=\u672A\u67E5\u8BE2\u5230{0}\u8D26\u6237\u4FE1\u606F
+apl.payment.M00009=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE\uFF0C\u4E0D\u9700\u8981\u8F6C\u6362\u8D26\u6237
+apl.adjustPrice.M00001=\u6267\u884C\u5931\u8D25\uFF0C\u672A\u52A0\u8F7D\u5230\u4EFB\u4F55\u6570\u636E\uFF01
+apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml

@@ -44,32 +44,34 @@
     </select>
 
     <select id="getCurrentDayEncounter" resultType="com.openhis.web.chargemanage.dto.CurrentDayEncounterDto">
-        SELECT T9.tenant_id,
-               T9.encounter_id,
-               T9.organization_id,
-               T9.organization_name,
-               T9.healthcare_name,
-               T9.practitioner_user_id,
-               T9.practitioner_name,
-               T9.contract_name,
-               T9.patient_id,
-               T9.patient_name,
+        SELECT T9.tenant_id AS tenantId,
+               T9.encounter_id AS encounterId,
+               T9.display_order AS displayOrder,
+               T9.organization_id AS organizationId,
+               T9.organization_name AS organizationName,
+               T9.healthcare_name AS healthcareName,
+               T9.practitioner_user_id AS practitionerUserId,
+               T9.practitioner_name AS practitionerName,
+               T9.contract_name AS contractName,
+               T9.patient_id AS patientId,
+               T9.patient_name AS patientName,
                T9.phone,
-               T9.gender_enum,
-               T9.id_card,
-               T9.status_enum,
-               T9.register_time,
-               T9.total_price,
-               T9.account_name,
-               T9.enterer_name,
-               T9.charge_item_ids,
-               T9.payment_id,
-               T9.picture_url,
-               T9.birth_date,
-               T9.identifier_no
+               T9.gender_enum AS genderEnum,
+               T9.id_card AS idCard,
+               T9.status_enum AS statusEnum,
+               T9.register_time AS registerTime,
+               T9.total_price AS totalPrice,
+               T9.account_name AS accountName,
+               T9.enterer_name AS entererName,
+               T9.charge_item_ids AS chargeItemIds,
+               T9.payment_id AS paymentId,
+               T9.picture_url AS pictureUrl,
+               T9.birth_date AS birthDate,
+               COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
+                        T1.display_order   AS display_order,
                         T1.organization_id AS organization_id,
                         T2.NAME            AS organization_name,
                         T3.NAME            AS healthcare_name,
@@ -90,6 +92,7 @@
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
                         T8.birth_date      AS birth_date,
+                        T8.bus_no          AS patient_bus_no,
                         T18.identifier_no  AS identifier_no
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
@@ -129,6 +132,8 @@
                                          ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
                                   FROM adm_patient_identifier
                                   WHERE delete_flag = '0'
+                                    AND identifier_no IS NOT NULL
+                                    AND identifier_no != ''
                              ) t
                              WHERE rn = 1
                           ) AS T18 ON T8.id = T18.patient_id

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -43,207 +43,247 @@
         abi.restricted_scope,
         abi.dosage_instruction,
         abi.chrgitm_lv
-        from (
-        <if test="adviceTypes == null or adviceTypes.contains(1)">
-            (SELECT
-            DISTINCT ON (T1.ID)
-            T1.tenant_id,
-            1 AS advice_type,
-            T1.bus_no AS bus_no,
-            T1.category_code AS category_code,
-            T1.pharmacology_category_code AS pharmacology_category_code,
-            T1.part_percent AS part_percent,
-            T1.unit_conversion_ratio AS unit_conversion_ratio,
-            T1.part_attribute_enum AS part_attribute_enum,
-            T1.tho_part_attribute_enum AS tho_part_attribute_enum,
-            T1.skin_test_flag AS skin_test_flag,
-            T1.inject_flag AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            T1.merchandise_name AS product_name,
-            0 AS activity_type,
-            T1.unit_code AS unit_code,
-            T1.min_unit_code AS min_unit_code,
-            T2.total_volume AS volume,
-            T2.method_code AS method_code,
-            T2.rate_code AS rate_code,
-            T2.org_id AS org_id,
-            T2.location_id AS location_id,
-            CAST(T2.dose AS TEXT) AS dose,
-            T2.dose_unit_code AS dose_unit_code,
-            T3.NAME AS supplier,
-            T3.id AS supplier_id,
-            T1.manufacturer_text AS manufacturer,
-            T5.id AS charge_item_definition_id,
-            T5.instance_table AS advice_table_name,
-            T6.def_location_id AS position_id,
-            t1.restricted_flag AS restricted_flag,
-            t1.restricted_scope AS restricted_scope,
-            T1.dosage_instruction AS dosage_instruction,
-            T1.chrgitm_lv as chrgitm_lv
-            FROM med_medication_definition AS t1
-            INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
-            AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-            LEFT JOIN adm_supplier AS T3
-            ON T3.ID = T1.supply_id
-            AND T3.delete_flag = '0'
-            LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
-            AND T5.delete_flag = '0' AND T5.status_enum = #{statusEnum}
-            LEFT JOIN adm_organization_location AS T6
-            ON T6.distribution_category_code = T1.category_code
-            AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND
-            (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
-            WHERE T1.delete_flag = '0'
-            AND T2.status_enum = #{statusEnum}
-            <if test="pricingFlag ==1">
-                AND 1 = 2
+        FROM (
+        <!-- 确保至少有一个查询被执行以避免语法错误 -->
+        <if test="adviceTypes != null and !adviceTypes.isEmpty() and (adviceTypes.contains(1) or adviceTypes.contains(2) or adviceTypes.contains(3))">
+            <!-- 如果有有效的adviceTypes，则执行对应的查询 -->
+            <if test="adviceTypes.contains(1)">
+                (SELECT
+                DISTINCT ON (T1.ID)
+                T1.tenant_id,
+                1 AS advice_type,
+                T1.bus_no AS bus_no,
+                T1.category_code AS category_code,
+                T1.pharmacology_category_code AS pharmacology_category_code,
+                T1.part_percent AS part_percent,
+                T1.unit_conversion_ratio AS unit_conversion_ratio,
+                T1.part_attribute_enum AS part_attribute_enum,
+                T1.tho_part_attribute_enum AS tho_part_attribute_enum,
+                T1.skin_test_flag AS skin_test_flag,
+                T1.inject_flag AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                T1.merchandise_name AS product_name,
+                0 AS activity_type,
+                T1.unit_code AS unit_code,
+                T1.min_unit_code AS min_unit_code,
+                T2.total_volume AS volume,
+                T2.method_code AS method_code,
+                T2.rate_code AS rate_code,
+                T2.org_id AS org_id,
+                T2.location_id AS location_id,
+                CAST(T2.dose AS TEXT) AS dose,
+                T2.dose_unit_code AS dose_unit_code,
+                T3.NAME AS supplier,
+                T3.id AS supplier_id,
+                T1.manufacturer_text AS manufacturer,
+                T5.id AS charge_item_definition_id,
+                T5.instance_table AS advice_table_name,
+                T6.def_location_id AS position_id,
+                t1.restricted_flag AS restricted_flag,
+                t1.restricted_scope AS restricted_scope,
+                T1.dosage_instruction AS dosage_instruction,
+                T1.chrgitm_lv as chrgitm_lv
+                FROM med_medication_definition AS t1
+                INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
+                AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+                LEFT JOIN adm_supplier AS T3
+                ON T3.ID = T1.supply_id
+                AND T3.delete_flag = '0'
+                LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
+                AND T5.delete_flag = '0' AND T5.status_enum = #{statusEnum}
+                LEFT JOIN adm_organization_location AS T6
+                ON T6.distribution_category_code = T1.category_code
+                AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND
+                (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
+                WHERE T1.delete_flag = '0'
+                AND T2.status_enum = #{statusEnum}
+                <if test="pricingFlag ==1">
+                    AND 1 = 2
+                </if>
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T5.instance_table = #{medicationTableName}
+                )
+                <if test="adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
             </if>
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
+
+            <if test="adviceTypes.contains(2)">
+                (SELECT
+                DISTINCT ON (T1.ID)
+                T1.tenant_id,
+                2 AS advice_type,
+                T1.bus_no AS bus_no,
+                T1.category_code AS category_code,
+                '' AS pharmacology_category_code,
+                T1.part_percent AS part_percent,
+                0 AS unit_conversion_ratio,
+                null AS part_attribute_enum,
+                null AS tho_part_attribute_enum,
+                null AS skin_test_flag,
+                null AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                '' AS product_name,
+                0 AS activity_type,
+                T1.unit_code AS unit_code,
+                T1.min_unit_code AS min_unit_code,
+                T1.SIZE AS volume,
+                '' AS method_code,
+                '' AS rate_code,
+                T1.org_id AS org_id,
+                T1.location_id AS location_id,
+                '' AS dose,
+                '' AS dose_unit_code,
+                T2.NAME AS supplier,
+                T2.id AS supplier_id,
+                T1.manufacturer_text AS manufacturer,
+                T4.id AS charge_item_definition_id,
+                T4.instance_table AS advice_table_name,
+                T5.def_location_id AS position_id,
+                0 AS restricted_flag,
+                '' AS restricted_scope,
+                '' AS dosage_instruction,
+                T1.chrgitm_lv as chrgitm_lv
+                FROM adm_device_definition AS T1
+                LEFT JOIN adm_supplier AS T2
+                ON T2.ID = T1.supply_id
+                AND T2.delete_flag = '0'
+                LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
+                AND T4.delete_flag = '0' AND T4.status_enum = #{statusEnum}
+                LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
+                AND T5.delete_flag = '0' AND T5.item_code = '2' AND T5.organization_id = #{organizationId} AND
+                (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
+                WHERE T1.delete_flag = '0'
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T4.instance_table = #{deviceTableName}
+                AND T1.status_enum = #{statusEnum}
+                )
+                <if test="adviceTypes.contains(3)">UNION ALL</if>
+            </if>
+
+            <if test="adviceTypes.contains(3)">
+                (SELECT
+                DISTINCT ON (T1.ID)
+                T1.tenant_id,
+                3 AS advice_type,
+                T1.bus_no AS bus_no,
+                T1.category_code AS category_code,
+                '' AS pharmacology_category_code,
+                1 AS part_percent,
+                0 AS unit_conversion_ratio,
+                null AS part_attribute_enum,
+                null AS tho_part_attribute_enum,
+                null AS skin_test_flag,
+                null AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                '' AS product_name,
+                T1.type_enum AS activity_type,
+                '' AS unit_code,
+                '' AS min_unit_code,
+                '' AS volume,
+                '' AS method_code,
+                '' AS rate_code,
+                T1.org_id AS org_id,
+                T1.location_id AS location_id,
+                '' AS dose,
+                '' AS dose_unit_code,
+                '' AS supplier,
+                null AS supplier_id,
+                '' AS manufacturer,
+                T2.ID AS charge_item_definition_id,
+                T2.instance_table AS advice_table_name,
+                T3.organization_id AS position_id,
+                0 AS restricted_flag,
+                '' AS restricted_scope,
+                '' AS dosage_instruction,
+                T1.chrgitm_lv as chrgitm_lv
+                FROM wor_activity_definition AS T1
+                LEFT JOIN adm_charge_item_definition AS T2
+                ON T2.instance_id = T1.ID
+                AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+                AND T2.instance_table = #{activityTableName}
+                LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
+                AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
+                WHERE T1.delete_flag = '0'
+                <if test="pricingFlag ==1">
+                    AND (T1.pricing_flag = #{pricingFlag} OR T1.pricing_flag IS NULL)
+                </if>
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T1.status_enum = #{statusEnum}
+                )
             </if>
-            AND T5.instance_table = #{medicationTableName}
-            )
         </if>
-
-
-        <if test="adviceTypes == null or adviceTypes.contains(1)">
-            <if test="adviceTypes == null or adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
-        </if>
-
-        <if test="adviceTypes == null or adviceTypes.contains(2)">
-            (SELECT
-            DISTINCT ON (T1.ID)
-            T1.tenant_id,
-            2 AS advice_type,
-            T1.bus_no AS bus_no,
-            T1.category_code AS category_code,
-            '' AS pharmacology_category_code,
-            T1.part_percent AS part_percent,
-            0 AS unit_conversion_ratio,
-            null AS part_attribute_enum,
-            null AS tho_part_attribute_enum,
-            null AS skin_test_flag,
-            null AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            '' AS product_name,
-            0 AS activity_type,
-            T1.unit_code AS unit_code,
-            T1.min_unit_code AS min_unit_code,
-            T1.SIZE AS volume,
-            '' AS method_code,
-            '' AS rate_code,
-            T1.org_id AS org_id,
-            T1.location_id AS location_id,
-            '' AS dose,
-            '' AS dose_unit_code,
-            T2.NAME AS supplier,
-            T2.id AS supplier_id,
-            T1.manufacturer_text AS manufacturer,
-            T4.id AS charge_item_definition_id,
-            T4.instance_table AS advice_table_name,
-            T5.def_location_id AS position_id,
-            0 AS restricted_flag,
-            '' AS restricted_scope,
-            '' AS dosage_instruction,
-            T1.chrgitm_lv as chrgitm_lv
-            FROM adm_device_definition AS T1
-            LEFT JOIN adm_supplier AS T2
-            ON T2.ID = T1.supply_id
-            AND T2.delete_flag = '0'
-            LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
-            AND T4.delete_flag = '0' AND T4.status_enum = #{statusEnum}
-            LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
-            AND T5.delete_flag = '0' AND T5.item_code = '2' AND T5.organization_id = #{organizationId} AND
-            (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
-            WHERE T1.delete_flag = '0'
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
-            </if>
-            AND T4.instance_table = #{deviceTableName}
-            AND T1.status_enum = #{statusEnum}
-            )
-        </if>
-
-
-        <if test="adviceTypes == null or adviceTypes.contains(2)">
-            <if test="adviceTypes == null or adviceTypes.contains(3)">UNION ALL</if>
-        </if>
-
-        <if test="adviceTypes == null or adviceTypes.contains(3)">
-            (SELECT
-            DISTINCT ON (T1.ID)
-            T1.tenant_id,
-            3 AS advice_type,
-            T1.bus_no AS bus_no,
-            T1.category_code AS category_code,
-            '' AS pharmacology_category_code,
-            1 AS part_percent,
-            0 AS unit_conversion_ratio,
-            null AS part_attribute_enum,
-            null AS tho_part_attribute_enum,
-            null AS skin_test_flag,
-            null AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            '' AS product_name,
-            T1.type_enum AS activity_type,
-            '' AS unit_code,
-            '' AS min_unit_code,
-            '' AS volume,
-            '' AS method_code,
-            '' AS rate_code,
-            T1.org_id AS org_id,
-            T1.location_id AS location_id,
-            '' AS dose,
-            '' AS dose_unit_code,
-            '' AS supplier,
-            null AS supplier_id,
-            '' AS manufacturer,
-            T2.ID AS charge_item_definition_id,
-            T2.instance_table AS advice_table_name,
-            T3.organization_id AS position_id,
-            0 AS restricted_flag,
-            '' AS restricted_scope,
-            '' AS dosage_instruction,
-            T1.chrgitm_lv as chrgitm_lv
-            FROM wor_activity_definition AS T1
-            LEFT JOIN adm_charge_item_definition AS T2
-            ON T2.instance_id = T1.ID
-            AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-            LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
-            AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
-            WHERE T1.delete_flag = '0'
-            <if test="pricingFlag ==1">
-                AND T1.pricing_flag = #{pricingFlag}
-            </if>
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
-            </if>
-            AND T1.status_enum = #{statusEnum}
-            AND T2.instance_table = #{activityTableName}
-            )
+        <!-- 如果没有有效的adviceTypes，提供一个空的默认查询以避免语法错误 -->
+        <if test="adviceTypes == null or adviceTypes.isEmpty() or (!adviceTypes.contains(1) and !adviceTypes.contains(2) and !adviceTypes.contains(3))">
+            SELECT
+                mmd.tenant_id,
+                CAST(0 AS INTEGER) AS advice_type,
+                CAST('' AS VARCHAR) AS bus_no,
+                CAST('' AS VARCHAR) AS category_code,
+                CAST('' AS VARCHAR) AS pharmacology_category_code,
+                CAST(0 AS NUMERIC) AS part_percent,
+                CAST(0 AS NUMERIC) AS unit_conversion_ratio,
+                CAST(0 AS INTEGER) AS part_attribute_enum,
+                CAST(0 AS INTEGER) AS tho_part_attribute_enum,
+                CAST(0 AS INTEGER) AS skin_test_flag,
+                CAST(0 AS INTEGER) AS inject_flag,
+                CAST(0 AS BIGINT) AS advice_definition_id,
+                CAST('' AS VARCHAR) AS advice_name,
+                CAST('' AS VARCHAR) AS advice_bus_no,
+                CAST('' AS VARCHAR) AS py_str,
+                CAST('' AS VARCHAR) AS wb_str,
+                CAST('' AS VARCHAR) AS yb_no,
+                CAST('' AS VARCHAR) AS product_name,
+                CAST(0 AS INTEGER) AS activity_type,
+                CAST('' AS VARCHAR) AS unit_code,
+                CAST('' AS VARCHAR) AS min_unit_code,
+                CAST(0 AS NUMERIC) AS volume,
+                CAST('' AS VARCHAR) AS method_code,
+                CAST('' AS VARCHAR) AS rate_code,
+                CAST(0 AS BIGINT) AS org_id,
+                CAST(0 AS BIGINT) AS location_id,
+                CAST('' AS VARCHAR) AS dose,
+                CAST('' AS VARCHAR) AS dose_unit_code,
+                CAST('' AS VARCHAR) AS supplier,
+                CAST(0 AS BIGINT) AS supplier_id,
+                CAST('' AS VARCHAR) AS manufacturer,
+                CAST(0 AS BIGINT) AS charge_item_definition_id,
+                CAST('' AS VARCHAR) AS advice_table_name,
+                CAST(0 AS BIGINT) AS position_id,
+                CAST(0 AS INTEGER) AS restricted_flag,
+                CAST('' AS VARCHAR) AS restricted_scope,
+                CAST('' AS VARCHAR) AS dosage_instruction,
+                CAST(0 AS INTEGER) AS chrgitm_lv
+            FROM med_medication_definition mmd
+            WHERE 1 = 0  -- 仍然确保不返回任何行，但使用真实表确保类型正确
         </if>
         ) AS abi
         ${ew.customSqlSegment}

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml

@@ -23,7 +23,8 @@
         T10.reception_time,
         T10.practitioner_user_id,
         T10.jz_practitioner_user_id,
-        T10.bus_no
+        T10.bus_no,
+        T10.identifier_no
         from
         (
         SELECT T1.tenant_id AS tenant_id,
@@ -48,7 +49,8 @@
         T1.create_time AS register_time,
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
-        T8.bus_no AS bus_no
+        T8.bus_no AS bus_no,
+        T9.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'
@@ -67,6 +69,20 @@
         LEFT JOIN adm_account AS T6 ON T1.ID = T6.encounter_id AND T6.delete_flag = '0' and T6.encounter_flag = '1'
         LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no AND T7.delete_flag = '0'
         LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID AND T8.delete_flag = '0'
+        LEFT JOIN (
+           SELECT patient_id,
+                  identifier_no
+           FROM (
+                SELECT patient_id,
+                       identifier_no,
+                       ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+                FROM adm_patient_identifier
+                WHERE delete_flag = '0'
+                  AND identifier_no IS NOT NULL
+                  AND identifier_no != ''
+           ) t
+           WHERE rn = 1
+        ) AS T9 ON T8.id = T9.patient_id
         WHERE
         T1.delete_flag = '0'
         <!-- 当前登录账号ID 和 当前登录账号所属的科室ID 用于控制数据权限 -->

openhis-server-new/openhis-application/src/main/resources/vm/invoice/invoice.vm

@@ -0,0 +1,68 @@
+<html>
+<head>
+<style>
+body { font-family: 'Microsoft YaHei', sans-serif; width: 350px; margin: 0 auto; padding: 20px; border: 1px solid #ccc; background: #fff; }
+.header { text-align: center; }
+.hospital-name { font-size: 20px; font-weight: bold; margin-bottom: 5px; }
+.title { font-size: 16px; margin-bottom: 10px; }
+.time { font-size: 12px; color: #666; margin-bottom: 15px; }
+.section { border-top: 1px solid #000; padding-top: 10px; margin-top: 10px; }
+.section-title { font-weight: bold; text-decoration: underline; margin-bottom: 10px; font-size: 14px; }
+.item { display: flex; font-size: 13px; margin-bottom: 5px; }
+.label { width: 90px; color: #333; }
+.value { flex: 1; font-weight: 500; }
+table { width: 100%; border-collapse: collapse; margin-top: 10px; font-size: 13px; }
+th { text-align: left; border-bottom: 1px dashed #ccc; padding-bottom: 5px; color: #666; }
+td { padding: 5px 0; }
+.total { text-align: right; font-weight: bold; border-top: 1px solid #000; padding-top: 10px; margin-top: 10px; font-size: 15px; }
+.footer { margin-top: 20px; font-size: 11px; color: #666; line-height: 1.5; }
+.qr-code { text-align: center; margin-top: 15px; }
+.serial-no { text-align: left; margin-top: 10px; font-size: 12px; font-weight: bold; border-top: 1px dashed #ccc; padding-top: 10px; }
+</style>
+</head>
+<body>
+  <div class='header'>
+    <div class='hospital-name'>$hospitalName</div>
+    <div class='title'>门诊预约挂号凭条</div>
+    <div class='time'>打印时间：$printTime</div>
+  </div>
+  <div class='section'>
+    <div class='section-title'>患者基本信息</div>
+    <div class='item'><div class='label'>患者姓名：</div><div class='value'>$patientName</div></div>
+    <div class='item'><div class='label'>门诊号：</div><div class='value'>$outpatientNo</div></div>
+    <div class='item'><div class='label'>身份证号：</div><div class='value'>#if($idCard)$idCard#else-#end</div></div>
+    <div class='item'><div class='label'>联系电话：</div><div class='value'>#if($tel)$tel#else-#end</div></div>
+  </div>
+  <div class='section'>
+    <div class='section-title'>预约详情</div>
+    <div class='item'><div class='label'>就诊科室：</div><div class='value'>#if($deptName)$deptName#else-#end</div></div>
+    <div class='item'><div class='label'>医生姓名：</div><div class='value'>$doctorName</div></div>
+    <div class='item'><div class='label'>预约时间：</div><div class='value'>#if($appointmentTime)$appointmentTime#else-#end</div></div>
+    <div class='item'><div class='label'>就诊地点：</div><div class='value'>门诊大楼内</div></div>
+    <div class='item'><div class='label'>预约状态：</div><div class='value'><span style='color:green;'>☑ 已 预</span></div></div>
+  </div>
+  <div class='section'>
+    <div class='section-title'>费用信息</div>
+    <table>
+      <tr><th>项目</th><th>数量</th><th>单价</th><th>金额</th></tr>
+      #foreach($item in $items)
+      <tr>
+        <td>$item.chargeItemName</td>
+        <td>$item.quantityValue</td>
+        <td>¥$item.totalPrice</td>
+        <td>¥$item.totalPrice</td>
+      </tr>
+      #end
+    </table>
+    <div class='total'>合计：¥$totalAmt</div>
+    <div class='item' style='margin-top:10px;'><div class='label'>支付方式：</div><div class='value'>线上支付 (已支付)</div></div>
+  </div>
+  <div class='footer'>
+    温馨提示：请至少提前30分钟到达取号，过时自动取消。服务时间：8:00-17:00
+  </div>
+  <div class='qr-code'>
+    <img src='https://api.qrserver.com/v1/create-qr-code/?size=100x100&data=$busNo' width='100' height='100' />
+  </div>
+  <div class='serial-no'>流水号：$busNo</div>
+</body>
+</html>

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 (?, ?, ?,?, ?, ?, ?, ?,?, ?)";

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;

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OperatingRoom.java

@@ -1,9 +1,11 @@
 package com.openhis.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.LocationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,9 +33,19 @@ public class OperatingRoom extends HisBaseEntity {
     /** 手术室名称 */
     private String name;
 
+    /** 手术室类型 */
+    private Integer roomTypeEnum;
+
+    @TableField(exist = false)
+    private String roomTypeEnum_dictText;
+
     /** 所属机构ID */
     private Long organizationId;
 
+    /** 所属机构名称 */
+    @TableField(exist = false)
+    private String organizationName;
+
     /** 位置描述 */
     private String locationDescription;
 
@@ -55,6 +67,9 @@ public class OperatingRoom extends HisBaseEntity {
     /** 五笔码 */
     private String wbStr;
 
+    /** 备注 */
+    private String remark;
+
     public OperatingRoom() {
         this.statusEnum = LocationStatus.ACTIVE.getValue();
     }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java

@@ -44,8 +44,16 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
             // 生成就诊编码 医保挂号时是先生成码后生成实体
             encounter.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 4));
         }
-        // 生成就诊序号 (患者ID + 科室ID 作为当日就诊号的唯一标识)
-        String preFix = encounter.getPatientId() + String.valueOf(encounter.getOrganizationId());
+        // 生成就诊序号：
+        // 1) 若挂号医生已传入（registrarId 充当挂号医生 ID），按“科室+医生+当日”递增
+        //    Key 示例：ORG-123-DOC-456 -> 1、2、3...
+        // 2) 否则按“科室+当日”递增
+        String preFix;
+        if (encounter.getRegistrarId() != null) {
+            preFix = "ORG-" + encounter.getOrganizationId() + "-DOC-" + encounter.getRegistrarId();
+        } else {
+            preFix = "ORG-" + encounter.getOrganizationId();
+        }
         encounter.setDisplayOrder(assignSeqUtil.getSeqNoByDay(preFix));
         // 患者ID
         Long patientId = encounter.getPatientId();

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;
+}

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;
+}

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);
+}

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);
+}

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);
+}

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);
+}

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);
+    }
+}

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);
+    }
+}

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>

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>

openhis-server-new/openhis-einvoiceapp/pom.xml

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>openhis-server</artifactId>
-        <groupId>com.openhis</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>openhis-einvoiceapp</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-
-        <!-- 领域-->
-<!--        <dependency>-->
-<!--            <groupId>com.openhis</groupId>-->
-<!--            <artifactId>openhis-domain</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <!-- 共通-->
-        <dependency>
-            <groupId>com.openhis</groupId>
-            <artifactId>openhis-common</artifactId>
-        </dependency>
-
-        <!-- liteflow-->
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>liteflow-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>kernel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-        </dependency>
-
-        <!-- pdf依赖-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-        </dependency>
-
-    </dependencies>
-
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-war-plugin</artifactId>-->
-<!--                <version>${maven-war-plugin.version}</version>-->
-<!--                <configuration>-->
-<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
-<!--                    <warName>${project.artifactId}</warName>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--    </build>-->
-
-</project>

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

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

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">

openhis-ui-vue3/package-lock.json

@@ -33,6 +33,8 @@
         "pinia": "^2.2.0",
         "pinyin": "^4.0.0-alpha.2",
         "province-city-china": "^8.5.8",
+        "qrcode": "^1.5.4",
+        "qrcodejs2": "^0.0.2",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "segmentit": "^2.0.3",
@@ -2147,7 +2149,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -2557,6 +2558,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001761",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001761.tgz",
@@ -2704,6 +2714,38 @@
       "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
       "license": "MIT"
     },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
@@ -2731,7 +2773,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -2744,7 +2785,6 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/combined-stream": {
@@ -3458,6 +3498,15 @@
         }
       }
     },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decimal.js": {
       "version": "10.6.0",
       "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.6.0.tgz",
@@ -3569,6 +3618,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/dijkstrajs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
+      "license": "MIT"
+    },
     "node_modules/dom-serializer": {
       "version": "0.2.2",
       "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz",
@@ -3787,6 +3842,12 @@
         }
       }
     },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
     "node_modules/emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -4203,6 +4264,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.11",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.11.tgz",
@@ -4366,6 +4440,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -5046,6 +5129,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-generator-function": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.2.tgz",
@@ -5470,6 +5562,18 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
@@ -6133,6 +6237,42 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/pako": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
@@ -6192,6 +6332,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
@@ -6342,6 +6491,15 @@
         "pathe": "^2.0.1"
       }
     },
+    "node_modules/pngjs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -6487,6 +6645,29 @@
         "@province-city-china/types": "8.5.8"
       }
     },
+    "node_modules/qrcode": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
+      "license": "MIT",
+      "dependencies": {
+        "dijkstrajs": "^1.0.1",
+        "pngjs": "^5.0.0",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "qrcode": "bin/qrcode"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA==",
+      "license": "MIT"
+    },
     "node_modules/quansync": {
       "version": "0.2.11",
       "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.11.tgz",
@@ -6760,6 +6941,15 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -6769,6 +6959,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "license": "ISC"
+    },
     "node_modules/resolve": {
       "version": "1.22.11",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.11.tgz",
@@ -7079,6 +7275,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "license": "ISC"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -7571,6 +7773,41 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
       "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
@@ -8914,6 +9151,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "license": "ISC"
+    },
     "node_modules/which-typed-array": {
       "version": "1.1.19",
       "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz",
@@ -8936,6 +9179,47 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "license": "ISC"
+    },
     "node_modules/yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
@@ -8945,6 +9229,41 @@
         "node": ">= 6"
       }
     },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/zrender": {
       "version": "5.4.4",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",

openhis-ui-vue3/package.json

@@ -43,6 +43,8 @@
     "pinia": "^2.2.0",
     "pinyin": "^4.0.0-alpha.2",
     "province-city-china": "^8.5.8",
+    "qrcode": "^1.5.4",
+    "qrcodejs2": "^0.0.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "segmentit": "^2.0.3",

openhis-ui-vue3/public/help-center/404.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>经创HIS系统操作手册</title>
+    <meta name="generator" content="VuePress 1.9.9">
+    <link rel="icon" href="/help-center/img/favicon.ico">
+    <meta name="description" content="一个基于VuePress的 知识管理&amp;博客 主题">
+    <meta name="keywords" content="vuepress,theme,blog,vdoing">
+    <meta name="theme-color" content="#11a8cd">
+    
+    <link rel="preload" href="/help-center/assets/css/0.styles.d0b15ba0.css" as="style"><link rel="preload" href="/help-center/assets/js/app.c5ec5719.js" as="script"><link rel="preload" href="/help-center/assets/js/5.0104c3f3.js" as="script"><link rel="prefetch" href="/help-center/assets/js/2.06f4cb84.js"><link rel="prefetch" href="/help-center/assets/js/3.53c266dc.js"><link rel="prefetch" href="/help-center/assets/js/4.7364d667.js"><link rel="prefetch" href="/help-center/assets/js/6.17262a3a.js"><link rel="prefetch" href="/help-center/assets/js/7.016b634e.js"><link rel="prefetch" href="/help-center/assets/js/8.3cf21d73.js">
+    <link rel="stylesheet" href="/help-center/assets/css/0.styles.d0b15ba0.css">
+  </head>
+  <body class="theme-mode-light">
+    <div id="app" data-server-rendered="true"><div class="theme-container" data-v-439bb2a8><div class="theme-vdoing-content" data-v-439bb2a8><span data-v-439bb2a8>404</span> <blockquote data-v-439bb2a8>看来我们的链接坏掉了~</blockquote> <a href="/help-center/" class="router-link-active" data-v-439bb2a8>返回首页</a></div></div><div class="global-ui"></div></div>
+    <script src="/help-center/assets/js/app.c5ec5719.js" defer></script><script src="/help-center/assets/js/5.0104c3f3.js" defer></script>
+  </body>
+</html>

openhis-ui-vue3/public/help-center/assets/img/search.83621669.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"><g stroke-width="2" stroke="#aaa" fill="none"><path d="M11.29 11.71l-4-4"/><circle cx="5" cy="5" r="4"/></g></svg>

openhis-ui-vue3/public/help-center/assets/js/3.53c266dc.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[3],{316:function(t,n,s){},317:function(t,n,s){},354:function(t,n,s){"use strict";s(316)},355:function(t,n,s){"use strict";s(317)},362:function(t,n,s){"use strict";s.r(n);s(354),s(355);var i=s(15),r=Object(i.a)({},(function(){var t=this._self._c;return t("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}},[t("p",{attrs:{align:"center"}}),this._v(" "),t("br"),this._v(" "),t("p",{attrs:{align:"center"}}),this._v(" "),t("br"),this._v(" "),t("br"),this._v(" "),t("br"),this._v(" "),t("br")])}),[],!1,null,null,null);n.default=r.exports}}]);

openhis-ui-vue3/public/help-center/assets/js/4.7364d667.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{318:function(t,e,n){},356:function(t,e,n){"use strict";n(318)},363:function(t,e,n){"use strict";n.r(e);var i={functional:!0,props:{type:{type:String,default:"tip"},text:String,vertical:{type:String,default:"top"}},render:(t,{props:e,slots:n})=>t("span",{class:["badge",e.type],style:{verticalAlign:e.vertical}},e.text||n().default)},a=(n(356),n(15)),p=Object(a.a)(i,void 0,void 0,!1,null,"d5affa18",null);e.default=p.exports}}]);

openhis-ui-vue3/public/help-center/assets/js/5.0104c3f3.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[5],{284:function(t,s,n){},321:function(t,s,n){"use strict";n(284)},358:function(t,s,n){"use strict";n.r(s);const i=["这里什么都没有。","我是谁？我在哪？","这是一个Four-Oh-Four.","看来我们的链接坏掉了~"];var o={methods:{getMsg:()=>i[Math.floor(Math.random()*i.length)]}},e=(n(321),n(15)),a=Object(e.a)(o,(function(){var t=this._self._c;return t("div",{staticClass:"theme-container"},[t("div",{staticClass:"theme-vdoing-content"},[t("span",[this._v("404")]),this._v(" "),t("blockquote",[this._v(this._s(this.getMsg()))]),this._v(" "),t("router-link",{attrs:{to:"/"}},[this._v("返回首页")])],1)])}),[],!1,null,"439bb2a8",null);s.default=a.exports}}]);

openhis-ui-vue3/public/help-center/assets/js/6.17262a3a.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{359:function(t,n,s){"use strict";s.r(n);var e=s(15),o=Object(e.a)({},(function(){var t=this._self._c;return t("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}},[t("p",[this._v("这里描述的是HIS系统的模块职责描述页面1")])])}),[],!1,null,null,null);n.default=o.exports}}]);

openhis-ui-vue3/public/help-center/assets/js/7.016b634e.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[7],{360:function(t,n,s){"use strict";s.r(n);var e=s(15),o=Object(e.a)({},(function(){var t=this._self._c;return t("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}},[t("p",[this._v("这里是HIS操作手册的模块职责页面2")])])}),[],!1,null,null,null);n.default=o.exports}}]);

openhis-ui-vue3/public/help-center/assets/js/8.3cf21d73.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[8],{361:function(t,n,s){"use strict";s.r(n);var e=s(15),o=Object(e.a)({},(function(){return(0,this._self._c)("ContentSlotsDistributor",{attrs:{"slot-key":this.$parent.slotKey}})}),[],!1,null,null,null);n.default=o.exports}}]);

openhis-ui-vue3/public/help-center/blog/index.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>博客文章 | 经创HIS系统操作手册</title>
+    <meta name="generator" content="VuePress 1.9.9">
+    <link rel="icon" href="/help-center/img/favicon.ico">
+    <meta name="description" content="一个基于VuePress的 知识管理&amp;博客 主题">
+    <meta name="keywords" content="vuepress,theme,blog,vdoing">
+    <meta name="theme-color" content="#11a8cd">
+    
+    <link rel="preload" href="/help-center/assets/css/0.styles.d0b15ba0.css" as="style"><link rel="preload" href="/help-center/assets/js/app.c5ec5719.js" as="script"><link rel="preload" href="/help-center/assets/js/2.06f4cb84.js" as="script"><link rel="prefetch" href="/help-center/assets/js/3.53c266dc.js"><link rel="prefetch" href="/help-center/assets/js/4.7364d667.js"><link rel="prefetch" href="/help-center/assets/js/5.0104c3f3.js"><link rel="prefetch" href="/help-center/assets/js/6.17262a3a.js"><link rel="prefetch" href="/help-center/assets/js/7.016b634e.js"><link rel="prefetch" href="/help-center/assets/js/8.3cf21d73.js">
+    <link rel="stylesheet" href="/help-center/assets/css/0.styles.d0b15ba0.css">
+  </head>
+  <body class="theme-mode-light">
+    <div id="app" data-server-rendered="true"><div class="theme-container sidebar-open no-sidebar"><header class="navbar blur"><div title="目录" class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/help-center/" class="home-link router-link-active"><img src="/help-center/img/logo.png" alt="经创HIS系统操作手册" class="logo"> <span class="site-name can-hide">经创HIS系统操作手册</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <div class="sidebar-hover-trigger"></div> <aside class="sidebar" style="display:none;"><!----> <nav class="nav-links"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav>  <!----> </aside> <div class="custom-page archives-page"><div class="theme-vdoing-wrapper"><h1><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAABKFJREFUSA3tVl1oFVcQnrMbrak3QUgkya1akpJYcrUtIqW1JvFBE9LiQ5v6JmJpolbMg32rVrhgoYK0QiMY6i9Y6EMaW5D+xFJaTYItIuK2Kr3+BJNwkxBj05sQY3b3nM6cs2dv9t7NT/vQJw/sndk5M/PNzJkzewGerP+pAmy+ON8lLzUJgA8ZYxYIYZmGYRnctDaWvJJAmTtfP1pvXsBCCPP8QFcCaRkZYACgDZFO4stNIcBCajEOlmmC9XpJ9bAGCaPaPmzPl32dvLSVu3BWCTQs0XQQ6g0DYgwLIoAZbBCdW/i+781o1VVlm/410mw4h06Y7bIPHNyWDyL4FHkX03Q8SrzNhZTZriieckWt7cL6MM85YcLpsi/7O9/iXFT6MswI0DmmpkSaJ0qLxFIm3+i1THHB3zmBH3PYx9CcykcLOeQVVa7QtdxTgQgEleX2AjHYfwA+2ddV77ruGoJUbhGDI09YSNXyMpUt5ylOzxgbUmtOp7NmbNt8v3arjTBfYELmLUV+M+nSawNNAUqpT3ClJWg5I3BLT+cGW/DXNGCa6tx1aakCGEigArTn4TDIPdrXXYKCZNrHLMCOEPvHBlLQ99s9eHB7EB6NTki73CVPQ2F5MSx/uRQixfmq7rK0wYD8w8E905bnPDfwoWs/rfv93NWN/ZfvwsLIU7A09gxECyISeGJkHAau98L97tuw7NXnoPyNF8FcYGLGKsOs0mN3OEyec9esGW/ZEl945dTP34wlR2FZVQWU1q0Cw8Tr7p+hgLLNL0FPxx/Q35mA8aEUrH6nCgwEl0tn7wUiZYJnNRh6DK4UH/k0lfyrsBKdPVv/AriGIQcEDQZ65LBAGe2Rzui9Ybjz7XUppz1/uKBbyVPGkN3ZAeC6hr0x7Nr38N5+EqkoOm17xpoqR9ohQF55ERSvr4Dkr3chNfC3DMzGJlNBElW8w9nsGQvhNGIzDkXzCg8cLK951xHsFBlTJspJNi3ZFIMF2AeDV3q8DNOB+YHi6QTrChDIWDBRi5U5f+ZMfJLu3ccrqxtdxk4SKH336LFxSmkqefwU5T8fhdSdQf9IVKD6aNiwI/hnmcAZ91isYMJIaCUCx9W098+LgruikeTqzqqxKPUwqJyCPJiyemVVZBOijDGjD38Os0jOiSPL1z3SPjXNANbiNPXAdzTfukjjuknNBbyz3nwgTd3AVFqUJ5hpHlq9MveLnWwttUfoygBmvVjuikxND3znrhsELnZk7k+OjIGxeNEkomyLVta0xxn+HZhjBc4YZ/AFjHjz9u3xRZl2BN4aq9nFwWh16IrQ1aHHEd3j1+4/dB9OtH4e29A2H1DyHQRmOSfQZ1Fy7MHBTGB6J/Djq6p3OxyO2cB+4Car7v/o3GXgfAkj23+x9ID1Teoamo/SXcbvSf2PX7Vc8DdCmE1vN9di+32P9/5YR3vLnhCVGUWBjEkr3yh4H8v9CzmsbdhzOKzsJKM90iFdaTMjRPhGVsakRvOaRidljo6H6G7j+ctrJpsP+4COhDIl0La2+FS4+5mlocBaXY5QnGZysIBYoeSsl5qQzrSj/cgNrfuEzlWBfwA+EjrZyWUvpAAAAABJRU5ErkJggg==">
+      博客文章
+    </h1> <div class="count">
+      总共 <i>0</i> 篇文章
+    </div> <ul></ul></div></div> <div class="footer"><!----> 
+  Theme by
+  <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" title="本站主题">Vdoing</a> <!----></div> <div class="buttons"><div title="返回顶部" class="button blur go-to-top iconfont icon-fanhuidingbu" style="display:none;"></div> <div title="去评论" class="button blur go-to-comment iconfont icon-pinglun" style="display:none;"></div> <div title="主题模式" class="button blur theme-mode-but iconfont icon-zhuti"><ul class="select-box" style="display:none;"><li class="iconfont icon-zidong">
+          跟随系统
+        </li><li class="iconfont icon-rijianmoshi">
+          浅色模式
+        </li><li class="iconfont icon-yejianmoshi">
+          深色模式
+        </li><li class="iconfont icon-yuedu">
+          阅读模式
+        </li></ul></div></div> <!----> <!----> <!----></div><div class="global-ui"></div></div>
+    <script src="/help-center/assets/js/app.c5ec5719.js" defer></script><script src="/help-center/assets/js/2.06f4cb84.js" defer></script>
+  </body>
+</html>

openhis-ui-vue3/public/help-center/index.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>经创HIS系统操作手册</title>
+    <meta name="generator" content="VuePress 1.9.9">
+    <link rel="icon" href="/help-center/img/favicon.ico">
+    <meta name="description" content="一个基于VuePress的 知识管理&amp;博客 主题">
+    <meta name="keywords" content="vuepress,theme,blog,vdoing">
+    <meta name="theme-color" content="#11a8cd">
+    
+    <link rel="preload" href="/help-center/assets/css/0.styles.d0b15ba0.css" as="style"><link rel="preload" href="/help-center/assets/js/app.c5ec5719.js" as="script"><link rel="preload" href="/help-center/assets/js/2.06f4cb84.js" as="script"><link rel="preload" href="/help-center/assets/js/3.53c266dc.js" as="script"><link rel="prefetch" href="/help-center/assets/js/4.7364d667.js"><link rel="prefetch" href="/help-center/assets/js/5.0104c3f3.js"><link rel="prefetch" href="/help-center/assets/js/6.17262a3a.js"><link rel="prefetch" href="/help-center/assets/js/7.016b634e.js"><link rel="prefetch" href="/help-center/assets/js/8.3cf21d73.js">
+    <link rel="stylesheet" href="/help-center/assets/css/0.styles.d0b15ba0.css">
+  </head>
+  <body class="theme-mode-light">
+    <div id="app" data-server-rendered="true"><div class="theme-container sidebar-open no-sidebar"><header class="navbar blur"><div title="目录" class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/help-center/" aria-current="page" class="home-link router-link-exact-active router-link-active"><img src="/help-center/img/logo.png" alt="经创HIS系统操作手册" class="logo"> <span class="site-name can-hide">经创HIS系统操作手册</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <div class="sidebar-hover-trigger"></div> <aside class="sidebar" style="display:none;"><!----> <nav class="nav-links"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav>  <!----> </aside> <div class="home-wrapper" data-v-7d2bb426><div class="banner" style="background:var(--mainBg);color:var(--textColor);" data-v-7d2bb426><div class="banner-conent" data-v-7d2bb426><header class="hero" data-v-7d2bb426><img src="/help-center/img/logo.png" data-v-7d2bb426> <h1 id="main-title" data-v-7d2bb426>
+          欢迎使用经创HIS系统
+        </h1> <p class="description" data-v-7d2bb426>
+          经创HIS系统操作手册
+        </p> <p class="action" data-v-7d2bb426><a href="/help-center/pages/3f475f/" class="nav-link action-button" data-v-7d2bb426>开始使用 →</a></p></header> <!----></div> <!----></div> <div class="main-wrapper" data-v-7d2bb426><div class="main-left"><!----> <div class="theme-vdoing-content custom card-box content__default" data-v-7d2bb426><p align="center"></p> <br> <p align="center"></p> <br> <br> <br> <br></div></div> <div class="main-right"><!----> <!----> <!----> <!----></div></div></div> <div class="footer"><!----> 
+  Theme by
+  <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" title="本站主题">Vdoing</a> <!----></div> <div class="buttons"><div title="返回顶部" class="button blur go-to-top iconfont icon-fanhuidingbu" style="display:none;"></div> <div title="去评论" class="button blur go-to-comment iconfont icon-pinglun" style="display:none;"></div> <div title="主题模式" class="button blur theme-mode-but iconfont icon-zhuti"><ul class="select-box" style="display:none;"><li class="iconfont icon-zidong">
+          跟随系统
+        </li><li class="iconfont icon-rijianmoshi">
+          浅色模式
+        </li><li class="iconfont icon-yejianmoshi">
+          深色模式
+        </li><li class="iconfont icon-yuedu">
+          阅读模式
+        </li></ul></div></div> <!----> <!----> <!----></div><div class="global-ui"></div></div>
+    <script src="/help-center/assets/js/app.c5ec5719.js" defer></script><script src="/help-center/assets/js/2.06f4cb84.js" defer></script><script src="/help-center/assets/js/3.53c266dc.js" defer></script>
+  </body>
+</html>

openhis-ui-vue3/public/help-center/markmap/01.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="UTF-8">
+  <meta
+    name="viewport"
+    content="width=device-width, initial-scale=1.0"
+  >
+  <meta
+    http-equiv="X-UA-Compatible"
+    content="ie=edge"
+  >
+  <title>Markmap</title>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+    }
+
+    #mindmap {
+      display: block;
+      width: 100vw;
+      height: 100vh;
+    }
+
+  </style>
+
+</head>
+
+<body>
+  <svg id="mindmap"></svg>
+  <script src="https://jsd.cdn.zzko.cn/npm/d3@5"></script>
+  <script src="https://jsd.cdn.zzko.cn/npm/markmap-lib@0.8.0/dist/browser/view.min.js"></script>
+  <script>
+    ((a, t, e, n) => {
+      const {
+        Markmap: s,
+        loadPlugins: o
+      } = window.markmap;
+      (t ? t(o, e, n) : Promise.resolve()).then(() => {
+        window.mm = s.create("svg#mindmap", null, a)
+      })
+    })({
+      "t": "heading",
+      "d": 1,
+      "p": {},
+      "v": "markmap-lib",
+      "c": [{
+        "t": "heading",
+        "d": 2,
+        "p": {},
+        "v": "Links",
+        "c": [{
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<a href=\"https://markmap.js.org/\" target=\"_blank\" rel=\"noopener noreferrer\">https://markmap.js.org/</a>"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<a href=\"https://github.com/gera2ld/markmap-lib\" title=\"\" target=\"_blank\" rel=\"noopener noreferrer\">GitHub</a>"
+        }]
+      }, {
+        "t": "heading",
+        "d": 2,
+        "p": {},
+        "v": "Related",
+        "c": [{
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<a href=\"https://github.com/gera2ld/coc-markmap\" title=\"\" target=\"_blank\" rel=\"noopener noreferrer\">coc-markmap</a>"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<a href=\"https://github.com/gera2ld/gatsby-remark-markmap\" title=\"\" target=\"_blank\" rel=\"noopener noreferrer\">gatsby-remark-markmap</a>"
+        }]
+      }, {
+        "t": "heading",
+        "d": 2,
+        "p": {},
+        "v": "Features",
+        "c": [{
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "links"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<strong>inline</strong> <del>text</del> <em>styles</em>"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "multiline<br/>text"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<code>inline code</code>"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "<pre><code class=\"language-js\">console.log('code block');\n</code></pre>"
+        }, {
+          "t": "list_item",
+          "d": 3,
+          "p": {},
+          "v": "MathJax - <code>\\(x = {-b \\pm \\sqrt{b^2-4ac} \\over 2a}\\)</code>"
+        }]
+      }]
+    }, (a, t, e) => a(t, e), ["mathJax", "prism"], {
+      "mathJax": true,
+      "prism": true
+    })
+
+  </script>
+</body>
+
+</html>

openhis-ui-vue3/public/help-center/pages/3f474f/index.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>模块职责 | 经创HIS系统操作手册</title>
+    <meta name="generator" content="VuePress 1.9.9">
+    <link rel="icon" href="/help-center/img/favicon.ico">
+    <meta name="description" content="一个基于VuePress的 知识管理&amp;博客 主题">
+    <meta name="keywords" content="vuepress,theme,blog,vdoing">
+    <meta name="theme-color" content="#11a8cd">
+    
+    <link rel="preload" href="/help-center/assets/css/0.styles.d0b15ba0.css" as="style"><link rel="preload" href="/help-center/assets/js/app.c5ec5719.js" as="script"><link rel="preload" href="/help-center/assets/js/2.06f4cb84.js" as="script"><link rel="preload" href="/help-center/assets/js/7.016b634e.js" as="script"><link rel="prefetch" href="/help-center/assets/js/3.53c266dc.js"><link rel="prefetch" href="/help-center/assets/js/4.7364d667.js"><link rel="prefetch" href="/help-center/assets/js/5.0104c3f3.js"><link rel="prefetch" href="/help-center/assets/js/6.17262a3a.js"><link rel="prefetch" href="/help-center/assets/js/8.3cf21d73.js">
+    <link rel="stylesheet" href="/help-center/assets/css/0.styles.d0b15ba0.css">
+  </head>
+  <body class="theme-mode-light">
+    <div id="app" data-server-rendered="true"><div class="theme-container sidebar-open"><header class="navbar blur"><div title="目录" class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/help-center/" class="home-link router-link-active"><img src="/help-center/img/logo.png" alt="经创HIS系统操作手册" class="logo"> <span class="site-name can-hide">经创HIS系统操作手册</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/help-center/pages/3f474f/" aria-current="page" class="nav-link router-link-exact-active router-link-active">ERP</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <div class="sidebar-hover-trigger"></div> <aside class="sidebar" style="display:none;"><!----> <nav class="nav-links"><div class="nav-item"><a href="/help-center/pages/3f474f/" aria-current="page" class="nav-link router-link-exact-active router-link-active">ERP</a></div> <!----></nav>  <ul class="sidebar-links"><li><section class="sidebar-group depth-0"><p class="sidebar-heading"><span>测试页面1</span> <!----></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/help-center/pages/3f475f/" class="sidebar-link">模块职责</a></li></ul></section></li><li><section class="sidebar-group depth-0"><p class="sidebar-heading open"><span>测试页面2</span> <!----></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/help-center/pages/3f474f/" aria-current="page" class="active sidebar-link">模块职责</a></li></ul></section></li></ul> </aside> <div><main class="page"><div class="theme-vdoing-wrapper "><div class="placeholder"></div> <!----> <div class="content-wrapper"><!----> <h1><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAABKFJREFUSA3tVl1oFVcQnrMbrak3QUgkya1akpJYcrUtIqW1JvFBE9LiQ5v6JmJpolbMg32rVrhgoYK0QiMY6i9Y6EMaW5D+xFJaTYItIuK2Kr3+BJNwkxBj05sQY3b3nM6cs2dv9t7NT/vQJw/sndk5M/PNzJkzewGerP+pAmy+ON8lLzUJgA8ZYxYIYZmGYRnctDaWvJJAmTtfP1pvXsBCCPP8QFcCaRkZYACgDZFO4stNIcBCajEOlmmC9XpJ9bAGCaPaPmzPl32dvLSVu3BWCTQs0XQQ6g0DYgwLIoAZbBCdW/i+781o1VVlm/410mw4h06Y7bIPHNyWDyL4FHkX03Q8SrzNhZTZriieckWt7cL6MM85YcLpsi/7O9/iXFT6MswI0DmmpkSaJ0qLxFIm3+i1THHB3zmBH3PYx9CcykcLOeQVVa7QtdxTgQgEleX2AjHYfwA+2ddV77ruGoJUbhGDI09YSNXyMpUt5ylOzxgbUmtOp7NmbNt8v3arjTBfYELmLUV+M+nSawNNAUqpT3ClJWg5I3BLT+cGW/DXNGCa6tx1aakCGEigArTn4TDIPdrXXYKCZNrHLMCOEPvHBlLQ99s9eHB7EB6NTki73CVPQ2F5MSx/uRQixfmq7rK0wYD8w8E905bnPDfwoWs/rfv93NWN/ZfvwsLIU7A09gxECyISeGJkHAau98L97tuw7NXnoPyNF8FcYGLGKsOs0mN3OEyec9esGW/ZEl945dTP34wlR2FZVQWU1q0Cw8Tr7p+hgLLNL0FPxx/Q35mA8aEUrH6nCgwEl0tn7wUiZYJnNRh6DK4UH/k0lfyrsBKdPVv/AriGIQcEDQZ65LBAGe2Rzui9Ybjz7XUppz1/uKBbyVPGkN3ZAeC6hr0x7Nr38N5+EqkoOm17xpoqR9ohQF55ERSvr4Dkr3chNfC3DMzGJlNBElW8w9nsGQvhNGIzDkXzCg8cLK951xHsFBlTJspJNi3ZFIMF2AeDV3q8DNOB+YHi6QTrChDIWDBRi5U5f+ZMfJLu3ccrqxtdxk4SKH336LFxSmkqefwU5T8fhdSdQf9IVKD6aNiwI/hnmcAZ91isYMJIaCUCx9W098+LgruikeTqzqqxKPUwqJyCPJiyemVVZBOijDGjD38Os0jOiSPL1z3SPjXNANbiNPXAdzTfukjjuknNBbyz3nwgTd3AVFqUJ5hpHlq9MveLnWwttUfoygBmvVjuikxND3znrhsELnZk7k+OjIGxeNEkomyLVta0xxn+HZhjBc4YZ/AFjHjz9u3xRZl2BN4aq9nFwWh16IrQ1aHHEd3j1+4/dB9OtH4e29A2H1DyHQRmOSfQZ1Fy7MHBTGB6J/Djq6p3OxyO2cB+4Car7v/o3GXgfAkj23+x9ID1Teoamo/SXcbvSf2PX7Vc8DdCmE1vN9di+32P9/5YR3vLnhCVGUWBjEkr3yh4H8v9CzmsbdhzOKzsJKM90iFdaTMjRPhGVsakRvOaRidljo6H6G7j+ctrJpsP+4COhDIl0La2+FS4+5mlocBaXY5QnGZysIBYoeSsl5qQzrSj/cgNrfuEzlWBfwA+EjrZyWUvpAAAAABJRU5ErkJggg==">模块职责<!----></h1> <!----> <div class="theme-vdoing-content content__default"><p>这里是HIS操作手册的模块职责页面2</p></div></div> <!----> <div class="page-edit"><!----> <!----> <!----></div> <div class="page-nav-wapper"><div class="page-nav-centre-wrap"><a href="/help-center/pages/3f475f/" class="page-nav-centre page-nav-centre-prev"><div class="tooltip">模块职责</div></a> <!----></div> <div class="page-nav"><p class="inner"><span class="prev">
+        ←
+        <a href="/help-center/pages/3f475f/" class="prev">模块职责</a></span> <!----></p></div></div></div> <!----></main></div> <div class="footer"><!----> 
+  Theme by
+  <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" title="本站主题">Vdoing</a> <!----></div> <div class="buttons"><div title="返回顶部" class="button blur go-to-top iconfont icon-fanhuidingbu" style="display:none;"></div> <div title="去评论" class="button blur go-to-comment iconfont icon-pinglun" style="display:none;"></div> <div title="主题模式" class="button blur theme-mode-but iconfont icon-zhuti"><ul class="select-box" style="display:none;"><li class="iconfont icon-zidong">
+          跟随系统
+        </li><li class="iconfont icon-rijianmoshi">
+          浅色模式
+        </li><li class="iconfont icon-yejianmoshi">
+          深色模式
+        </li><li class="iconfont icon-yuedu">
+          阅读模式
+        </li></ul></div></div> <!----> <!----> <!----></div><div class="global-ui"></div></div>
+    <script src="/help-center/assets/js/app.c5ec5719.js" defer></script><script src="/help-center/assets/js/2.06f4cb84.js" defer></script><script src="/help-center/assets/js/7.016b634e.js" defer></script>
+  </body>
+</html>

openhis-ui-vue3/public/help-center/pages/3f475f/index.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>模块职责 | 经创HIS系统操作手册</title>
+    <meta name="generator" content="VuePress 1.9.9">
+    <link rel="icon" href="/help-center/img/favicon.ico">
+    <meta name="description" content="一个基于VuePress的 知识管理&amp;博客 主题">
+    <meta name="keywords" content="vuepress,theme,blog,vdoing">
+    <meta name="theme-color" content="#11a8cd">
+    
+    <link rel="preload" href="/help-center/assets/css/0.styles.d0b15ba0.css" as="style"><link rel="preload" href="/help-center/assets/js/app.c5ec5719.js" as="script"><link rel="preload" href="/help-center/assets/js/2.06f4cb84.js" as="script"><link rel="preload" href="/help-center/assets/js/6.17262a3a.js" as="script"><link rel="prefetch" href="/help-center/assets/js/3.53c266dc.js"><link rel="prefetch" href="/help-center/assets/js/4.7364d667.js"><link rel="prefetch" href="/help-center/assets/js/5.0104c3f3.js"><link rel="prefetch" href="/help-center/assets/js/7.016b634e.js"><link rel="prefetch" href="/help-center/assets/js/8.3cf21d73.js">
+    <link rel="stylesheet" href="/help-center/assets/css/0.styles.d0b15ba0.css">
+  </head>
+  <body class="theme-mode-light">
+    <div id="app" data-server-rendered="true"><div class="theme-container sidebar-open"><header class="navbar blur"><div title="目录" class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/help-center/" class="home-link router-link-active"><img src="/help-center/img/logo.png" alt="经创HIS系统操作手册" class="logo"> <span class="site-name can-hide">经创HIS系统操作手册</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav></div></header> <div class="sidebar-mask"></div> <div class="sidebar-hover-trigger"></div> <aside class="sidebar" style="display:none;"><!----> <nav class="nav-links"><div class="nav-item"><a href="/help-center/pages/3f474f/" class="nav-link">ERP</a></div> <!----></nav>  <ul class="sidebar-links"><li><section class="sidebar-group depth-0"><p class="sidebar-heading open"><span>测试页面1</span> <!----></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/help-center/pages/3f475f/" aria-current="page" class="active sidebar-link">模块职责</a></li></ul></section></li><li><section class="sidebar-group depth-0"><p class="sidebar-heading"><span>测试页面2</span> <!----></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/help-center/pages/3f474f/" class="sidebar-link">模块职责</a></li></ul></section></li></ul> </aside> <div><main class="page"><div class="theme-vdoing-wrapper "><div class="placeholder"></div> <!----> <div class="content-wrapper"><!----> <h1><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAABH1JREFUSA3tVl1oHFUUPmdmd2ltklqbpJDiNnXFmgbFktho7YMPNiJSSZM0+CAYSkUELVhM6YuwIPpgoOKDqOBDC0XE2CQoNtQXBUFTTcCi+Wlh1V2TQExsUzcltd3M9Tt3ZjZzZ2fT+OJTL8yeM+eee757fmeJbq//KQL8X3DUSFOcfr7cRsRtxNQMWueeVzOkaITIGqQHNg5y8+jNW9ldM7A6nTpAjuolUikAwq7CE3WcM2RRDz+XGVgN3FptU/aUSlvq9Pa3iZ1+sgAqJyyAFqkipd9dqiwHF3P65YycLWc/6sqGrvoEoIp6DOFaX5h6+dnfjkWprwqsPk0dUGq5vySwDImC10KxFHgGL1SWoc92O3eVht09qdXNH11I2SsTsJYqMWzihqGMi+A+Garf3BAuuLI5oGlULyNfyB/HYNujwktOfRrMr5t77NmevqaUopx0grnKAyvVpmwUDB4x6FPXuGvYLTDwWsejwgtgkYKPqRJg8SV6xaiZ3ZTppGneS4yfH5/66fZSDHv+QZci/+h5c5UHtpy67JUqGppM0sh0Nc1dW6/N1W5Yoqat8/TU/VnadmdeW2PLLSyh0cvxBs3KbqTmwYPpxN4do/mzE8nEpvX/UMu2Wbp74zUAK5q6WkHns7V0eWkdPbPzd3rxkTGybadYySumVzhcaJFbs5UrEkQ/+CK8gF5dnh/6ciIZ73gwQ927L1IitoxKLXYP3SjYdOrHHfTZhRRlFyrorafPk20B3HPD1y2G3qKZME5Jcf3t/HUC13/8tSd++vqFveMUTwAUxSUFI1QekR1+bIze3D9MF2aq6cPvG72CgnldWCFqyRw3lwH8ZMerjTD9ElRO7Gv44wNpC90aASqGfVlz/Rx17srQ57/UU26hkhQqUB7dBR71WmzQhHUnblGmVOEw0jhbV1n9OlXUDCIRGaNV5Jp43N516fN7JmnTHdfp7Hgy0luO4aMhtkLL8Bi3bUWYvzh5Mn1dTxrL6QmGuRhGL/TiTTxRoEdTszSaq9GR0NGA3KdkOz3hqSV3MIDhQ5IVX/Ivx3umBti2es2h4eZby7x8br1rkf7Mo90AqC8aQ3sJeNzqFRu+vSANAQe3PL7l0HGOAdwDCeZYvNKeoZp1Qfs6Aipndh86HmFRi0LAnEO47wsqM6cdfjh3jBPUzhZy7nvlUfFsamED1VQt6aISHVymXZ/B2aCtIG8AI8xfobj2d3en1wWVhOeHELKmLQ1s211s88comkv4UCwWyF787mJdYXtNfhKAXVqnKTq8QZvGAGGOfaTo5pGZ/PwbUCr5+DPr/1J92JNHr9aOl/F3iI5+O1nfybsGxoimvZ3ViWSluDITw3P37mypheDIPY0tw7+O/5ApbkYw+zpfaUVu32Pi98+defdUhEpZkRFq0aqyNh9FuL9hpYbEm6iwi0z2REd09ZmyENEbuhjDWzKvZXTqKYaBIr3tt5kuPtQBZFvEUwHt60vfCNu41XsksH9Ij1BMMz1Y0OOunHNShFIP5868g5zeXmuLwL9T4b6Q2+KejgAAAABJRU5ErkJggg==">模块职责<!----></h1> <!----> <div class="theme-vdoing-content content__default"><p>这里描述的是HIS系统的模块职责描述页面1</p></div></div> <!----> <div class="page-edit"><!----> <!----> <!----></div> <div class="page-nav-wapper"><div class="page-nav-centre-wrap"><!----> <a href="/help-center/pages/3f474f/" class="page-nav-centre page-nav-centre-next"><div class="tooltip">模块职责</div></a></div> <div class="page-nav"><p class="inner"><!----> <span class="next"><a href="/help-center/pages/3f474f/">模块职责</a>→
+      </span></p></div></div></div> <!----></main></div> <div class="footer"><!----> 
+  Theme by
+  <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" title="本站主题">Vdoing</a> <!----></div> <div class="buttons"><div title="返回顶部" class="button blur go-to-top iconfont icon-fanhuidingbu" style="display:none;"></div> <div title="去评论" class="button blur go-to-comment iconfont icon-pinglun" style="display:none;"></div> <div title="主题模式" class="button blur theme-mode-but iconfont icon-zhuti"><ul class="select-box" style="display:none;"><li class="iconfont icon-zidong">
+          跟随系统
+        </li><li class="iconfont icon-rijianmoshi">
+          浅色模式
+        </li><li class="iconfont icon-yejianmoshi">
+          深色模式
+        </li><li class="iconfont icon-yuedu">
+          阅读模式
+        </li></ul></div></div> <!----> <!----> <!----></div><div class="global-ui"></div></div>
+    <script src="/help-center/assets/js/app.c5ec5719.js" defer></script><script src="/help-center/assets/js/2.06f4cb84.js" defer></script><script src="/help-center/assets/js/6.17262a3a.js" defer></script>
+  </body>
+</html>

openhis-ui-vue3/src/action/nurseStation/temperatureSheet/datas.js

@@ -11,7 +11,7 @@ export default {
     inDiagName: '急性上呼吸道感染',
     name: '于浩',
     officeName: '住院科室',
-    title: '长春市朝阳区中医院',
+    title: '',
     operaDays: null,
     outdate: null,
     sex: '女',

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
+    }
+  })
+}

openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue

@@ -2,7 +2,7 @@
   <div class="recordBill">
     <div :id="'exeSheetTitle' + printData.id" class="printView_header">
       <div style="text-align: center;  height: 60px">
-        长春市朝阳区中医院医嘱执行单
+        {{ userStore.hospitalName }}医嘱执行单
       </div>
       <div>
         <span style="display: inline-block; width: 100px">床号：{{ printData.patientInfo.encounterLocationName }}</span>
@@ -87,8 +87,13 @@
 </template>
 <script>
 import {getLodop} from '../../../plugins/print/LodopFuncs'
+import useUserStore from '@/store/modules/user'
 
 export default {
+  setup() {
+    const userStore = useUserStore();
+    return { userStore };
+  },
   props: {
     printData: {
       type: Object,

openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue

@@ -2,7 +2,7 @@
   <div class="recordBill">
     <div id="div1" class="printView_header">
       <div style="text-align: center; font-size: 20px; height: 40px">
-        长春市朝阳区中医院输液执行单
+        {{ userStore.hospitalName }}输液执行单
       </div>
       <div>
         <span>座位：{{ printData.patientInfo.encounterLocationName }}</span>
@@ -61,8 +61,13 @@
 </template>
 <script>
 import {getLodop} from '../../../plugins/print/LodopFuncs'
+import useUserStore from '@/store/modules/user'
 
 export default {
+  setup() {
+    const userStore = useUserStore();
+    return { userStore };
+  },
   data() {
     return {
       printData: {

openhis-ui-vue3/src/components/Auto/printBills/triageTicket.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="printTicket">
-    <p>长春市朝阳区中医院</p>
+    <p>{{ userStore.hospitalName }}</p>
     <div>
       <span>姓名：</span>
       <span>{{ printData.patientName }}</span>
@@ -26,9 +26,14 @@
 </template>
 <script>
 import JsBarcode from 'jsbarcode';
+import useUserStore from '@/store/modules/user';
 
 export default {
   name: 'TriageTicket',
+  setup() {
+    const userStore = useUserStore();
+    return { userStore };
+  },
   props: {
     printData: {
       type: Object,

openhis-ui-vue3/src/components/Print/AdvancePayment.json

@@ -44,7 +44,7 @@
             "top": 15,
             "height": 16.5,
             "width": 792,
-            "title": "长春市朝阳区中医院预交金收据",
+            "title": "{{HOSPITAL_NAME}}预交金收据",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontWeight": "bold",

openhis-ui-vue3/src/components/Print/ChineseMedicinePrescription.json

@@ -44,7 +44,7 @@
             "top": 38,
             "height": 19.5,
             "width": 255,
-            "title": "中药长春市朝阳区中医院",
+            "title": "中药{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 11.25,

openhis-ui-vue3/src/components/Print/DailyOutpatientSettlement.json

@@ -108,7 +108,7 @@
             "top": 58.5,
             "height": 13.5,
             "width": 145.5,
-            "title": "机构名称：长春市朝阳区中医院",
+            "title": "机构名称：{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 9,

openhis-ui-vue3/src/components/Print/Disposal copy.json

@@ -44,7 +44,7 @@
             "top": 22.5,
             "height": 19.5,
             "width": 420,
-            "title": "长春市朝阳区中医院",
+            "title": "{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 20.25,

openhis-ui-vue3/src/components/Print/DocChineseMedicinePrescription.json

@@ -43,7 +43,7 @@
             "top": 39.5,
             "height": 19.5,
             "width": 255,
-            "title": "中药长春市朝阳区中医院",
+            "title": "中药{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 11.25,

openhis-ui-vue3/src/components/Print/HQOutpatientMedicalRecord.json

@@ -44,7 +44,7 @@
             "top": 22.5,
             "height": 19.5,
             "width": 595.5,
-            "title": "长春市朝阳区中医院",
+            "title": "{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 20.25,

openhis-ui-vue3/src/components/Print/MedicinePrescription.json

@@ -44,7 +44,7 @@
             "top": 22.5,
             "height": 19.5,
             "width": 420,
-            "title": "长春市朝阳区中医院",
+            "title": "{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 20.25,

openhis-ui-vue3/src/components/Print/OperativeRecord.json

@@ -44,7 +44,7 @@
             "top": 22.5,
             "height": 19.5,
             "width": 595.5,
-            "title": "长春市朝阳区中医院",
+            "title": "{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 20.25,

openhis-ui-vue3/src/components/Print/OutpatientBilling.json

@@ -44,7 +44,7 @@
             "top": 15,
             "height": 16.5,
             "width": 225,
-            "title": "长春市朝阳区中医院门诊收费结算单",
+            "title": "{{HOSPITAL_NAME}}门诊收费结算单",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontWeight": "bold",

openhis-ui-vue3/src/components/Print/OutpatientMedicalRecord.json

@@ -43,7 +43,7 @@
             "top": 22.5,
             "height": 19.5,
             "width": 595.5,
-            "title": "长春市朝阳区中医院",
+            "title": "{{HOSPITAL_NAME}}",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 20.25,

openhis-ui-vue3/src/components/Print/OutpatientRegistration.json

@@ -45,7 +45,7 @@
             "top": 15,
             "height": 16.5,
             "width": 226.5,
-            "title": "长春市朝阳区中医院挂号收费明细",
+            "title": "{{HOSPITAL_NAME}}挂号收费明细",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontWeight": "bold",