测试合并v4

Reviewed-on: #2

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>测试合并11111</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/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/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;
@@ -78,23 +79,12 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
             e.setStatusEnum_dictText(e.getStatusEnum() != null && e.getStatusEnum() == 1 ? "启用" : "停用");
             // 类型
             if (e.getRoomTypeEnum() != null) {
-                switch (e.getRoomTypeEnum()) {
-                    case 1:
-                        e.setRoomTypeEnum_dictText("急诊手术室");
-                        break;
-                    case 2:
-                        e.setRoomTypeEnum_dictText("择期手术室");
-                        break;
-                    case 3:
-                        e.setRoomTypeEnum_dictText("日间手术室");
-                        break;
-                    case 4:
-                        e.setRoomTypeEnum_dictText("复合手术室");
-                        break;
-                    default:
-                        e.setRoomTypeEnum_dictText("未知");
-                        break;
-                }
+                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()));
@@ -127,23 +117,7 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
 
         // 类型描述
         if (operatingRoom.getRoomTypeEnum() != null) {
-            switch (operatingRoom.getRoomTypeEnum()) {
-                case 1:
-                    operatingRoomDto.setRoomTypeEnum_dictText("急诊手术室");
-                    break;
-                case 2:
-                    operatingRoomDto.setRoomTypeEnum_dictText("择期手术室");
-                    break;
-                case 3:
-                    operatingRoomDto.setRoomTypeEnum_dictText("日间手术室");
-                    break;
-                case 4:
-                    operatingRoomDto.setRoomTypeEnum_dictText("复合手术室");
-                    break;
-                default:
-                    operatingRoomDto.setRoomTypeEnum_dictText("未知");
-                    break;
-            }
+            operatingRoomDto.setRoomTypeEnum_dictText(DictUtils.getDictLabel("operating_room_type", String.valueOf(operatingRoom.getRoomTypeEnum())));
         }
 
         // 如果有机构ID，查询机构名称
@@ -168,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);
@@ -177,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()));
         // 五笔码
@@ -215,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);
@@ -224,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);
 
@@ -331,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/chargemanage/appservice/IOutpatientRegistrationAppService.java

@@ -8,6 +8,7 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 import com.openhis.web.chargemanage.dto.PatientMetadata;
 import com.openhis.web.chargemanage.dto.PractitionerMetadata;
+import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 
 import javax.servlet.http.HttpServletRequest;
@@ -85,4 +86,12 @@ public interface IOutpatientRegistrationAppService {
      */
     R<?> cancelRegister(Long encounterId);
 
+    /**
+     * 补打挂号
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto);
+
 }

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/appservice/impl/OutpatientRegistrationAppServiceImpl.java

@@ -27,6 +27,7 @@ import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
 import com.openhis.web.chargemanage.dto.OrgMetadata;
 import com.openhis.web.chargemanage.dto.PatientMetadata;
 import com.openhis.web.chargemanage.dto.PractitionerMetadata;
+import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
@@ -283,7 +284,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<CurrentDayEncounterDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
+            new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name", "identifier_no")),
             request);
 
         // 手动处理 statusEnum 参数（用于过滤退号记录）
@@ -330,4 +331,18 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return R.ok("已取消挂号");
     }
 
+    /**
+     * 补打挂号
+     * 补打挂号不需要修改数据库，只需要返回成功即可，前端已有所有需要的数据用于打印
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    @Override
+    public R<?> reprintRegistration(ReprintRegistrationDto reprintRegistrationDto) {
+        // 补打挂号只是重新打印，不需要修改数据库
+        // 可以在这里添加日志记录补打操作
+        return R.ok(null, "补打挂号成功");
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java

@@ -8,6 +8,7 @@ import com.openhis.common.enums.PriorityLevel;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto;
+import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 import lombok.AllArgsConstructor;
@@ -151,4 +152,15 @@ public class OutpatientRegistrationController {
         return R.ok(iOutpatientRegistrationAppService.getCurrentDayEncounter(searchKey, pageNo, pageSize, request));
     }
 
+    /**
+     * 补打挂号
+     *
+     * @param reprintRegistrationDto 补打挂号信息
+     * @return 结果
+     */
+    @PostMapping(value = "/reprint")
+    public R<?> reprintRegistration(@RequestBody ReprintRegistrationDto reprintRegistrationDto) {
+        return iOutpatientRegistrationAppService.reprintRegistration(reprintRegistrationDto);
+    }
+
 }

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

@@ -136,4 +136,14 @@ public class CurrentDayEncounterDto {
      */
     private String phone;
 
+    /**
+     * 就诊卡号
+     */
+    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

@@ -401,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/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/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,31 +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.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,
@@ -88,7 +91,9 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
-                        T8.birth_date      AS birth_date
+                        T8.birth_date      AS birth_date,
+                        T8.bus_no          AS patient_bus_no,
+                        T18.identifier_no  AS identifier_no
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
                           LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
@@ -118,6 +123,20 @@
                                     ON T1.ID = T6.encounter_id AND T6.delete_flag = '0' AND T6.encounter_flag = '1'
                           LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no AND T7.delete_flag = '0'
                           LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID AND T8.delete_flag = '0'
+                          LEFT JOIN (
+                             SELECT patient_id,
+                                    identifier_no
+                             FROM (
+                                  SELECT patient_id,
+                                         identifier_no,
+                                         ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+                                  FROM adm_patient_identifier
+                                  WHERE delete_flag = '0'
+                                    AND identifier_no IS NOT NULL
+                                    AND identifier_no != ''
+                             ) t
+                             WHERE rn = 1
+                          ) AS T18 ON T8.id = T18.patient_id
                           LEFT JOIN adm_charge_item AS T10 ON T1.id = T10.encounter_id AND T10.delete_flag = '0'
                           LEFT JOIN adm_account AS T11 ON T10.account_id = T11.id AND T11.delete_flag = '0'
                           LEFT JOIN adm_practitioner AS T12 ON T12.ID = T10.enterer_id AND T12.delete_flag = '0'

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-domain/src/main/java/com/openhis/administration/domain/OperatingRoom.java

@@ -1,6 +1,7 @@
 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;
@@ -33,14 +34,16 @@ public class OperatingRoom extends HisBaseEntity {
     private String name;
 
     /** 手术室类型 */
-    @Dict(dictCode = "operating_room_type")
     private Integer roomTypeEnum;
+
+    @TableField(exist = false)
     private String roomTypeEnum_dictText;
 
     /** 所属机构ID */
     private Long organizationId;
 
     /** 所属机构名称 */
+    @TableField(exist = false)
     private String organizationName;
 
     /** 位置描述 */
@@ -64,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-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-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",
@@ -1635,6 +1637,7 @@
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -1645,6 +1648,7 @@
       "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -2145,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"
@@ -2555,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",
@@ -2702,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",
@@ -2729,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"
@@ -2742,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": {
@@ -3293,6 +3335,7 @@
       "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -3455,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",
@@ -3566,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",
@@ -3784,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",
@@ -4200,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",
@@ -4363,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",
@@ -5043,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",
@@ -5467,17 +5562,31 @@
         "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",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -6128,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",
@@ -6187,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",
@@ -6337,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",
@@ -6376,6 +6539,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -6481,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",
@@ -6593,6 +6780,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
       "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -6605,6 +6793,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
       "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.0"
@@ -6752,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",
@@ -6761,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",
@@ -6841,6 +7045,7 @@
       "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -7019,6 +7224,7 @@
       "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -7051,6 +7257,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz",
       "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==",
+      "peer": true,
       "dependencies": {
         "preval.macro": "^4.0.0"
       }
@@ -7068,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",
@@ -7560,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",
@@ -8209,6 +8457,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -8570,6 +8819,7 @@
       "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.19.3",
         "postcss": "^8.4.31",
@@ -8674,6 +8924,7 @@
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.25.tgz",
       "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.25",
         "@vue/compiler-sfc": "3.5.25",
@@ -8900,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",
@@ -8922,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",
@@ -8931,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/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/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",

openhis-ui-vue3/src/components/Print/Pharmacy copy 2.json

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

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

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

openhis-ui-vue3/src/components/Print/Pharmacy.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/Prescription.json

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

openhis-ui-vue3/src/main.js

@@ -4,6 +4,7 @@ import Cookies from 'js-cookie';
 
 // 导入 hiprint 并挂载到全局 window 对象
 import {hiprint} from 'vue-plugin-hiprint';
+
 import ElementPlus, {ElDialog, ElMessage} from 'element-plus';
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
 import 'element-plus/dist/index.css';

openhis-ui-vue3/src/router/index.js

@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter } from 'vue-router'
+import {createWebHistory, createRouter} from 'vue-router'
 /* Layout */
 import Layout from '@/layout'
 
@@ -16,366 +16,86 @@ import Layout from '@/layout'
  * roles: ['admin', 'common']       // 访问路由的角色权限
  * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
  * meta : {
-    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
-  }
+ noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+ title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
+ icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
+ breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
+ }
  */
 
 // 公共路由
 export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index.vue')
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: () => import('@/views/login'),
-    hidden: true
-  },
-  {
-    path: '/register',
-    component: () => import('@/views/register'),
-    hidden: true
-  },
-  {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
-  },
-  {
-    path: '',
-    component: Layout,
-    redirect: '/index',
-    children: [
-      {
-        path: '/index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
-  {
-    path: '/user',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  },
-  // 添加套餐管理相关路由到公共路由，确保始终可用
-  {
-    path: '/maintainSystem/Inspection/PackageManagement',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
+    {
+        path: '/redirect',
+        component: Layout,
+        hidden: true,
+        children: [
+            {
+                path: '/redirect/:path(.*)',
+                component: () => import('@/views/redirect/index.vue')
+            }
+        ]
+    },
+    {
+        path: '/login',
+        component: () => import('@/views/login'),
+        hidden: true
+    },
+    {
+        path: '/register',
+        component: () => import('@/views/register'),
+        hidden: true
+    },
+    {
+        path: '/401',
+        component: () => import('@/views/error/401'),
+        hidden: true
+    },
+    {
         path: '',
-        component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
-        name: 'DirectPackageManagement',
-        meta: { title: '套餐管理' }
-      }
-    ]
-  }
+        component: Layout,
+        redirect: '/index',
+        children: [
+            {
+                path: '/index',
+                component: () => import('@/views/index'),
+                name: 'Index',
+                meta: {title: '首页', icon: 'dashboard', affix: true}
+            }
+        ]
+    },
+    {
+        path: '/user',
+        component: Layout,
+        hidden: true,
+        redirect: 'noredirect',
+        children: [
+            {
+                path: 'profile',
+                component: () => import('@/views/system/user/profile/index'),
+                name: 'Profile',
+                meta: {title: '个人中心', icon: 'user'}
+            }
+        ]
+    }
 ]
 
 // 动态路由，基于用户权限动态去加载
-  export const dynamicRoutes = [
+export const dynamicRoutes = [
     {
-      path: '/basicmanage',
-      component: Layout,
-      redirect: '/basicmanage/invoice-management',
-      name: 'BasicManage',
-      meta: { title: '基础管理', icon: 'component' },
-      children: [
-        {
-          path: 'invoice-management',
-          component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
-          name: 'invoice-management',
-          meta: { title: '发票管理' }
-        }
-      ]
+        path: '/help-center',
+        component: Layout,
+        hidden: true,
+        children: [
+            {
+                path: '',
+                component: () => import('@/views/helpcenter/index.vue'),
+                name: 'HelpCenter',
+                meta: {title: '帮助中心'},
+            },
+        ],
     },
-    // 兼容系统业务管理路径
-  //   {
-  //     path: '/system/ywgz',
-  //     component: Layout,
-  //     redirect: '/system/ywgz/InvoiceManagement',
-  //     hidden: true,
-  //     children: [
-  //       {
-  //         path: 'InvoiceManagement',
-  //         component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
-  //         name: 'SystemInvoiceManagement',
-  //         meta: { title: '发票管理' }
-  //       }
-  //     ]
-  //   },
-  // {
-  //   path: '/maintainSystem',
-  //   component: Layout,
-  //   redirect: '/maintainSystem/chargeConfig',
-  //   name: 'MaintainSystem',
-  //   meta: { title: '维护系统', icon: 'system' },
-  //   children: [
-  //     {
-  //       path: '',
-  //       redirect: 'chargeConfig'
-  //     },
-  //     {
-  //       path: 'chargeConfig',
-  //       component: () => import('@/views/maintainSystem/chargeConfig/index.vue'),
-  //       name: 'ChargeConfig',
-  //       meta: { title: '挂号收费系统参数维护', icon: 'config', permissions: ['maintainSystem:chargeConfig:list'] }
-  //     },
-  //     {
-  //       path: 'Inspection',
-  //       component: () => import('@/views/maintainSystem/Inspection/index.vue'),
-  //       name: 'Inspection',
-  //       meta: { title: '检验管理', icon: 'inspection' },
-  //       children: [
-  //         {
-  //           path: 'PackageManagement',
-  //           component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
-  //           name: 'PackageManagement',
-  //           meta: { title: '套餐管理' }
-  //         }
-  //       ]
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/system',
-  //   component: Layout,
-  //   redirect: '/system/user',
-  //   name: 'System',
-  //   meta: { title: '系统管理', icon: 'system' },
-  //   children: [
-  //     {
-  //       path: 'user',
-  //       component: () => import('@/views/system/user/index.vue'),
-  //       name: 'User',
-  //       meta: { title: '用户管理', icon: 'user', permissions: ['system:user:list'] }
-  //     },
-  //     {
-  //       path: 'role',
-  //       component: () => import('@/views/system/role/index.vue'),
-  //       name: 'Role',
-  //       meta: { title: '角色管理', icon: 'role', permissions: ['system:role:list'] }
-  //     },
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/system/menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: { title: '菜单管理', icon: 'menu', permissions: ['system:menu:list'] }
-  //     },
-  //     {
-  //       path: 'dept',
-  //       component: () => import('@/views/system/dept/index.vue'),
-  //       name: 'Dept',
-  //       meta: { title: '部门管理', icon: 'dept', permissions: ['system:dept:list'] }
-  //     },
-  //     {
-  //       path: 'post',
-  //       component: () => import('@/views/system/post/index.vue'),
-  //       name: 'Post',
-  //       meta: { title: '岗位管理', icon: 'post', permissions: ['system:post:list'] }
-  //     },
-  //     {
-  //       path: 'dict',
-  //       component: () => import('@/views/system/dict/index.vue'),
-  //       name: 'Dict',
-  //       meta: { title: '字典管理', icon: 'dict', permissions: ['system:dict:list'] }
-  //     },
-  //     {
-  //       path: 'config',
-  //       component: () => import('@/views/system/config/index.vue'),
-  //       name: 'Config',
-  //       meta: { title: '参数配置', icon: 'config', permissions: ['system:config:list'] }
-  //     },
-  //     {
-  //       path: 'notice',
-  //       component: () => import('@/views/system/notice/index.vue'),
-  //       name: 'Notice',
-  //       meta: { title: '通知公告', icon: 'notice', permissions: ['system:notice:list'] }
-  //     },
-  //     {
-  //       path: 'tenant',
-  //       component: () => import('@/views/system/tenant/index.vue'),
-  //       name: 'Tenant',
-  //       meta: { title: '租户管理', icon: 'tenant', permissions: ['system:tenant:list'] }
-  //     }
-  //   ]
-  // },
-  {
-    path: '/system/tenant-user',
-    component: Layout,
-    hidden: true,
-    permissions: ['*:*:*'],
-    children: [
-      {
-        path: 'set/:tenantId(\\d+)',
-        component: () => import('@/views/system/tenant/setUser'),
-        name: 'SetUser',
-        meta: { title: '所属用户', activeMenu: '/system/tenant' }
-      }
-    ]
-  },
-  {
-    path: '/system/tenant-contract',
-    component: Layout,
-    hidden: true,
-    permissions: ['*:*:*'],
-    children: [
-      {
-        path: 'set/:tenantId(\\d+)',
-        component: () => import('@/views/system/tenant/setContract'),
-        name: 'SetContract',
-        meta: { title: '合同管理', activeMenu: '/system/tenant' }
-      }
-    ]
-  },
-  {
-    path: '/system/user-auth',
-    component: Layout,
-    hidden: true,
-    permissions: ['system:user:edit'],
-    children: [
-      {
-        path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
-  },
-  {
-    path: '/system/role-auth',
-    component: Layout,
-    hidden: true,
-    permissions: ['system:role:edit'],
-    children: [
-      {
-        path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
-  },
-  {
-    path: '/system/dict-data',
-    component: Layout,
-    hidden: true,
-    permissions: ['system:dict:list'],
-    children: [
-      {
-        path: 'index/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
-  },
-  {
-    path: '/monitor',
-    component: Layout,
-    redirect: '/monitor/operlog',
-    name: 'Monitor',
-    meta: { title: '系统监控', icon: 'monitor' },
-    children: [
-      {
-        path: 'operlog',
-        component: () => import('@/views/monitor/operlog/index.vue'),
-        name: 'Operlog',
-        meta: { title: '操作日志', icon: 'operlog', permissions: ['monitor:operlog:list'] }
-      },
-      {
-        path: 'logininfor',
-        component: () => import('@/views/monitor/logininfor/index.vue'),
-        name: 'Logininfor',
-        meta: { title: '登录日志', icon: 'logininfor', permissions: ['monitor:logininfor:list'] }
-      },
-      {
-        path: 'job',
-        component: () => import('@/views/monitor/job/index.vue'),
-        name: 'Job',
-        meta: { title: '定时任务', icon: 'job', permissions: ['monitor:job:list'] }
-      }
-    ]
-  },
-  {
-    path: '/tool',
-    component: Layout,
-    redirect: '/tool/gen',
-    name: 'Tool',
-    meta: { title: '系统工具', icon: 'tool' },
-    children: [
-      {
-        path: 'gen',
-        component: () => import('@/views/tool/gen/index.vue'),
-        name: 'Gen',
-        meta: { title: '代码生成', icon: 'gen', permissions: ['tool:gen:list'] }
-      }
-    ]
-  },
-  {
-    path: '/monitor/job-log',
-    component: Layout,
-    hidden: true,
-    permissions: ['monitor:job:list'],
-    children: [
-      {
-        path: 'index/:jobId(\\d+)',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
-  },
-  {
-    path: '/tool/gen-edit',
-    component: Layout,
-    hidden: true,
-    permissions: ['tool:gen:edit'],
-    children: [
-      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  },
-  {
-    path: '/help-center',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '',
-        component: () => import('@/views/helpcenter/index.vue'),
-        name: 'HelpCenter',
-        meta: { title: '帮助中心'},
-      },
-    ],
-  },
 ];
 
 // 合并常量路由和动态路由，确保所有路由都能被访问
@@ -383,21 +103,21 @@ const allRoutes = [...constantRoutes, ...dynamicRoutes];
 
 // 添加404路由到所有路由的最后
 allRoutes.push({
-  path: "/:pathMatch(.*)*",
-  component: () => import('@/views/error/404'),
-  hidden: true
+    path: "/:pathMatch(.*)*",
+    component: () => import('@/views/error/404'),
+    hidden: true
 });
 
 const router = createRouter({
-  history: createWebHistory(),
-  routes: allRoutes,
-  scrollBehavior(to, from, savedPosition) {
-    if (savedPosition) {
-      return savedPosition
-    } else {
-      return { top: 0 }
-    }
-  },
+    history: createWebHistory(),
+    routes: allRoutes,
+    scrollBehavior(to, from, savedPosition) {
+        if (savedPosition) {
+            return savedPosition
+        } else {
+            return {top: 0}
+        }
+    },
 });
 
 export default router;

openhis-ui-vue3/src/store/modules/user.js

@@ -1,96 +1,99 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import {getInfo, login, logout} from '@/api/login'
+import {getToken, removeToken, setToken} from '@/utils/auth'
 import defAva from '@/assets/images/user.png'
-import { defineStore } from 'pinia'
+import {defineStore} from 'pinia'
 
 const useUserStore = defineStore(
-  'user',
-  {
-    state: () => ({
-      token: getToken(),
-      id: '',
-      name: '',
-      avatar: '',
-      orgId: '',
-      practitionerId: '',
-      orgName: '',
-      nickName: '',
-      fixmedinsCode: '', // 医疗机构编码
-      roles: [],
-      permissions: [],
-      tenantId: '',
-      hospitalName:''
-    }),
-    actions: {
-      // 登录
-      login(userInfo) {
-        const username = userInfo.username.trim()
-        const password = userInfo.password
-        const code = userInfo.code
-        const uuid = userInfo.uuid
-        const tenantId = userInfo.tenantId
-        return new Promise((resolve, reject) => {
-          login(username, password, code, uuid ,tenantId).then(res => {
-            setToken(res.token)
-            this.token = res.token
-            this.tenantId = tenantId
-            resolve()
-          }).catch(error => {
-            reject(error)
+    'user',
+    {
+      state: () => ({
+        token: getToken(),
+        id: '',
+        name: '',
+        avatar: '',
+        orgId: '',
+        practitionerId: '',
+        orgName: '',
+        nickName: '',
+        fixmedinsCode: '', // 医疗机构编码
+        roles: [],
+        permissions: [],
+        tenantId: '',
+        tenantName: '', // 租户名称
+        hospitalName:'',
+        optionMap: {} // 租户配置项Map（从sys_tenant_option表读取）
+      }),
+      actions: {
+        // 登录
+        login(userInfo) {
+          const username = userInfo.username.trim()
+          const password = userInfo.password
+          const code = userInfo.code
+          const uuid = userInfo.uuid
+          const tenantId = userInfo.tenantId
+          return new Promise((resolve, reject) => {
+            login(username, password, code, uuid ,tenantId).then(res => {
+              setToken(res.token)
+              this.token = res.token
+              this.tenantId = tenantId
+              resolve()
+            }).catch(error => {
+              reject(error)
+            })
           })
-        })
-      },
-      // 获取用户信息
-      getInfo() {
-        return new Promise((resolve, reject) => {
-          getInfo().then(res => {
-            const user = res.user
-            const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
+        },
+        // 获取用户信息
+        getInfo() {
+          return new Promise((resolve, reject) => {
+            getInfo().then(res => {
+              const user = res.user
+              const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
-            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-              this.roles = res.roles
-              this.permissions = res.permissions
-            } else {
-              this.roles = ['ROLE_DEFAULT']
-            }
-            // console.log('user info:', user);
-            this.id = user.userId
-            this.name = user.userName // 用户账号（对应数据库的user_name字段，如'admin'）
-            this.orgId = user.orgId
-            this.orgName = user.orgName
-            this.nickName = user.nickName
-            this.practitionerId = res.practitionerId
-            this.fixmedinsCode = res.optionJson.fixmedinsCode
-            this.avatar = avatar
-            this.hospitalName = res.optionJson.hospitalName
-            // 获取tenantId，优先从res.user获取，否则从res获取
-            this.tenantId = user.tenantId || res.tenantId || this.tenantId
+              if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+                this.roles = res.roles
+                this.permissions = res.permissions
+              } else {
+                this.roles = ['ROLE_DEFAULT']
+              }
+              // console.log('user info:', user);
+              this.id = user.userId
+              this.name = user.userName // 用户账号（对应数据库的user_name字段，如'admin'）
+              this.orgId = user.orgId
+              this.orgName = user.orgName
+              this.nickName = user.nickName
+              this.practitionerId = res.practitionerId
+              this.fixmedinsCode = res.optionJson.fixmedinsCode
+              this.avatar = avatar
+              this.optionMap = res.optionMap || {}
+              // 优先从optionMap获取配置，如果没有则从optionJson获取
+              this.hospitalName = this.optionMap.hospitalName || res.optionJson.hospitalName || ''
+              this.tenantName = res.tenantName || ''
 
-            resolve(res)
-          }).catch(error => {
-            reject(error)
+              resolve(res)
+            }).catch(error => {
+              reject(error)
+            })
           })
-        })
-      },
-      // 退出系统
-      logOut() {
-        return new Promise((resolve, reject) => {
-          logout(this.token).then(() => {
-            this.token = ''
-            this.roles = []
-            this.permissions = []
-            this.tenantId = ''
-            removeToken()
-            resolve()
-          }).catch(error => {
-            reject(error)
+        },
+        // 退出系统
+        logOut() {
+          return new Promise((resolve, reject) => {
+            logout(this.token).then(() => {
+              this.token = ''
+              this.roles = []
+              this.permissions = []
+              this.tenantId = ''
+              removeToken()
+              resolve()
+            }).catch(error => {
+              reject(error)
+            })
           })
-        })
-      },
-      removeRoles(){
-        this.roles = []
+        },
+        removeRoles(){
+          this.roles = []
+        }
       }
-    }
-  })
+    })
 
 export default useUserStore

openhis-ui-vue3/src/template/DischargeDiagnosisCertificate.vue

@@ -5,7 +5,7 @@
         patient?.busNo || '未知'
       }}
     </div>
-    <h2 style="text-align: center">长春市朝阳区中医院</h2>
+    <h2 style="text-align: center">{{ userStore.hospitalName }}</h2>
     <h2 style="text-align: center">出院诊断病历</h2>
 
     <!-- 滚动内容区域 -->
@@ -143,6 +143,9 @@ import {nextTick, onMounted, reactive, ref} from 'vue';
 import {ElMessage} from 'element-plus';
 import {previewPrint} from '../utils/printUtils';
 import DisDiagnMedicalRecord from '../views/hospitalRecord/components/disDiagnMedicalRecord.vue';
+import useUserStore from '@/store/modules/user';
+
+const userStore = useUserStore();
 
 defineOptions({
   name: 'DischargeDiagnosisCertificate',

openhis-ui-vue3/src/template/ProgressNoteform.vue

@@ -1,5 +1,8 @@
 <script lang="ts" setup>
 import {ref} from 'vue';
+import useUserStore from '@/store/modules/user';
+
+const userStore = useUserStore();
 
 // 1. 基础信息（复用已有变量，补充一致性格式）
 const patientInfo = ref({
@@ -117,8 +120,8 @@ defineExpose({ patientInfo, firstRecordTime, firstRecordIntro, caseFeatures, chi
     <div class="medical-record">
       <!-- 1. 医院头部（每一页PDF均包含，复用已有样式） -->
       <div class="hospital-header">
-        <img src="./imgs/logo.png" alt="长春市朝阳区中医院Logo" class="header-logo" />
-        <h1 class="hospital-name">长春市朝阳区中医院</h1>
+        <img src="./imgs/logo.png" :alt="userStore.hospitalName + 'Logo'" class="header-logo" />
+        <h1 class="hospital-name">{{ userStore.hospitalName }}</h1>
       </div>
 
       <!-- 2. 患者信息栏（每一页PDF均包含，下划线样式） -->

openhis-ui-vue3/src/template/inHospitalCaseForm.vue

@@ -4,7 +4,7 @@
       <!-- 医院头部 -->
       <div class="hospital-header">
         <h1 class="hospital-name">
-          <span class="hospital-text">长春市朝阳区中医院</span>
+          <span class="hospital-text">{{ userStore.hospitalName }}</span>
         </h1>
       </div>
       <!-- 页面标题 -->

openhis-ui-vue3/src/template/inHospitalRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="medical-form">
     <h2 style="text-align: center">
-      {{ userStore.hospitalName || '长春市朝阳区中医院' }} -入院记录
+      {{ userStore.hospitalName }} -入院记录
     </h2>
 
     <!-- 滚动内容区域 -->

openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue

@@ -232,23 +232,13 @@
 <script setup>
 import {onMounted, reactive, ref} from 'vue';
 import intOperRecordSheet from '../views/hospitalRecord/components/intOperRecordSheet.vue';
-import {
-  ElButton,
-  ElDatePicker,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElMessageBox,
-  ElOption,
-  ElSelect,
-} from 'element-plus';
-import {previewPrint} from '../utils/printUtils';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 const isShowprintDom = ref(false);
 const recordPrintRef = ref();
 // 医院名称
-const hospitalName = '长春市朝阳区中医院';
+const hospitalName = userStore.hospitalName;
 defineOptions({
   name: 'iInHospitalSurgicalRecord',
 });

openhis-ui-vue3/src/template/inHosptialCommunicate.vue

@@ -213,20 +213,11 @@
 
 <script setup>
 import {onMounted, reactive, ref} from 'vue';
-import {
-  ElButton,
-  ElDatePicker,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElMessage,
-  ElMessageBox,
-  ElOption,
-  ElSelect,
-} from 'element-plus';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 // 医院名称
-const hospitalName = '长春市朝阳区中医院';
+const hospitalName = userStore.hospitalName;
 defineOptions({
   name: 'InHospitalCommunicate',
 });

openhis-ui-vue3/src/template/nursingRecordSheet.vue

@@ -6,7 +6,7 @@
 <template>
   <div class="container">
     <div class="header">
-      <h2 class="title">长春市朝阳区中医院</h2>
+      <h2 class="title">{{ userStore.hospitalName }}</h2>
       <h3 class="subtitle">患者护理记录单</h3>
     </div>
 
@@ -234,8 +234,10 @@
 defineOptions({
   name: 'NursingRecordSheet',
 });
-import {getCurrentInstance, onBeforeMount, onMounted} from 'vue';
+import {getCurrentInstance, onBeforeMount, onMounted, ref} from 'vue';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
 const props = defineProps({

openhis-ui-vue3/src/template/outpatientMedicalRecord1.1.vue

@@ -5,7 +5,7 @@
         patient?.busNo || '未知'
       }}
     </div>
-    <h2 style="text-align: center">{{ userStore.hospitalName || '长春市朝阳区中医院' }}</h2>
+    <h2 style="text-align: center">{{ userStore.hospitalName }}</h2>
 
     <h2 style="text-align: center">门诊病历</h2>
 

openhis-ui-vue3/src/template/surgicalPatientHandover.vue

@@ -7,7 +7,7 @@
   <div class="surgicalPatientHandover-container">
     <div class="handover-form">
       <div class="form-header">
-        <h1 class="hospital-name">长春市朝阳区中医院</h1>
+        <h1 class="hospital-name">{{ userStore.hospitalName }}</h1>
         <h2 class="form-title">手术患者交接单</h2>
       </div>
 
@@ -562,6 +562,9 @@ defineOptions({
 });
 import {getCurrentInstance, onBeforeMount, onMounted, reactive} from 'vue';
 import useOptionsList from './useOptionsList';
+import useUserStore from '@/store/modules/user';
+
+const userStore = useUserStore();
 // import { A } from '../../dist/assets/api-DmiMW8YF';
 const { statisticsOptionList, getStatisticsOptionList } = useOptionsList();
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/utils/printUtils.js

@@ -228,7 +228,11 @@ export function executePrint(data, template, printerName, options = {}, business
         throw new Error('打印插件未加载');
       }
 
-      const hiprintTemplate = new window.hiprint.PrintTemplate({ template });
+      const userStore = useUserStore();
+      const processedTemplate = JSON.parse(
+        JSON.stringify(template).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
+      const hiprintTemplate = new window.hiprint.PrintTemplate({ template: processedTemplate });
       const printOptions = {
         title: '打印标题',
         height: 210,

openhis-ui-vue3/src/views/appoinmentmanage/clinicRoom/index.vue

@@ -44,11 +44,17 @@
       class="clinic-room-table"
     >
       <el-table-column prop="id" label="ID" width="180" align="center" />
+      <el-table-column label="卫生机构" width="200" align="center" show-overflow-tooltip>
+  <template #default="scope">
+    <!-- 用==忽略类型匹配，string的"3"和number的3就能匹配上 -->
+    {{ tenantOptions.find(item => item.id == scope.row.orgName)?.tenantName || '未知机构' }}
+  </template>
+</el-table-column>
       <el-table-column prop="roomName" label="诊室名称" width="160" align="center" show-overflow-tooltip />
       <el-table-column prop="department" label="科室名称" width="160" align="center" show-overflow-tooltip />
       <el-table-column prop="building" label="诊室楼号" width="120" align="center" show-overflow-tooltip />
-      <el-table-column prop="floor" label="楼层" width="90" align="center" />
-      <el-table-column prop="roomNo" label="房间号" width="120" align="center" />
+      <el-table-column prop="floor" label="诊室楼层" width="90" align="center" />
+      <el-table-column prop="roomNo" label="诊室房间号" width="120" align="center" />
       <el-table-column prop="isDisabled" label="停用" width="90" align="center">
         <template #default="scope">
           <el-tag :type="scope.row.isDisabled ? 'danger' : 'success'">
@@ -64,6 +70,11 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="操作人" width="120" align="center" show-overflow-tooltip>
+  <template #default="scope">
+    {{ scope.row.updateBy || scope.row.createBy || '系统默认' }}
+  </template>
+</el-table-column>
       <el-table-column label="操作" width="250" align="center" fixed="right">
         <template #default="scope">
           <el-button
@@ -233,8 +244,8 @@ const total = ref(0)
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  roomName: null,
-  orgName: null
+  roomName: '',
+  orgName: ''
 })
 // 科室选项
 const departmentOptions = ref([])
@@ -256,7 +267,7 @@ const form = reactive({
   isDisabled: false,
   remarks: '',
   void: false,
-  orgName: null
+  orgName: ''
 })
 // 表单验证规则
 const rules = {
@@ -506,7 +517,7 @@ function resetForm() {
   form.isDisabled = false
   form.remarks = ''
   form.void = false
-  form.orgName = null
+  form.orgName = ''
   proxy.resetForm('formRef')
 }
 

openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue

@@ -299,236 +299,236 @@ async function printReceipt(param) {
 
           // 金额大于0时显示金额和单位，等于0时不显示单位
           YB_FUND_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 100000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 100000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 基金支付总额
           SELF_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 200000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 200000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人负担总金额
           OTHER_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 其他（如医院负担金额）
 
           // 基本医保统筹基金支出
           YB_TC_FUND_AMOUNT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 110000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 110000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 基本医保统筹基金支出
           YB_BC_FUND_AMOUNT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 120000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 120000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 补充医疗保险基金支出
           YB_JZ_FUND_AMOUNT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 130000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 130000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 医疗救助基金支出
           YB_OTHER_AMOUNT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 140000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 140000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 其他支出
 
           // 职工基本医疗保险
           YB_TC_ZG_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 110100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 110100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 职工基本医疗保险
           YB_TC_JM_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 110200)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 110200)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 居民基本医疗保险
 
           // 补充医疗保险基金支出细分
           YB_BC_JM_DB_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 120100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 120100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 全体参保人的居民大病保险
           YB_BC_DE_BZ_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 120200)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 120200)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 大额医疗费用补助
           YB_BC_ZG_DE_BZ_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 120300)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 120300)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 企业职工大额医疗费用补助
           YB_BC_GWY_BZ_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 120400)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 120400)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 公务员医疗补助
 
           // 其他支出细分
           OTHER_PAY_DD_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300001)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300001)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 兜底基金支出
           OTHER_PAY_YW_SH_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300002)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300002)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 意外伤害基金支出
           OTHER_PAY_LX_YL_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300003)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300003)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 离休人员医疗保障金支出
           OTHER_PAY_LX_YH_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300004)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300004)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 离休人员优惠金支出
           OTHER_PAY_CZ_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300005)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300005)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 财政基金支出
           OTHER_PAY_CZ_YZ_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300006)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300006)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 财政预支支出
           OTHER_PAY_ZG_DB_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300007)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300007)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 职工大病基金支出
           OTHER_PAY_EY_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300008)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300008)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 二乙基金支出
           OTHER_PAY_QX_JZ_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300009)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300009)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 倾斜救助支出
           OTHER_PAY_YL_JZ_FUND_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300010)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300010)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 医疗救助再救助基金
           HOSP_PART_AMT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 300011)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 300011)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 医院负担金额
 
           // 医保结算返回值
           FULAMT_OWNPAY_AMT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 1)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 1)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 全自费金额
           OVERLMT_SELFPAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 3)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 3)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 超限价自费费用
           PRESELFPAY_AMT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 4)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 4)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 先行自付金额
           INSCP_SCP_AMT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 5)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 5)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 符合政策范围金额
           ACT_PAY_DEDC: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 6)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 6)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 实际支付起付线
           POOL_PROP_SELFPAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 7)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 7)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 基本医疗保险统筹基金支付比例
           BALC: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 8)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 8)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 余额
 
           // 特殊支付方式
           SELF_YB_ZH_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 210000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 210000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人医保账户支付
           SELF_YB_ZH_GJ_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 210100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 210100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 账户共济支付金额
           SELF_CASH_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 220000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 220000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人现金支付金额
           SELF_VX_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 230000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 230000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 微信支付金额
           SELF_ALI_PAY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 240000)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 240000)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 阿里支付金额
 
           // 现金支付细分
           SELF_CASH_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 220400)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 220400)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人现金支付金额(现金)
           SELF_CASH_VX_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 220100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 220100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人现金支付金额(微信)
           SELF_CASH_ALI_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 220200)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 220200)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人现金支付金额(支付宝)
           SELF_CASH_UNION_VALUE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 220300)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 220300)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 个人现金支付金额(银联)
 
           // 基金类型（扩展）
           BIRTH_FUND: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 510100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 510100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 生育基金
           RETIREE_MEDICAL: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 340100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 340100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 离休人员医疗保障基金
           URBAN_BASIC_MEDICAL: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 390100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 390100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 城乡居民基本医疗保险基金
           URBAN_SERIOUS_ILLNESS: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 390200)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 390200)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 城乡居民大病医疗保险基金
           MEDICAL_ASSISTANCE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 610100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 610100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 医疗救助基金
           GOVERNMENT_SUBSIDY: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 640100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 640100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 政府兜底基金
           ACCIDENT_INSURANCE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 390400)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 390400)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 意外伤害基金
           CARE_INSURANCE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 620100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 620100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 照护保险基金
           FINANCIAL_FUND: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 360100)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 360100)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 财政基金
           HOSPITAL_ADVANCE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 999900)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 999900)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 医院垫付
           SUPPLEMENTARY_INSURANCE: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 390300)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 390300)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 城乡居民大病补充保险基金
           HEALTHCARE_PREPAYMENT: (() => {
-            const amount = param.detail.find((t) => t.payEnum === 360300)?.amount ?? 0;
+            const amount = param.detail?.find((t) => t.payEnum === 360300)?.amount ?? 0;
             return amount > 0 ? amount + ' 元' : amount;
           })(), // 保健预支基金
           //微信刷卡支付
           SELF_CASH_VX_VALUE: (() => {
-            // const cashValue = param.detail.find((t) => t.payEnum === 220400)?.amount ?? 0;
-            const vxValue = param.detail.find((t) => t.payEnum === 220100)?.amount ?? 0;
-            const unionValue = param.detail.find((t) => t.payEnum === 220300)?.amount ?? 0;
-            const aliValue = param.detail.find((t) => t.payEnum === 220200)?.amount ?? 0;
-            return vxValue + unionValue + aliValue + ' 元';
+            // const cashValue = param.detail?.find((t) => t.payEnum === 220400)?.amount ?? 0;
+            const vxValue = param.detail?.find((t) => t.payEnum === 220100)?.amount ?? 0;
+            const unionValue = param.detail?.find((t) => t.payEnum === 220300)?.amount ?? 0;
+            const aliValue = param.detail?.find((t) => t.payEnum === 220200)?.amount ?? 0;
+            return (Number(vxValue) + Number(unionValue) + Number(aliValue)).toFixed(2) + ' 元';
           })(),
 
           Mr_QR_Code: param.regNo,
@@ -674,7 +674,9 @@ async function print() {
   };
   console.log(result, '==result.data==');
 
-  const printElements = templateJson;
+  const printElements = JSON.parse(
+    JSON.stringify(templateJson).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+  );
   var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
   const printerList = hiprintTemplate.getPrinterList();
   console.log(hiprintTemplate, '打印机列表');

openhis-ui-vue3/src/views/charge/cliniccharge/index.vue

@@ -287,7 +287,7 @@ function getPatientList() {
     queryParams.value.receptionTimeETime = undefined;
   }
   getList(queryParams.value).then((res) => {
-    patientList.value = res.data.data.records;
+    patientList.value = res.data?.data?.records || [];
   });
 }
 
@@ -363,17 +363,17 @@ function confirmCharge() {
     encounterId: patientInfo.value.encounterId,
     chargeItemIds: chargeItemIdList.value,
   }).then((res) => {
-    if (res.code == 200) {
+    if (res.code == 200 && res.data) {
       // totalAmount.value = res.data.psnCashPay;
       paymentId.value = res.data.paymentId;
       chrgBchnoList.value = res.data.chrgBchnoList;
-      totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
-      details.value = res.data.details.filter((item) => {
+      totalAmount.value = res.data.details?.find((item) => item.payEnum == 220000)?.amount ?? 0;
+      details.value = res.data.details?.filter((item) => {
         return item.amount > 0;
-      });
+      }) || [];
       openDialog.value = true;
     } else {
-      proxy.$modal.msgError(res.msg);
+      proxy.$modal.msgError(res?.msg || '预结算失败');
     }
   });
   // console.log(patientInfo)
@@ -517,11 +517,11 @@ async function handleReadCard(value) {
         ybMdtrtCertType: userCardInfo.psnCertType,
         busiCardInfo: userCardInfo.busiCardInfo,
       }).then((res) => {
-        if (res.code == 200) {
+        if (res.code == 200 && res.data) {
           // totalAmount.value = res.data.psnCashPay;
           paymentId.value = res.data.paymentId;
-          totalAmount.value = res.data.details.find((item) => item.payEnum == 220000).amount;
-          details.value = res.data.details;
+          totalAmount.value = res.data.details?.find((item) => item.payEnum == 220000)?.amount ?? 0;
+          details.value = res.data.details || [];
           // chrgBchnoList.value = res.data.chrgBchnoList;
           chargeItemIdList.value = selectRows.map((item) => {
             return item.id;
@@ -537,7 +537,7 @@ async function handleReadCard(value) {
             });
           openDialog.value = true;
         } else {
-          proxy.$modal.msgError(res.msg);
+          proxy.$modal.msgError(res?.msg || '预结算失败');
         }
       });
     }
@@ -648,9 +648,9 @@ function printCharge(row) {
   getChargeInfo({ paymentId: row.paymentId }).then((res) => {
     // 设置实收金额
     if (res.data && res.data.detail) {
-      const amountDetail = res.data.detail.find((item) => item.payEnum == 220000);
+      const amountDetail = res.data.detail?.find((item) => item.payEnum == 220000);
       if (amountDetail) {
-        totalAmount.value = amountDetail.amount;
+        totalAmount.value = amountDetail.amount || 0;
 
         // 为合并的行设置金额相关字段值
         rows.forEach((item) => {

openhis-ui-vue3/src/views/charge/clinicrefund/index.vue

@@ -302,14 +302,14 @@ function handleRefund(row) {
   //     return new Decimal(accumulator).add(new Decimal(currentRow.totalPrice || 0));
   //   }, 0);
   getReturnDetail({ id: row.paymentId }).then((res) => {
-    if (res.data.length > 0) {
+    if (res.data?.length > 0) {
       totalAmount.value =
-        res.data.find((item) => item.payEnum === 220000).amount -
-        (res.data.find((item) => item.payEnum === 220500)?.amount || 0);
+        (res.data.find((item) => item.payEnum === 220000)?.amount ?? 0) -
+        (res.data.find((item) => item.payEnum === 220500)?.amount ?? 0);
     }
-    details.value = res.data.filter((item) => {
+    details.value = res.data?.filter((item) => {
       return item.amount > 0;
-    });
+    }) || [];
   });
   paymentId.value = row.paymentId;
   patientInfo.value.patientId = row.patientId;

openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue

@@ -128,7 +128,7 @@ const getFeeTypeText = computed(() => {
   }
   // 如果只有一个选项，直接返回第一个选项的文本
   if (props.medfee_paymtd_code.length === 1) {
-    return props.medfee_paymtd_code[0].label || '';
+    return props.medfee_paymtd_code[0]?.label || '';
   }
   return '';
 });
@@ -214,38 +214,38 @@ async function printReceipt(param) {
         {
           ...param,
           // 基础支付类型
-          YB_FUND_PAY: param.detail.find((t) => t.payEnum === 100000)?.amount ?? 0, // 基金支付总额
-          SELF_PAY: param.detail.find((t) => t.payEnum === 200000)?.amount ?? 0, // 个人负担总金额
-          OTHER_PAY: param.detail.find((t) => t.payEnum === 300000)?.amount ?? 0, // 其他（如医院负担金额）
+          YB_FUND_PAY: param.detail?.find((t) => t.payEnum === 100000)?.amount ?? 0, // 基金支付总额
+          SELF_PAY: param.detail?.find((t) => t.payEnum === 200000)?.amount ?? 0, // 个人负担总金额
+          OTHER_PAY: param.detail?.find((t) => t.payEnum === 300000)?.amount ?? 0, // 其他（如医院负担金额）
 
           // 基本医保统筹基金支出
-          YB_TC_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 110000)?.amount ?? 0, // 基本医保统筹基金支出
-          YB_BC_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 120000)?.amount ?? 0, // 补充医疗保险基金支出
-          YB_JZ_FUND_AMOUNT: param.detail.find((t) => t.payEnum === 130000)?.amount ?? 0, // 医疗救助基金支出
-          YB_OTHER_AMOUNT: param.detail.find((t) => t.payEnum === 140000)?.amount ?? 0, // 其他支出
+          YB_TC_FUND_AMOUNT: param.detail?.find((t) => t.payEnum === 110000)?.amount ?? 0, // 基本医保统筹基金支出
+          YB_BC_FUND_AMOUNT: param.detail?.find((t) => t.payEnum === 120000)?.amount ?? 0, // 补充医疗保险基金支出
+          YB_JZ_FUND_AMOUNT: param.detail?.find((t) => t.payEnum === 130000)?.amount ?? 0, // 医疗救助基金支出
+          YB_OTHER_AMOUNT: param.detail?.find((t) => t.payEnum === 140000)?.amount ?? 0, // 其他支出
 
           // 职工基本医疗保险
-          YB_TC_ZG_FUND_VALUE: param.detail.find((t) => t.payEnum === 110100)?.amount ?? 0, // 职工基本医疗保险
-          YB_TC_JM_FUND_VALUE: param.detail.find((t) => t.payEnum === 110200)?.amount ?? 0, // 居民基本医疗保险
+          YB_TC_ZG_FUND_VALUE: param.detail?.find((t) => t.payEnum === 110100)?.amount ?? 0, // 职工基本医疗保险
+          YB_TC_JM_FUND_VALUE: param.detail?.find((t) => t.payEnum === 110200)?.amount ?? 0, // 居民基本医疗保险
 
           // 补充医疗保险基金支出细分
-          YB_BC_JM_DB_VALUE: param.detail.find((t) => t.payEnum === 120100)?.amount ?? 0, // 全体参保人的居民大病保险
-          YB_BC_DE_BZ_VALUE: param.detail.find((t) => t.payEnum === 120200)?.amount ?? 0, // 大额医疗费用补助
-          YB_BC_ZG_DE_BZ_VALUE: param.detail.find((t) => t.payEnum === 120300)?.amount ?? 0, // 企业职工大额医疗费用补助
-          YB_BC_GWY_BZ_VALUE: param.detail.find((t) => t.payEnum === 120400)?.amount ?? 0, // 公务员医疗补助
+          YB_BC_JM_DB_VALUE: param.detail?.find((t) => t.payEnum === 120100)?.amount ?? 0, // 全体参保人的居民大病保险
+          YB_BC_DE_BZ_VALUE: param.detail?.find((t) => t.payEnum === 120200)?.amount ?? 0, // 大额医疗费用补助
+          YB_BC_ZG_DE_BZ_VALUE: param.detail?.find((t) => t.payEnum === 120300)?.amount ?? 0, // 企业职工大额医疗费用补助
+          YB_BC_GWY_BZ_VALUE: param.detail?.find((t) => t.payEnum === 120400)?.amount ?? 0, // 公务员医疗补助
 
           // 其他支出细分
-          OTHER_PAY_DD_FUND_VALUE: param.detail.find((t) => t.payEnum === 300001)?.amount ?? 0, // 兜底基金支出
-          OTHER_PAY_YW_SH_FUND_VALUE: param.detail.find((t) => t.payEnum === 300002)?.amount ?? 0, // 意外伤害基金支出
-          OTHER_PAY_LX_YL_FUND_VALUE: param.detail.find((t) => t.payEnum === 300003)?.amount ?? 0, // 离休人员医疗保障金支出
-          OTHER_PAY_LX_YH_FUND_VALUE: param.detail.find((t) => t.payEnum === 300004)?.amount ?? 0, // 离休人员优惠金支出
-          OTHER_PAY_CZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300005)?.amount ?? 0, // 财政基金支出
-          OTHER_PAY_CZ_YZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300006)?.amount ?? 0, // 财政预支支出
-          OTHER_PAY_ZG_DB_FUND_VALUE: param.detail.find((t) => t.payEnum === 300007)?.amount ?? 0, // 职工大病基金支出
-          OTHER_PAY_EY_FUND_VALUE: param.detail.find((t) => t.payEnum === 300008)?.amount ?? 0, // 二乙基金支出
-          OTHER_PAY_QX_JZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300009)?.amount ?? 0, // 倾斜救助支出
-          OTHER_PAY_YL_JZ_FUND_VALUE: param.detail.find((t) => t.payEnum === 300010)?.amount ?? 0, // 医疗救助再救助基金
-          HOSP_PART_AMT: param.detail.find((t) => t.payEnum === 300011)?.amount ?? 0, // 医院负担金额
+          OTHER_PAY_DD_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300001)?.amount ?? 0, // 兜底基金支出
+          OTHER_PAY_YW_SH_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300002)?.amount ?? 0, // 意外伤害基金支出
+          OTHER_PAY_LX_YL_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300003)?.amount ?? 0, // 离休人员医疗保障金支出
+          OTHER_PAY_LX_YH_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300004)?.amount ?? 0, // 离休人员优惠金支出
+          OTHER_PAY_CZ_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300005)?.amount ?? 0, // 财政基金支出
+          OTHER_PAY_CZ_YZ_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300006)?.amount ?? 0, // 财政预支支出
+          OTHER_PAY_ZG_DB_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300007)?.amount ?? 0, // 职工大病基金支出
+          OTHER_PAY_EY_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300008)?.amount ?? 0, // 二乙基金支出
+          OTHER_PAY_QX_JZ_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300009)?.amount ?? 0, // 倾斜救助支出
+          OTHER_PAY_YL_JZ_FUND_VALUE: param.detail?.find((t) => t.payEnum === 300010)?.amount ?? 0, // 医疗救助再救助基金
+          HOSP_PART_AMT: param.detail?.find((t) => t.payEnum === 300011)?.amount ?? 0, // 医院负担金额
 
           // 医保结算返回值 - 修复运算符优先级问题，添加括号确保正确拼接'元'
           FULAMT_OWNPAY_AMT: (param.detail?.find((t) => t.payEnum === 1)?.amount ?? 0) + '元', // 全自费金额
@@ -347,11 +347,11 @@ async function printReceipt(param) {
               : '', // 保健预支基金
           //微信刷卡支付
           SELF_CASH_VX_VALUE: (() => {
-            // const cashValue = param.detail.find((t) => t.payEnum === 220400)?.amount ?? 0;
-            const vxValue = param.detail.find((t) => t.payEnum === 220100)?.amount ?? 0;
-            const unionValue = param.detail.find((t) => t.payEnum === 220300)?.amount ?? 0;
-            const aliValue = param.detail.find((t) => t.payEnum === 220200)?.amount ?? 0;
-            return vxValue + unionValue + aliValue + '元';
+            // const cashValue = param.detail?.find((t) => t.payEnum === 220400)?.amount ?? 0;
+            const vxValue = param.detail?.find((t) => t.payEnum === 220100)?.amount ?? 0;
+            const unionValue = param.detail?.find((t) => t.payEnum === 220300)?.amount ?? 0;
+            const aliValue = param.detail?.find((t) => t.payEnum === 220200)?.amount ?? 0;
+            return (Number(vxValue) + Number(unionValue) + Number(aliValue)).toFixed(2) + '元';
           })(),
 
           // 患者信息

openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue

@@ -196,7 +196,7 @@ watch(
           // 计算应退金额并更新表单数据
           const targetPayEnums = [220500, 220400, 220100, 220200, 220300];
           const sum = res.data
-            .filter((item) => targetPayEnums.includes(item.payEnum))
+            ?.filter((item) => targetPayEnums.includes(item.payEnum))
             .reduce((total, item) => total + (Number(item.amount) || 0), 0);
           if (sum > 0) {
             formData.totalAmount = sum;
@@ -313,9 +313,9 @@ const displayAmount = computed(() => {
   }
   const targetPayEnums = [220500, 220400, 220100, 220200, 220300];
   const sum = preCancelData.value
-    .filter((item) => targetPayEnums.includes(item.payEnum))
+    ?.filter((item) => targetPayEnums.includes(item.payEnum))
     .reduce((sum, item) => sum + (Number(item.amount) || 0), 0);
-  return sum.toFixed(2);
+  return sum?.toFixed(2) ?? '0.00';
 });
 
 const returnedAmount = computed(() => {
@@ -334,7 +334,7 @@ const calculatedTotalAmount = computed(() => {
   const targetPayEnums = [220500, 220400, 220100, 220200, 220300];
   // 应退金额 = (amount - returnAmount) 的总和，即剩余应退金额
   const sum = preCancelData.value
-    .filter((item) => targetPayEnums.includes(item.payEnum))
+    ?.filter((item) => targetPayEnums.includes(item.payEnum))
     .reduce(
       (total, item) => total + ((Number(item.amount) || 0) - (Number(item.returnAmount) || 0)),
       0
@@ -348,7 +348,7 @@ const calculatedReturnAmount = computed(() => {
   }
   const targetPayEnums = [220500, 220400, 220100, 220200, 220300];
   const sum = preCancelData.value
-    .filter((item) => targetPayEnums.includes(item.payEnum))
+    ?.filter((item) => targetPayEnums.includes(item.payEnum))
     .reduce((total, item) => total + (Number(item.returnAmount) || 0), 0);
   return sum || 0;
 });
@@ -359,12 +359,12 @@ const refundMethodsFromApi = computed(() => {
     return [];
   }
   const targetPayEnums = [220500, 220400, 220100, 220200, 220300];
-  return preCancelData.value.filter(
+  return preCancelData.value?.filter(
     (item) =>
       targetPayEnums.includes(item.payEnum) &&
       item.payEnum_dictText &&
       item.payEnum_dictText.trim() !== ''
-  );
+  ) || [];
 });
 
 // 根据 payEnum 获取支付方式标签
@@ -380,7 +380,7 @@ const getPayMethodLabel = (payEnum) => {
 
 // 计算所有退费方式的总和
 const totalRefundAmount = computed(() => {
-  return refundMethodsFromApi.value.reduce((sum, item) => sum + (Number(item.amount) || 0), 0);
+  return refundMethodsFromApi.value?.reduce((sum, item) => sum + (Number(item.amount) || 0), 0) ?? 0;
 });
 
 // 计算剩余可输入金额（应退金额 - 已输入的退费金额总和）

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -4,9 +4,9 @@
       <el-col :span="24" class="card-box">
         <el-card>
           <template #header>
-            <div style="display: flex; align-items: center; justify-content: space-between; width: 100%">
-              <span style="vertical-align: middle; font-size: 16px; font-weight: bold;">门诊挂号</span>
-              <div class="header-buttons">
+            <div style="display: flex; align-items: center; width: 100%">
+              <span style="font-size: 16px; font-weight: bold; margin-right: 20px;">门诊挂号</span>
+              <div style="flex: 1; display: flex; justify-content: center; align-items: center;">
                 <el-button type="primary" icon="Document" @click="goToPatientRecord" size="small">档案</el-button>
                 <el-button type="primary" icon="Plus" @click="handleAddPatient" size="small">新建</el-button>
                 <el-button type="primary" plain icon="Search" @click="handleSearch" size="small">查询</el-button>
@@ -420,6 +420,16 @@
               prop="genderEnum_enumText"
             />
             <el-table-column label="联系电话" align="center" key="phone" prop="phone" />
+            <el-table-column
+              label="就诊卡号"
+              align="center"
+              key="identifierNo"
+              width="150"
+            >
+              <template #default="scope">
+                {{ scope.row.identifierNo || scope.row.cardNo || scope.row.card || scope.row.patientCardNo || scope.row.patient?.identifierNo || '-' }}
+              </template>
+            </el-table-column>
             <el-table-column
               label="科室名称"
               align="center"
@@ -593,6 +603,18 @@
       :chargeItemIds="chargeItemIdList"
       :eventType="eventType"
     />
+    <ReprintDialog
+      :open="openReprintDialog"
+      @close="
+        (value) => {
+          if (value == 'success') {
+            proxy.$modal.msgSuccess('操作成功');
+            getList();
+          }
+          openReprintDialog = false;
+        }
+      "
+    />
   </div>
 </template>
 
@@ -617,6 +639,7 @@ import patientList from './components/patientList';
 import {nextTick, onMounted, onUnmounted, ref} from 'vue';
 import ChargeDialog from './components/chargeDialog.vue';
 import RefundDialog from './components/refundDialog.vue';
+import ReprintDialog from './components/reprintDialog.vue';
 import {handleColor} from '@/utils/his';
 import useUserStore from '@/store/modules/user';
 import {formatDateStr} from '@/utils/index';
@@ -709,7 +732,6 @@ const data = reactive({
     contractNo: [{ required: true, message: '费用性质', trigger: 'blur' }],
     patientId: [{ required: true, message: '病人不能为空', trigger: 'blur' }],
     priorityEnum: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
-    serviceTypeId: [{ required: true, message: '挂号类型不能为空', trigger: 'blur' }],
     organizationId: [{ required: true, message: '优先级不能为空', trigger: 'blur' }],
     orgId: [{ required: true, message: '就诊科室不能为空', trigger: 'blur' }],
     practitionerId: [{ required: true, message: '医生不能为空', trigger: 'blur' }],
@@ -779,10 +801,10 @@ const { queryParams, form, rules } = toRefs(data);
 
 /** 根据contractNo获取费用性质名称 */
 function getFeeTypeName(contractNo) {
-  if (!contractNo || !medfee_paymtd_code || !Array.isArray(medfee_paymtd_code)) {
+  if (!contractNo || !medfee_paymtd_code?.value || !Array.isArray(medfee_paymtd_code.value)) {
     return '';
   }
-  const dictItem = medfee_paymtd_code.find(item => item.value === contractNo);
+  const dictItem = medfee_paymtd_code.value.find(item => item.value === contractNo);
   return dictItem ? dictItem.label : '';
 }
 
@@ -1039,10 +1061,18 @@ function getList() {
     outpatientRegistrationList.value = res.data.records;
     total.value = res.data.total;
     
-    // 调试：查看返回的数据结构（仅退号记录查询时）
-    if (queryType.value === 'returned' && res.data.records && res.data.records.length > 0) {
-      console.log('退号记录数据结构:', res.data.records[0]);
+    // 调试：查看返回的数据结构，查找就诊卡号字段
+    if (res.data.records && res.data.records.length > 0) {
+      console.log('当日已挂号数据结构:', res.data.records[0]);
       console.log('所有字段:', Object.keys(res.data.records[0]));
+      // 查找可能的就诊卡号字段
+      const firstRecord = res.data.records[0];
+      const possibleCardFields = ['identifierNo', 'cardNo', 'card', 'patientCardNo', 'identifier', 'medicalCardNo'];
+      possibleCardFields.forEach(field => {
+        if (firstRecord[field] !== undefined) {
+          console.log(`找到可能的就诊卡号字段 ${field}:`, firstRecord[field]);
+        }
+      });
     }
   });
 }
@@ -1155,7 +1185,7 @@ function filterDoctorsByHealthcare() {
   }
 
   // 获取选中的挂号类型信息
-  const selectedHealthcare = healthcareList.value.find(
+  const selectedHealthcare = healthcareList.value?.find(
     (healthcare) => healthcare.id === form.value.serviceTypeId
   );
 
@@ -1319,7 +1349,7 @@ function handleAdd() {
     genderEnum_enumText: form.value.genderEnum_enumText,
     age: form.value.age,
     contractName: form.value.contractNo
-      ? contractList.value.find((item) => item.busNo === form.value.contractNo)?.contractName ||
+      ? contractList.value?.find((item) => item.busNo === form.value.contractNo)?.contractName ||
         '自费'
       : '自费',
     idCard: form.value.idCard,

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -449,6 +449,10 @@ function handleDiagnosisChange(item, row) {
 
 function handleFocus(row, index) {
   rowIndex.value = index;
+  // 如果当前行已选择adviceType，同步到adviceQueryParams
+  if (row.adviceType !== undefined) {
+    adviceQueryParams.value.adviceType = row.adviceType;
+  }
   row.showPopover = true;
 }
 

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json

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

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue

@@ -356,7 +356,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '长春市朝阳区中医院医院',
+        fixmedinsName: userStore.hospitalName,
         queryTime: queryTime.value[0] + '~' + queryTime.value[1],
         zfAmount: new Decimal(reportValue.value.zhSum || 0).add(reportValue.value.fundSum || 0),
         feeAmount: new Decimal(reportValue.value.DIAGNOSTIC_FEE || 0)

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue

@@ -514,7 +514,9 @@ async function print() {
   };
   console.log(result, '==result.data==');
 
-  const printElements = templateJson;
+  const printElements = JSON.parse(
+    JSON.stringify(templateJson).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+  );
   var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
   const printerList = hiprintTemplate.getPrinterList();
   console.log(hiprintTemplate, '打印机列表');

openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json

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

openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json

@@ -37,7 +37,7 @@
             "top": 16.5,
             "height": 22.5,
             "width": 120,
-            "title": "长春市朝阳区中医院医院",
+            "title": "{{HOSPITAL_NAME}}医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontFamily": "Microsoft YaHei",

openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue

@@ -660,7 +660,9 @@ function printPrescription() {
     // 将对象转换为 JSON 字符串
     console.log(result, 'result');
     // 模板对象获取
-    const printElements = prescriptionTemplate;
+    const printElements = JSON.parse(
+      JSON.stringify(prescriptionTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+    );
     var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
     hiprintTemplate.print2(result, {
       title: '打印标题',
@@ -695,7 +697,9 @@ function printDisposal() {
     .join(',');
   advicePrint({ requestIds: requestIds }).then((res) => {
     const result = res.data;
-    const printElements = disposalTemplate;
+    const printElements = JSON.parse(
+      JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+    );
     var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
     hiprintTemplate.print2(result, {
       height: 210,
@@ -735,7 +739,9 @@ function printBloodBarcode() {
   } else {
     printBloodCode({ requestId: selectedRows[0].requestId }).then((res) => {
       const result = res.data;
-      const printElements = bloodTemplate;
+      const printElements = JSON.parse(
+        JSON.stringify(bloodTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
       var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
       hiprintTemplate.print2(result, {
         height: 210,

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue

@@ -27,7 +27,7 @@
           <span>CF0000000001</span>
         </div>
         <div style="text-align: center">
-          <h2>长春市朝阳区中医院医院</h2>
+          <h2>{{ userStore.hospitalName }}</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>
@@ -130,7 +130,9 @@
 
 <script setup name="historicalPrescriptionDetail">
 import {getPrescriptionDetail} from './api';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({

openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue

@@ -197,7 +197,10 @@ watch(
     
     // 直接更新查询参数
     queryParams.value.searchKey = newValue.searchKey || '';
-    
+
+    // 更新categoryCode
+    queryParams.value.categoryCode = newValue.categoryCode || '';
+
     // 处理类型筛选
     if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') {
       // 单个类型
@@ -215,8 +218,18 @@ getList();
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
   if (row.priceList && row.priceList.length > 0) {
-    const price = row.priceList[0].price || 0;
-    return Number(price).toFixed(2) + ' 元';
+    const price = row.priceList[0].price;
+    // 检查价格是否为有效数字
+    if (price !== undefined && price !== null && !isNaN(price) && isFinite(price)) {
+      return Number(price).toFixed(2) + ' 元';
+    }
+    // 如果价格无效，尝试从其他可能的字段获取价格
+    if (row.totalPrice !== undefined && row.totalPrice !== null && !isNaN(row.totalPrice) && isFinite(row.totalPrice)) {
+      return Number(row.totalPrice).toFixed(2) + ' 元';
+    }
+    if (row.price !== undefined && row.price !== null && !isNaN(row.price) && isFinite(row.price)) {
+      return Number(row.price).toFixed(2) + ' 元';
+    }
   }
   return '-';
 }

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -127,8 +127,8 @@
               <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
                   label="主诊断"
-                  :trueLabel="1"
-                  :falseLabel="0"
+                  :true-value="1"
+                  :false-value="0"
                   v-model="scope.row.maindiseFlag"
                   border
                   size="small"
@@ -409,10 +409,10 @@ function getTree() {
 function handleAddDiagnosis() {
   proxy.$refs.formRef.validate((valid) => {
     if (valid) {
-      // if (!allowAdd.value) {
-      //   proxy.$modal.msgWarning('请先填写病历');
-      //   return;
-      // }
+      const maxSortNo = form.value.diagnosisList.length > 0 
+        ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
+        : 0;
+      
       form.value.diagnosisList.push({
         showPopover: false,
         name: undefined,
@@ -491,6 +491,7 @@ function handleSaveDiagnosis() {
         return false;
       } else if (!form.value.diagnosisList.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
         proxy.$modal.msgWarning('至少添加一条主诊断');
+        return false;
       } else {
         // 保存前按排序号排序
         form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue

@@ -38,7 +38,7 @@ watch(
     queryParams.value.searchKey = newValue;
     getList();
   },
-  { immdiate: true }
+  { immediate: true }
 );
 
 getList();

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -17,7 +17,7 @@
           </el-button>
         </div>
       </div>
-
+      <!--检验信息-->
       <el-table
         ref="inspectionTableRef"
         :data="inspectionList"
@@ -79,7 +79,7 @@
       </div>
     </div>
 
-    <!-- 下方：申请单和检验项目选择器 -->
+      <!-- 下方：申请单和检验项目选择器 -->
     <div style="display: flex; gap: 20px">
       <!-- 左侧：申请单和检验信息 -->
       <div style="width: 55%">
@@ -88,18 +88,18 @@
             <div class="application-form" style="padding: 20px; height: 700px; overflow-y: auto; border: 1px solid #e4e7ed; border-radius: 4px; margin: 10px;">
               <div style="margin-bottom: 20px">
                 <label style="display: block; margin-bottom: 5px; font-weight: bold">申请单号</label>
-                <el-input v-model="formData.applicationNo" disabled size="small" />
+                <el-input v-model="formData.applicationNo" readonly size="small" />
               </div>
 
               <!-- 患者信息行 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 15px; margin-bottom: 20px">
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">姓名</label>
-                  <el-input v-model="formData.patientName" disabled size="small" />
+                  <el-input v-model="formData.patientName" readonly size="small" />
                 </div>
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">就诊卡号</label>
-                  <el-input v-model="formData.cardNo" disabled size="small" />
+                  <el-input v-model="formData.identifierNo" readonly size="small" />
                 </div>
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">费用性质</label>
@@ -115,6 +115,7 @@
 
               <!-- 申请信息行 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 15px; margin-bottom: 20px">
+                <!--申请日期-->
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">申请日期</label>
                   <el-date-picker
@@ -127,6 +128,7 @@
                     style="width: 100%"
                   />
                 </div>
+                <!--申请科室-->
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">申请科室</label>
                   <el-select v-model="formData.departmentName" placeholder="请选择申请科室" size="small" style="width: 100%" disabled>
@@ -135,9 +137,11 @@
                     <el-option label="儿科" value="pediatrics" />
                   </el-select>
                 </div>
+
+                <!--申请医生-->
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">申请医生</label>
-                  <el-select v-model="formData.doctorName" placeholder="请选择申请医生" size="small" style="width: 100%" disabled>
+                  <el-select v-model="formData.doctorName" placeholder="请选择申请医生" size="small" style="width: 100%">
                     <el-option label="张医生" value="doctor_zhang" />
                     <el-option label="李医生" value="doctor_li" />
                     <el-option label="王医生" value="doctor_wang" />
@@ -164,7 +168,7 @@
                 <div v-if="validationErrors.executeDepartment" class="error-message">请选择执行科室</div>
               </div>
 
-              <!-- 诊断相关字段 -->
+              <!-- 诊断描述 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 20px">
                 <div :class="{ 'form-item-error': validationErrors.diagnosisDesc }">
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">诊断描述 <span style="color: #f56c6c">*</span></label>
@@ -248,7 +252,6 @@
               </div>
             </div>
           </el-tab-pane>
-
           <el-tab-pane label="检验信息" name="inspectionInfo">
             <div style="padding: 20px; height: 700px; overflow-y: auto; border: 1px solid #e4e7ed; border-radius: 4px; margin: 10px;">
               <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 20px">
@@ -458,7 +461,7 @@ const formData = reactive({
   applicationId: null,
   applicationNo: '202511210001',
   patientName: '',
-  cardNo: '',
+  identifierNo: '',
   feeType: 'self',
   applicationDate: new Date(),
   departmentName: '',
@@ -579,11 +582,11 @@ const getFilteredItems = (categoryKey) => {
 
 // 初始化数据
 function initData() {
-  console.log('检验组件初始化，patientInfo:', props.patientInfo)
+  // console.log('检验组件初始化，patientInfo:', props.patientInfo)
   if (props.patientInfo) {
     queryParams.encounterId = props.patientInfo.encounterId
     formData.patientName = props.patientInfo.patientName || ''
-    formData.cardNo = props.patientInfo.cardNo || ''
+    formData.identifierNo = props.patientInfo.identifierNo || ''
     formData.departmentName = props.patientInfo.departmentName || ''
     formData.doctorName = props.patientInfo.doctorName || ''
   }
@@ -597,26 +600,26 @@ function initData() {
 function getInspectionList() {
   // 如果没有encounterId,不调用接口
   if (!queryParams.encounterId) {
-    console.warn('【检验】encounterId为空,不调用接口')
+    // console.warn('【检验】encounterId为空,不调用接口')
     return
   }
   
   loading.value = true
 
   // 调用真实的API，只传递 encounterId 参数
-  console.log('【检验】调用API,encounterId:', queryParams.encounterId)
+  // console.log('【检验】调用API,encounterId:', queryParams.encounterId)
   getInspectionApplicationList({ encounterId: queryParams.encounterId }).then((res) => {
     if (res.code === 200) {
       inspectionList.value = res.data || []
       total.value = res.data?.length || 0
-      console.log('【检验】获取数据成功,数量:', inspectionList.value.length)
+      // console.log('【检验】获取数据成功,数量:', inspectionList.value.length)
     } else {
       inspectionList.value = []
       total.value = 0
       ElMessage.error('获取检验申请单列表失败')
     }
   }).catch((error) => {
-    console.error('获取检验申请单列表异常:', error)
+    // console.error('获取检验申请单列表异常:', error)
     inspectionList.value = []
     total.value = 0
     ElMessage.error('获取检验申请单列表异常')
@@ -627,7 +630,7 @@ function getInspectionList() {
 
 // 新增申请单
 function handleNewApplication() {
-  console.log('点击新增按钮')
+  // console.log('点击新增按钮')
   resetForm()
   // 生成申请单号
   formData.applicationNo = generateApplicationNo()
@@ -737,7 +740,7 @@ function handleSave() {
     totalAmount: selectedInspectionItems.value.reduce((sum, item) => sum + item.price + (item.serviceFee || 0), 0)
   }
 
-  console.log('保存检验申请单数据:', saveData)
+  // console.log('保存检验申请单数据:', saveData)
 
   // 调用真实的API保存
   saveInspectionApplication(saveData).then((res) => {
@@ -751,7 +754,7 @@ function handleSave() {
       ElMessage.error(res.message || '保存失败')
     }
   }).catch((error) => {
-    console.error('保存检验申请单异常:', error)
+    // console.error('保存检验申请单异常:', error)
     ElMessage.error('保存异常')
   })
 }
@@ -761,7 +764,7 @@ function handleFormSave() {
   formRef.value?.validate((valid) => {
     if (valid) {
       formData.inspectionItems = selectedInspectionItems.value.map(item => item.id)
-      console.log('保存检验申请单表单数据:', formData)
+      // console.log('保存检验申请单表单数据:', formData)
       ElMessage.success('保存成功')
       showForm.value = false
       getInspectionList()
@@ -771,7 +774,7 @@ function handleFormSave() {
 
 // 查看详情
 function handleView(row) {
-  console.log('点击查看按钮，数据:', row)
+  // console.log('点击查看按钮，数据:', row)
   // 加载表单数据
   Object.assign(formData, row)
 
@@ -811,7 +814,7 @@ function switchCategory(category) {
 // 处理搜索
 function handleSearch() {
   // 搜索逻辑已在getFilteredItems中实现，这里可以添加额外的搜索逻辑
-  console.log('搜索关键词:', searchKeyword.value)
+  // console.log('搜索关键词:', searchKeyword.value)
 }
 
 // 处理项目项点击（排除勾选框点击）
@@ -866,7 +869,7 @@ function handleSelectionChange(selection) {
 
 // 打印申请单
 function handlePrint(row) {
-  console.log('打印申请单:', row)
+  // console.log('打印申请单:', row)
 
   // 切换到申请单TAB
   leftActiveTab.value = 'application'
@@ -949,7 +952,7 @@ function handleDelete(row) {
       confirmButtonClass: 'el-button--danger'
     }
   ).then(() => {
-    console.log('删除申请单:', row)
+    // console.log('删除申请单:', row)
     // 调用真实的API删除
     deleteInspectionApplication(row.applicationId).then((res) => {
       if (res.code === 200) {
@@ -960,7 +963,7 @@ function handleDelete(row) {
         ElMessage.error(res.message || '删除失败')
       }
     }).catch((error) => {
-      console.error('删除检验申请单异常:', error)
+      // console.error('删除检验申请单异常:', error)
       ElMessage.error('删除异常')
     })
   }).catch(() => {
@@ -987,10 +990,11 @@ watch(() => props.activeTab, (newVal) => {
 
 // 监听patientInfo变化,确保encounterId及时更新
 watch(() => props.patientInfo, (newVal) => {
-  console.log('【检验】patientInfo变化:', newVal)
+  // console.log('【检验】patientInfo变化:', newVal)
+  console.log('【检验】接收到的完整patientInfo:', JSON.stringify(newVal, null, 2))
   if (newVal && newVal.encounterId) {
     queryParams.encounterId = newVal.encounterId
-    console.log('【检验】更新encounterId:', queryParams.encounterId)
+    // console.log('【检验】更新encounterId:', queryParams.encounterId)
   }
 }, { deep: true, immediate: true })
 

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue

@@ -19,7 +19,7 @@
           <span>{{ item.prescriptionNo }}</span>
         </div>
         <div style="text-align: center">
-          <h2>长春市朝阳区中医院医院</h2>
+          <h2>{{ userStore.hospitalName }}</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>
@@ -144,6 +144,9 @@
 import {formatDateStr} from '@/utils/index';
 //高精度库
 import Decimal from 'decimal.js';
+import useUserStore from '@/store/modules/user';
+
+const userStore = useUserStore();
 
 const props = defineProps({
   open: {

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -96,7 +96,7 @@
                       ' ' +
                       scope.row.volume +
                       ' [' +
-                      Number(scope.row.unitPrice).toFixed(2) +
+                      (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice) ? Number(scope.row.unitPrice).toFixed(2) : '-') +
                       ' 元' +
                       '/' +
                       scope.row.unitCode_dictText +
@@ -145,7 +145,7 @@
                   <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
                   <span class="total-amount">
                     总金额：{{
-                      scope.row.totalPrice
+                      (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                         ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                         : '0.00 元'
                     }}
@@ -631,7 +631,7 @@
                           " " +
                           scope.row.volume +
                           " [" +
-                          Number(scope.row.unitPrice).toFixed(2) +
+                          (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice) ? Number(scope.row.unitPrice).toFixed(2) : '-') +
                           " 元" +
                           "/" +
                           scope.row.unitCode_dictText +
@@ -687,7 +687,7 @@
                       </el-form-item>
                       <span class="total-amount">
                         总金额：{{
-                          scope.row.totalPrice
+                          (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                             ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                             : '0.00 元'
                         }}
@@ -702,7 +702,7 @@
                   <span style="font-size: 16px; font-weight: 600">
                     {{ scope.row.adviceName }}
                     {{
-                      scope.row.unitPrice
+                      (scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) && isFinite(scope.row.unitPrice))
                         ? Number(scope.row.unitPrice).toFixed(2) + '/次'
                         : '-' + '元'
                     }}
@@ -748,7 +748,7 @@
                     <span class="total-amount">
                       总金额：
                       {{
-                        scope.row.totalPrice
+                        (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice))
                           ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
                           : '0.00 元'
                       }}
@@ -766,77 +766,128 @@
       </el-table-column>
       <el-table-column type="selection" align="center" width="60" />
       <el-table-column label="组" align="center" width="60" prop="groupIcon" />
-      <el-table-column label="医嘱" align="center" prop="productName" width="400">
+      <el-table-column label="医嘱类型" align="center" prop="productName" width="130">
         <template #default="scope">
           <template v-if="scope.row.isEdit">
             <el-select
-              style="width: 35%; margin-right: 20px"
-              v-model="scope.row.adviceType"
-              :ref="'adviceTypeRef' + scope.$index"
-              @change="
-                (value) => {
-                  expandOrder = [];
-                  prescriptionList[scope.$index].adviceName = undefined;
-                  adviceQueryParams.adviceType = value;
-                }
-              "
+                size="default"
+                style="width: 100%;"
+                v-model="scope.row.adviceType"
+                :ref="'adviceTypeRef' + scope.$index"
+                placeholder="选择类型"
+                clearable
+                @change="
+                  (value) => {
+                    expandOrder = [];
+                    // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
+                    prescriptionList[scope.$index].adviceName = undefined;
+                    adviceQueryParams.adviceType = value;
+
+                    // 根据选择的类型设置categoryCode，用于药品分类筛选
+                    if (value == 1) { // 西药
+                      adviceQueryParams.categoryCode = '2';
+                    } else if (value == 2) { // 中成药
+                      adviceQueryParams.categoryCode = '1';
+                    } else if (value == 3) { // 耗材
+                      adviceQueryParams.categoryCode = ''; // 耗材不需要categoryCode筛选
+                    } else if (value == 4) { // 诊疗
+                      adviceQueryParams.categoryCode = ''; // 诊疗不需要categoryCode筛选
+                    } else {
+                      adviceQueryParams.categoryCode = ''; // 全部类型
+                    }
+                  }
+                "
+                @clear="
+                  () => {
+                    prescriptionList[scope.$index].adviceName = undefined;
+                    prescriptionList[scope.$index].adviceType_dictText = '';
+                  }
+                "
             >
               <el-option
-                v-for="item in adviceTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-                @click="
-                  () => {
-                    prescriptionList[scope.$index].adviceType = item.value;
-                    prescriptionList[scope.$index].adviceType_dictText = item.label;
-                  }
-                "
-              />
+                  v-for="item in adviceTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  @click="
+                    () => {
+                      prescriptionList[scope.$index].adviceType = item.value;
+                      prescriptionList[scope.$index].adviceType_dictText = item.label;
+                    }
+                  "
+              >
+                <span style="float: left">{{ item.label }}</span>
+                <span style="float: right; color: var(--el-text-color-secondary); font-size: 12px">
+                  {{ item.value }}
+                </span>
+              </el-option>
             </el-select>
+          </template>
+          <el-tag v-else size="small" type="primary">{{ scope.row.adviceType_dictText }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目" align="center" prop="" width="280">
+        <template #default="scope">
+          <template v-if="scope.row.isEdit">
             <el-popover
-              :popper-style="{ padding: '0' }"
-              placement="bottom-start"
-              :visible="scope.row.showPopover"
-              :width="1200"
+                :popper-style="{ padding: '0' }"
+                placement="bottom-start"
+                :visible="scope.row.showPopover"
+                :width="1200"
+                trigger="manual"
             >
               <adviceBaseList
-                ref="adviceTableRef"
-                :popoverVisible="scope.row.showPopover"
-                :adviceQueryParams="adviceQueryParams"
-                :patientInfo="props.patientInfo"
-                @selectAdviceBase="
-                  (row) => {
-                    selectAdviceBase(scope.row.uniqueKey, row);
-                  }
-                "
+                  ref="adviceTableRef"
+                  :popoverVisible="scope.row.showPopover"
+                  :adviceQueryParams="adviceQueryParams"
+                  :patientInfo="props.patientInfo"
+                  @selectAdviceBase="
+                    (row) => {
+                      selectAdviceBase(scope.row.uniqueKey, row);
+                    }
+                  "
               />
               <template #reference>
                 <el-input
-                  :ref="'adviceRef' + scope.$index"
-                  style="width: 50%"
-                  v-model="scope.row.adviceName"
-                  placeholder="请选择项目"
-                  @input="handleChange"
-                  @click="handleFocus(scope.row, scope.$index)"
-                  @blur="handleBlur(scope.row)"
-                  @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
-                  @keydown="
-                    (e) => {
-                      if (!scope.row.showPopover) return;
-                      // 拦截上下键和回车事件
-                      if (['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) {
-                        e.preventDefault();
-                        // 传递事件到弹窗容器
-                        adviceTableRef.handleKeyDown(e);
+                    :ref="'adviceRef' + scope.$index"
+                    size="default"
+                    style="width: 100%;"
+                    v-model="scope.row.adviceName"
+                    placeholder="输入项目名称搜索或点击选择"
+                    clearable
+                    @input="handleChange"
+                    @click="handleFocus(scope.row, scope.$index)"
+                    @blur="handleBlur(scope.row)"
+                    @clear="() => { scope.row.adviceName = undefined; }"
+                    @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
+                    @keydown="
+                      (e) => {
+                        if (!scope.row.showPopover) return;
+                        // 拦截上下键和回车事件
+                        if (['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) {
+                          e.preventDefault();
+                          // 传递事件到弹窗容器
+                          adviceTableRef.handleKeyDown(e);
+                        }
                       }
-                    }
-                  "
-                />
+                    "
+                >
+                  <template #prefix>
+                    <el-icon><Search /></el-icon>
+                  </template>
+                  <template #suffix v-if="scope.row.adviceName">
+                    <el-icon style="cursor: pointer; color: var(--el-color-info);" title="快速选择">
+                      <ArrowDown />
+                    </el-icon>
+                  </template>
+                </el-input>
               </template>
             </el-popover>
           </template>
-          <span v-else>{{ scope.row.adviceName }}</span>
+          <div v-else style="display: flex; align-items: center; gap: 8px;">
+            <el-icon color="var(--el-color-primary)"><Memo /></el-icon>
+            <span>{{ scope.row.adviceName }}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="" width="90">
@@ -869,7 +920,7 @@
       <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
         <template #default="scope">
           <span v-if="!scope.row.isEdit" style="text-align: right">
-            {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
+            {{ (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice) && isFinite(scope.row.totalPrice)) ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
           </span>
         </template>
       </el-table-column>
@@ -991,8 +1042,9 @@ import SkinTestInfo from './skinTestInfo';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
 import {ElMessage, ElMessageBox} from 'element-plus';
-import {ArrowDown} from '@element-plus/icons-vue';
+import {ArrowDown, Search, Memo} from '@element-plus/icons-vue';
 import printUtils, {getPrinterList, PRINT_TEMPLATE, savePrinterToCache,} from '@/utils/printUtils';
+import Template from "@/views/inpatientDoctor/home/emr/components/template.vue";
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
@@ -2433,8 +2485,8 @@ function setValue(row) {
     ? (typeof row.skinTestFlag === 'number' ? row.skinTestFlag : (row.skinTestFlag ? 1 : 0))
     : 0;
 
-  prescriptionList.value[targetIndex] = {
-    ...prescriptionList.value[targetIndex],
+  prescriptionList.value[rowIndex.value] = {
+    ...prescriptionList.value[rowIndex.value],
     ...JSON.parse(JSON.stringify(row)),
     // 确保adviceType为数字类型，避免类型不匹配导致的显示问题
     adviceType: Number(row.adviceType),
@@ -2813,12 +2865,25 @@ function getGroupMarkers() {
 function calculateTotalPrice(row, index) {
   nextTick(() => {
     if (row.adviceType == 3) {
-      row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
+      // 检查价格是否为有效数字
+      if (row.unitPrice !== undefined && row.unitPrice !== null && !isNaN(row.unitPrice) && isFinite(row.unitPrice)) {
+        row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
+      } else {
+        row.totalPrice = '0.000000'; // 或者设置为 0
+      }
     } else {
       if (row.unitCode == row.minUnitCode) {
-        row.totalPrice = (row.minUnitPrice * row.quantity).toFixed(6);
+        if (row.minUnitPrice !== undefined && row.minUnitPrice !== null && !isNaN(row.minUnitPrice) && isFinite(row.minUnitPrice)) {
+          row.totalPrice = (row.minUnitPrice * row.quantity).toFixed(6);
+        } else {
+          row.totalPrice = '0.000000';
+        }
       } else {
-        row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
+        if (row.unitPrice !== undefined && row.unitPrice !== null && !isNaN(row.unitPrice) && isFinite(row.unitPrice)) {
+          row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
+        } else {
+          row.totalPrice = '0.000000';
+        }
       }
     }
   });

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue

@@ -775,6 +775,19 @@ function deletePrescription(prescription) {
 
   const index = tcmPrescriptionList.value.findIndex((p) => p.id === prescription.id);
   if (index !== -1) {
+    const prescriptionData = tcmPrescriptionList.value[index];
+
+    if (prescriptionData.prescriptionList && prescriptionData.prescriptionList.length > 0) {
+      proxy.$modal.msgWarning('该处方单还有药品，请先删除所有药品后再删除处方单');
+      return;
+    }
+
+    const hasChargedItems = prescriptionData.prescriptionList && prescriptionData.prescriptionList.some(item => item.statusEnum === 2);
+    if (hasChargedItems) {
+      proxy.$modal.msgWarning('该处方单已收费，不能删除');
+      return;
+    }
+
     tcmPrescriptionList.value.splice(index, 1);
   }
 }

openhis-ui-vue3/src/views/doctorstation/index.vue

@@ -321,7 +321,10 @@ getPatientList();
 function getPatientList() {
   queryParams.value.statusEnum = 2;
   getList(queryParams.value).then((res) => {
+    // console.log('API返回的完整数据:', res);  // 添加这行来查看完整返回
+    // console.log('API返回的数据记录:', res.data.records); // 查看具体数据记录
     patientList.value = res.data.records.map((item) => {
+      // console.log('处理的单个患者数据:', item);  // 查看处理的单个患者数据
       return {
         ...item,
         active: currentEncounterId.value ? item.encounterId == currentEncounterId.value : false,
@@ -431,7 +434,7 @@ function handleClick(tab) {
 // 查看本次就诊处方单（从医嘱Tab页获取已开立的处方单信息）
 function getEnPrescription(encounterId) {
   getEnPrescriptionInfo({ encounterId: encounterId }).then((res) => {
-    console.log('处方单 res', res);
+    // console.log('处方单 res', res);
     let dataArr = res.data.records || [];
     if (dataArr.length <= 0) {
       ElMessage({
@@ -461,6 +464,7 @@ function handleCardClick(item, index) {
     patient.active = patient.encounterId === item.encounterId;
   });
   patientInfo.value = item;
+  // console.log('patientInfo.value.cardNo:', patientInfo.value.cardNo)
   // 将患者信息保存到store中，供hospitalizationEmr组件使用
   updatePatientInfo(item);
   activeTab.value = 'hospitalizationEmr';

openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json

@@ -15,7 +15,7 @@
             "top": 16.5,
             "height": 22.5,
             "width": 120,
-            "title": "长春市朝阳区中医院医院",
+            "title": "{{HOSPITAL_NAME}}医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontFamily": "Microsoft YaHei",

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationDetails.vue

@@ -291,10 +291,13 @@ import {advicePrint, getAdjustPriceSwitchState, lotNumberMatch} from '@/api/publ
 import {debounce} from 'lodash-es';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 import {hiprint} from 'vue-plugin-hiprint';
-// import templateJson from './components/templateJson.json';
-// import disposalTemplate from './components/disposalTemplate.json';
+import templateJson from './templateJson.json';
+import disposalTemplate from './disposalTemplate.json';
 import {formatInventory} from '@/utils/his.js';
 
+import useUserStore from '@/store/modules/user';
+
+const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const showSearch = ref(true);
 const total = ref(0);
@@ -444,7 +447,9 @@ async function printPrescription() {
   }).then((res) => {
     if (projectTypeCode.value == '3') {
       const result = res.data;
-      const printElements = disposalTemplate;
+      const printElements = JSON.parse(
+        JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
       var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
       hiprintTemplate.print2(result, {
         height: 210,
@@ -474,7 +479,9 @@ async function printPrescription() {
           prescriptionList: item,
         });
       });
-      const printElements = templateJson;
+      const printElements = JSON.parse(
+        JSON.stringify(templateJson).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
       var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
       hiprintTemplate.print2(result, {
         height: 210,

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/disposalTemplate.json

@@ -0,0 +1,337 @@
+{
+  "panels": [
+    {
+      "index": 0,
+      "name": 1,
+      "paperType": "A5",
+      "height": 210,
+      "width": 148,
+      "paperHeader": 0,
+      "paperFooter": 592.4409448818898,
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "expandCss": "",
+      "overPrintOptions": {
+        "content": "",
+        "opacity": 0.7,
+        "type": 1
+      },
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(184, 184, 184, 0.3)",
+        "fontSize": "14px",
+        "rotate": 25,
+        "width": 200,
+        "height": 200,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      },
+      "panelLayoutOptions": {},
+      "printElements": [
+        {
+          "options": {
+            "left": 0,
+            "top": 22.5,
+            "height": 12,
+            "width": 420,
+            "title": "{{HOSPITAL_NAME}}",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 13.5,
+            "qrCodeLevel": 0,
+            "textAlign": "center"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 0,
+            "top": 45,
+            "height": 9.75,
+            "width": 420,
+            "title": "处置单",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 11.25,
+            "qrCodeLevel": 0,
+            "textAlign": "center"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "姓名",
+            "field": "patientName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 157.5,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "年龄",
+            "field": "age",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "性别",
+            "field": "genderEnum_enumText",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 96,
+            "title": "科室",
+            "field": "departmentName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 156,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 118.5,
+            "title": "费用性质",
+            "field": "contractName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "日期",
+            "field": "reqTime",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 121.5,
+            "height": 9.75,
+            "width": 123,
+            "title": "门诊号",
+            "field": "encounterNo",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 156,
+            "top": 121.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "开单医生",
+            "field": "doctorName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 18,
+            "top": 141,
+            "height": 9,
+            "width": 393,
+            "borderWidth": "1.5",
+            "title": "undefined+beforeDragIn",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 156,
+            "height": 9.75,
+            "width": 24,
+            "title": "Rp",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 177,
+            "height": 36,
+            "width": 387,
+            "title": "undefined+beforeDragIn",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "field": "adviceItemList",
+            "columns": [
+              [
+                {
+                  "title": "项目名",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 180.11284430829235,
+                  "field": "itemName",
+                  "checked": true,
+                  "columnId": "itemName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "单价",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value +  ' 元'; }",
+                  "width": 65.15543233883191,
+                  "field": "unitPrice",
+                  "checked": true,
+                  "columnId": "unitPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "数量",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value +  ' ' + row.unitCode_dictText; }",
+                  "width": 61.720533008519084,
+                  "field": "quantity",
+                  "checked": true,
+                  "columnId": "quantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "执行次数",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 80.01119034435662,
+                  "field": "quantity",
+                  "checked": true,
+                  "columnId": "quantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                }
+              ]
+            ]
+          },
+          "printElementType": {
+            "title": "表格",
+            "type": "table",
+            "editable": true,
+            "columnDisplayEditable": true,
+            "columnDisplayIndexEditable": true,
+            "columnTitleEditable": true,
+            "columnResizable": true,
+            "columnAlignEditable": true,
+            "isEnableEditField": true,
+            "isEnableContextMenu": true,
+            "isEnableInsertRow": true,
+            "isEnableDeleteRow": true,
+            "isEnableInsertColumn": true,
+            "isEnableDeleteColumn": true,
+            "isEnableMergeCell": true
+          }
+        }
+      ]
+    }
+  ]
+}

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/templateJson.json

@@ -0,0 +1,339 @@
+{
+  "panels": [
+    {
+      "index": 0,
+      "name": 1,
+      "paperType": "自定义",
+      "height": 130,
+      "width": 210,
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "overPrintOptions": {
+        "content": "",
+        "opacity": 0.7,
+        "type": 1
+      },
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(184, 184, 184, 0.3)",
+        "fontSize": "14px",
+        "rotate": 25,
+        "width": 200,
+        "height": 200,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      },
+      "panelLayoutOptions": {},
+      "paperHeader": 0,
+      "paperFooter": 841.8897637795277,
+      "printElements": [
+        {
+          "options": {
+            "left": 252,
+            "top": 13.5,
+            "height": 12,
+            "width": 75,
+            "title": "{{HOSPITAL_NAME}}医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "日期",
+            "field": "occurrenceTime",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 222,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "单据号",
+            "field": "busNo",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 465,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "机构：{{HOSPITAL_NAME}}医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 57,
+            "height": 9.75,
+            "width": 322.5,
+            "title": "供应商",
+            "field": "supplierName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 84,
+            "height": 36,
+            "width": 570,
+            "title": "undefined+beforeDragIn",
+            "field": "purchaseinventoryList",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "columns": [
+              [
+                {
+                  "title": "项目名",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 53.52877835374887,
+                  "field": "name",
+                  "checked": true,
+                  "columnId": "name",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "规格",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 50.3056193642802,
+                  "field": "volume",
+                  "checked": true,
+                  "columnId": "volume",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "厂家/产地",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 84.09807741407441,
+                  "field": "manufacturerText",
+                  "checked": true,
+                  "columnId": "manufacturerText",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "数量",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' ' + row.unitCode_dictText; }",
+                  "width": 37.02194283284556,
+                  "field": "itemQuantity",
+                  "checked": true,
+                  "columnId": "itemQuantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "采购单价",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }",
+                  "width": 45.05495152300426,
+                  "field": "price",
+                  "checked": true,
+                  "columnId": "price",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "金额",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }",
+                  "width": 39.04544357631049,
+                  "field": "totalPrice",
+                  "checked": true,
+                  "columnId": "totalPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "仓库",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 40.041954542099724,
+                  "field": "purposeLocationName",
+                  "checked": true,
+                  "columnId": "purposeLocationName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "产品批号",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 47.05067091842349,
+                  "field": "lotNumber",
+                  "checked": true,
+                  "columnId": "lotNumber",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "生产日期",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 63.089377997062755,
+                  "field": "startTime",
+                  "checked": true,
+                  "columnId": "startTime",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "有效期至",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 59.05673483929025,
+                  "field": "endTime",
+                  "checked": true,
+                  "columnId": "endTime",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "发票号",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 51.706448638859854,
+                  "field": "invoiceNo",
+                  "checked": true,
+                  "columnId": "invoiceNo",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                }
+              ]
+            ]
+          },
+          "printElementType": {
+            "title": "表格",
+            "type": "table",
+            "editable": true,
+            "columnDisplayEditable": true,
+            "columnDisplayIndexEditable": true,
+            "columnTitleEditable": true,
+            "columnResizable": true,
+            "columnAlignEditable": true,
+            "isEnableEditField": true,
+            "isEnableContextMenu": true,
+            "isEnableInsertRow": true,
+            "isEnableDeleteRow": true,
+            "isEnableInsertColumn": true,
+            "isEnableDeleteColumn": true,
+            "isEnableMergeCell": true
+          }
+        },
+        {
+          "options": {
+            "left": 480,
+            "top": 130.5,
+            "height": 12,
+            "width": 109.5,
+            "title": "合计",
+            "field": "totalAmount",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        }
+      ]
+    }
+  ]
+}

openhis-ui-vue3/src/views/hospitalRecord/components/admissionRecord.vue

@@ -2,7 +2,7 @@
   <div style="padding: 20px; max-width: 1200px; margin: 0 auto" ref="bodyRef">
     <!-- 标题区域 - 居中加粗，增加层次感 -->
     <div style="text-align: center; margin-bottom: 30px">
-      <div style="font-size: 22px; color: #333; letter-spacing: 1px">长春市朝阳区中医院</div>
+      <div style="font-size: 22px; color: #333; letter-spacing: 1px">{{ userStore.hospitalName }}</div>
       <div
         style="
           font-size: 32px;
@@ -614,7 +614,7 @@
         border-top: 1px solid #eee;
       "
     >
-      本记录由长春市朝阳区中医院医师根据患者病情如实记录，仅供临床诊疗参考 |
+      本记录由{{ userStore.hospitalName }}医师根据患者病情如实记录，仅供临床诊疗参考 |
       地址：长春市朝阳区XX街XX号 | 联系电话：0431-XXXXXXX
     </div>
 
@@ -629,7 +629,9 @@
 
 <script setup>
 import {reactive, ref} from 'vue';
+import useUserStore from '@/store/modules/user';
 
+const userStore = useUserStore();
 const bodyRef = ref();
 
 // 响应式表单数据