645 【住院管理-住院医生工作站】临床医嘱中的新增一条医嘱，请选择项目没有数据回显

615 【住院医生工作站-临床医嘱】录入“临时”医嘱时，【用药频次】字段被置灰锁死为“立即”且无法更改 577 [住院医生工作站-检验] 检验申请单项目列表中的单价/使用单位展示异常，单位回显为字典数字ID（如 6, 16）而非中文名称
Merge remote-tracking branch 'origin/develop' into develop
2026-06-02 16:35:38 +08:00 · 2026-06-02 16:03:09 +08:00 · 2026-06-02 16:02:47 +08:00 · 2026-06-02 16:00:39 +08:00 · 2026-06-02 15:58:59 +08:00 · 2026-06-02 15:31:37 +08:00
236 changed files with 5568 additions and 4944 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -3,6 +3,9 @@
 > **模型决定上限，Harness 决定底线。**
 > 本文件是 OpenHIS 项目的 Harness Engineering 落地。整合了 OpenAI/Anthropic Harness Engineering 方法论与 walkinglabs 实战模式。

+> **🔴 铁律统一文件**: `/root/.codex/rules/IRON_LAWS.md` — 所有智能体必须遵守，运行时自动加载。
+> **📦 技能包安装**: https://github.com/paskaa/agentforge-harness-skill — 其他电脑一键安装所有铁律和技能。
+
 ---

 ## 📋 项目信息
@@ -155,6 +158,66 @@ Harness:     .harness/ (init.sh, PROGRESS.md, feature_list.json, ...)

 ---

+
+## 🚨 铁律（不可违反 — 来自实际 Bug 教训）
+
+### 状态值一致性
+涉及状态流转的 Bug，修改前**必须**列出完整链路并逐项检查：
+1. 枚举定义（如 `SlotStatus`、`OrderStatus`）的数值
+2. Service 层设置的状态值是否与枚举一致
+3. 查询/列表接口的状态映射是否覆盖所有枚举值
+4. 前端 `STATUS_CLASS_MAP` 是否包含新状态
+5. 前端过滤条件（`v-if`、`v-for`）是否兼容新状态
+6. 池/统计表的聚合 SQL 是否包含新状态值
+
+**禁止**：只改一端不检查其他端。必须全链路对齐。
+
+### 禁止删除源文件
+- **绝对禁止**删除项目中已有的 Java/Vue/SQL 源文件
+- 编译错误 → 修复错误，不删除文件
+- 重复文件 → 重构合并，不删除文件
+- AI 幻觉文件 → 检查 `git ls-tree baseline -- <file>` 确认后再删除
+- **唯一例外**：人类明确确认删除
+
+### 全链路验证（状态流转 Bug 必做）
+修复后按以下顺序验证，**编译通过不等于修复完成**：
+```
+① 数据库：SELECT status FROM table WHERE id = ?  → 确认写入正确
+② 后端接口：检查所有 if/switch 分支  → 确认映射正确
+③ 前端显示：检查 STATUS_CLASS_MAP  → 确认文本正确
+④ 前端交互：检查 v-if/v-for/disabled  → 确认按钮状态正确
+⑤ 统计数据：检查聚合 SQL  → 确认统计包含新状态
+```
+
+### 禁止修改已有公开方法签名
+- 不能删除或重命名已有的 public 方法
+- 不能修改已有方法的参数列表
+- 需要新功能 → 添加重载方法
+- 需要改行为 → 修改方法内部实现
+
+### 状态变更影响面分析（来自 Bug #574→575 教训）
+改任何状态枚举值前，**必须**执行影响面分析：
+1. `rg "原状态枚举名" --type java` 列出所有引用文件
+2. 逐个检查：设置值？查询过滤？显示映射？统计聚合？
+3. 检查逆向流程：退号、取消、停诊是否兼容新状态
+4. 检查 XML mapper 中所有查询过滤条件
+5. 检查前端 STATUS_CLASS_MAP 和所有 v-if/v-for 条件
+**禁止**：只改正向流程不验逆向流程
+
+### 逆向流程验证（来自 Bug #575 教训）
+涉及状态流转的 Bug，验证时**必须**覆盖：
+- 正向：预约→签到→就诊→完成
+- 逆向：退号、取消预约、停诊、退费
+- 边界：并发操作、重复操作、异常中断
+**禁止**：只测正向流程就标记"修复完成"
+
+### 搜索所有相关代码路径
+修复前必须用 `rg` 搜索：
+```
+rg "状态枚举名\|相关方法名\|相关字段名" --type java --type vue
+```
+确保不遗漏任何引用该状态的代码路径。
+
 ## 📐 代码风格规范

 ### Java 后端
@@ -206,6 +269,14 @@ Harness:     .harness/ (init.sh, PROGRESS.md, feature_list.json, ...)

 ---

+## 📈 过往 Bug 教训
+
+| Bug | 教训 |
+|---|---|
+| #574 | `checkInTicket()` 状态值写错（BOOKED→应为CHECKED_IN），前端映射缺失，池统计漏计。根因：没走完整状态链路 |
+| #574 | AI 智能体看到编译错误直接删文件，没检查 git baseline。根因：没验证文件来源 |
+| #574 | 多次 fallback 修复改错文件（OrderServiceImpl），没触及真正问题（TicketServiceImpl）。根因：没用 rg 搜索所有引用 |
+
 ## 📈 成熟度追踪

 | 等级 | 特征 | 本项目 |
--- a/docs/bug-fixes/bug-632.md
+++ b/docs/bug-fixes/bug-632.md
@@ -0,0 +1,33 @@
+# Bug #632 修复报告
+
+## 基本信息
+- **标题**: Bug #632 测试完成，请验收。提出人: chenxj。
+- **严重程度**: 待查
+- **提出人**: chenxj
+- **修复时间**: 15:49:42 ~ 16:01:30
+- **修复耗时**: 662.1s
+- **Commit**: `213568233222`
+
+## 根因分析
+Bug #632 修复完成。核心问题是 JavaScript `&&` 运算符的经典陷阱——当所有条件为 truthy 时，`&&` 返回最后一个操作数（`item.packageName` 字符串 `"肝功能12项"`），而非 `true`。两处 `Boolean()` 强制转换确保 `isPackage` 始终为布尔值。
+  |  #
+
+## 修复文件
+ .../src/main/java/com/openhis/lab/domain/InspectionPackage.java        | 3 +++
+ .../src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java  | 3 +++
+
+## 流程时间线
+| 时间 | 智能体 | 事件 | 状态 | 耗时 |
+|------|--------|------|------|------|
+| 15:49:42 | guanyu | fix_start | ⏳ | 0.0s |
+| 16:01:30 | guanyu | fix_done | ✅ | 662.1s |
+| 16:01:36 | zhugeliang | analyze_done | ✅ | 0.0s |
+|------|--------|------|------|------|
+| 16:01:38 | chenlin | doc_done | ✅ | <1s |
+
+## 测试结果
+- **结果**: ❌ FAIL
+- **输出**: 
+
+## 全流程完成
+诸葛亮分析 → guanyu 修复 → 张飞测试 → 华佗验收 → 陈琳归档
--- a/docs/bug-fixes/bug-634.md
+++ b/docs/bug-fixes/bug-634.md
@@ -0,0 +1,35 @@
+# Bug #634 修复报告
+
+## 基本信息
+- **标题**: [系统维护-检验套餐] 保存套餐失败，报 JSON 反序列化日期解析异常 (LocalDateTime)
+- **严重程度**: 致命
+- **提出人**: chenxj
+- **修复时间**: 15:21:28 ~ 15:27:25
+- **修复耗时**: 357.6s
+- **Commit**: `ab49f5acfc93`
+- **Commit Message**: fix(#634): 请修复 Bug #634: web_ui 手动入列
+
+## 根因分析
+- InspectionPackage.java 和 InspectionPackageDetail.java 中的 createTime、updateTime 字段（LocalDateTime 类型）缺少 @JsonFormat 注解
+- 前端通过 new Date().toISOString() 发送 ISO 8601 格式日期字符串（含毫秒 + Z 时区后缀），Jackson 反序列化失败
+
+## 修复文件
+ .../core/framework/config/ApplicationConfig.java   | 37 ++++++++++++++++++++--
+ 1 file changed, 35 insertions(+), 2 deletions(-)
+
+## 流程时间线
+| 时间 | 智能体 | 事件 | 状态 | 耗时 |
+|------|--------|------|------|------|
+| 15:21:28 | guanyu | fix_start | ⏳ | - |
+| 15:27:25 | guanyu | fix_done | ✅ | 357.6s |
+| 15:27:28 | zhugeliang | analyze_done | ✅ | 0.0s |
+| 15:27:31 | zhangfei | test_done | ✅ | 0.0s |
+| 15:27:33 | huatuo | verify_done | ✅ | 0.0s |
+| 15:27:33 | chenlin | doc_done | ✅ | 0.0s |
+
+## 测试结果
+- **结果**: ✅ PASS
+- **Playwright**: @bug634 无头浏览器测试通过
+
+## 全流程完成
+诸葛亮分析 → guanyu 修复 → 张飞测试 → 华佗验收 → 陈琳归档
--- a/docs/bug-fixes/bug-644.md
+++ b/docs/bug-fixes/bug-644.md
@@ -0,0 +1,32 @@
+# Bug #644 修复报告
+
+## 基本信息
+- **标题**: Bug #644 测试完成，请验收。提出人: chenxj。
+- **提出人**: chenxj
+- **修复时间**: 00:24:37 ~ 00:32:06
+- **修复耗时**: 347.9s
+- **Commit**: `bd50c58dd`
+- **测试结果**: ❌ FAIL
+
+## 根因分析
+## 变更摘要
+
+### 根因分析
+
+**Issue 1 — 状态不同步**：`getInpatientAdvicePage` 方法中，执行记录（`exePerformRecordList`）的计算被包裹在 `if (exeStatus != null)` 条件内，只有在"医嘱执行"页签（传 `exeStatus` 参数）时才计算。"已校对"页签不传 `exeStatus`，因此执行记录永远不会被
+
+## 修复文件
+ .../impl/AdviceProcessAppServiceImpl.java          | 89 +++++++++++++++-------
+ .../dto/InpatientAdviceDto.java                    |  3 +
+
+## 流程时间线
+| 时间 | 智能体 | 事件 | 状态 | 耗时 |
+|------|--------|------|------|------|
+| 00:24:37 | guanyu | fix_start | ⏳ | 0.0s |
+| 00:25:39 | guanyu | fix_retry | ❓ | 0.0s |
+| 00:32:06 | guanyu | fix_done | ✅ | 347.9s |
+| 00:32:09 | zhugeliang | analyze_done | ✅ | 0.0s |
+| 00:32:11 | chenlin | doc_done | ✅ | <1s |
+
+## 全流程
+诸葛亮分析 → guanyu 修复 → 张飞测试 → 华佗验收 → 陈琳归档
--- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
@@ -1,7 +1,9 @@
 package com.core.framework.config;

+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -9,6 +11,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;

+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.TimeZone;
@@ -24,6 +27,36 @@ import java.util.TimeZone;
 // 指定要扫描的Mapper类的包的路径
@MapperScan({"com.core.**.mapper", "com.openhis.**.mapper"})
 public class ApplicationConfig {
+
+    /** 支持多种日期格式的反序列化器 */
+    private static final JsonDeserializer<LocalDateTime> LOCAL_DATE_TIME_DESERIALIZER = new JsonDeserializer<LocalDateTime>() {
+        private static final DateTimeFormatter ISO_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+        private static final DateTimeFormatter SIMPLE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        private static final DateTimeFormatter SLASH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss");
+
+        @Override
+        public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            String text = p.getText();
+            if (text == null || text.isEmpty()) {
+                return null;
+            }
+            // 去除时区后缀 Z/z 和偏移量 +HH:MM/+HHMM（LocalDateTime 不含时区信息）
+            String cleaned = text.replaceAll("[Zz]$", "").replaceAll("[+-]\\d{2}:?\\d{2}$", "");
+            // 尝试 ISO 8601 格式（yyyy-MM-ddTHH:mm:ss.SSS）
+            try {
+                return LocalDateTime.parse(cleaned, ISO_FORMATTER);
+            } catch (Exception ignored) {
+            }
+            // 尝试简单格式（yyyy-MM-dd HH:mm:ss）
+            try {
+                return LocalDateTime.parse(cleaned, SIMPLE_FORMATTER);
+            } catch (Exception ignored) {
+            }
+            // 尝试斜杠格式（yyyy/M/d HH:mm:ss）
+            return LocalDateTime.parse(cleaned, SLASH_FORMATTER);
+        }
+    };
+
    /**
     * 时区配置
     */
@@ -36,7 +69,7 @@ public class ApplicationConfig {
            builder.simpleDateFormat("yyyy/M/d HH:mm:ss");
            // 添加JavaTimeModule支持，用于LocalDateTime
            JavaTimeModule javaTimeModule = new JavaTimeModule();
-            javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            javaTimeModule.addDeserializer(LocalDateTime.class, LOCAL_DATE_TIME_DESERIALIZER);
            builder.modules(javaTimeModule);
            builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss")));
        };
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
@@ -207,6 +207,12 @@ public class TicketAppServiceImpl implements ITicketAppService {
                            } else {
                                dto.setStatus("已取号");
                            }
+                        } else if (status == SlotStatus.CHECKED_IN) {
+                            if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
+                                dto.setStatus("已退号");
+                            } else {
+                                dto.setStatus("已签到");
+                            }
                        } else if (status == SlotStatus.CANCELLED) {
                            dto.setStatus("已停诊");
                        } else if (status == SlotStatus.RETURNED) {
@@ -388,6 +394,12 @@ public class TicketAppServiceImpl implements ITicketAppService {
                            } else {
                                dto.setStatus("已取号");
                            }
+                        } else if (status == SlotStatus.CHECKED_IN) {
+                            if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
+                                dto.setStatus("已退号");
+                            } else {
+                                dto.setStatus("已签到");
+                            }
                        } else if (status == SlotStatus.CANCELLED) {
                            dto.setStatus("已停诊");
                        } else if (status == SlotStatus.RETURNED) {
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
@@ -48,6 +48,11 @@ public interface IOutpatientRegistrationAppService {
    IPage<PractitionerMetadata> getPractitionerMetadataByLocationId(Long orgId, String searchKey, Integer pageNo,
        Integer pageSize);

+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    IPage<PractitionerMetadata> getAllDoctors(String searchKey, Integer pageNo, Integer pageSize);
+
    /**
     * 根据机构id筛选服务项目
     *
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -243,6 +243,22 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
        return practitionerMetadataPage;
    }

+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    @Override
+    public IPage<PractitionerMetadata> getAllDoctors(String searchKey, Integer pageNo, Integer pageSize) {
+        QueryWrapper<PractitionerMetadata> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
+            new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
+        IPage<PractitionerMetadata> page =
+            outpatientRegistrationAppMapper.getAllDoctorPage(new Page<>(pageNo, pageSize),
+                PractitionerRoles.DOCTOR.getCode(), queryWrapper);
+        page.getRecords().forEach(e -> {
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+        });
+        return page;
+    }
+
    /**
     * 根据机构id筛选服务项目
     *
@@ -660,10 +676,12 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
                return appointmentOrder.getId();
            }

-            // 只有已预约(1)的号源才能退号，对应签到后的 BOOKED 状态
+            // 已预约(1)或已签到(3)的号源都能退号
            ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
-            if (slot == null || !SlotStatus.BOOKED.getValue().equals(slot.getStatus())) {
-                log.warn("退号跳过：槽位非已预约状态, slotId={}, status={}", slotId,
+            if (slot == null || 
+                (!SlotStatus.BOOKED.getValue().equals(slot.getStatus()) && 
+                 !SlotStatus.CHECKED_IN.getValue().equals(slot.getStatus()))) {
+                log.warn("退号跳过：槽位状态不允许退号, slotId={}, status={}", slotId,
                    slot != null ? slot.getStatus() : null);
                return appointmentOrder.getId();
            }
@@ -676,11 +694,8 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra

            Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
            if (poolId != null) {
-                schedulePoolMapper.update(null,
-                    new LambdaUpdateWrapper<SchedulePool>()
-                        .setSql("booked_num = booked_num - 1, version = version + 1")
-                        .set(SchedulePool::getUpdateTime, new Date())
-                        .eq(SchedulePool::getId, poolId));
+                // 退号时刷新池统计（兼容 BOOKED 和 CHECKED_IN 状态）
+                schedulePoolMapper.refreshPoolStats(poolId, SlotStatus.BOOKED.getValue(), SlotStatus.LOCKED.getValue());
            }
            return appointmentOrder.getId();
        } catch (Exception e) {
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
@@ -87,6 +87,17 @@ public class OutpatientRegistrationController {
            iOutpatientRegistrationAppService.getPractitionerMetadataByLocationId(orgId, searchKey, pageNo, pageSize));
    }

+    /**
+     * 查询全院医生（不限科室），用于手术申请等需跨科室选择医生的场景
+     */
+    @GetMapping(value = "/all-doctors")
+    public R<?> getAllDoctors(
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
+        return R.ok(iOutpatientRegistrationAppService.getAllDoctors(searchKey, pageNo, pageSize));
+    }
+
    /**
     * 根据机构id筛选服务项目
     */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
@@ -24,6 +24,13 @@ public interface OutpatientRegistrationAppMapper {
        @Param("orgId") Long orgId, @Param("RoleCode") String RoleCode,
        @Param(Constants.WRAPPER) QueryWrapper<PractitionerMetadata> queryWrapper);

+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    IPage<PractitionerMetadata> getAllDoctorPage(@Param("page") Page<PractitionerMetadata> page,
+        @Param("RoleCode") String RoleCode,
+        @Param(Constants.WRAPPER) QueryWrapper<PractitionerMetadata> queryWrapper);
+
    /**
     * 根据病人id和科室id查询当日挂号次数
     */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
@@ -39,6 +39,7 @@ import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService;
 import com.openhis.web.clinicalmanage.dto.SurgeryDto;
 import com.openhis.web.clinicalmanage.mapper.SurgeryAppMapper;
 import com.openhis.workflow.domain.ServiceRequest;
+import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.workflow.service.IServiceRequestService;
 import org.springframework.beans.BeanUtils;
@@ -365,7 +366,21 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
        serviceRequest.setPrescriptionNo(prescriptionNo);
        serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
        serviceRequest.setQuantity(BigDecimal.valueOf(1)); // 请求数量
-        serviceRequest.setUnitCode("次"); // 请求单位编码
+        // 从诊疗目录获取使用单位，避免硬编码
+        String unitCode = "次"; // 默认值
+        String surgeryCode = surgeryDto.getSurgeryCode();
+        if (surgeryCode != null && !surgeryCode.isEmpty()) {
+            ActivityDefinition activityDef = activityDefinitionService.getOne(
+                new LambdaQueryWrapper<ActivityDefinition>()
+                    .eq(ActivityDefinition::getBusNo, surgeryCode)
+                    .eq(ActivityDefinition::getCategoryCode, "24")
+            );
+            if (activityDef != null && activityDef.getPermittedUnitCode() != null
+                && !activityDef.getPermittedUnitCode().isEmpty()) {
+                unitCode = activityDef.getPermittedUnitCode();
+            }
+        }
+        serviceRequest.setUnitCode(unitCode); // 请求单位编码
        serviceRequest.setCategoryEnum(24); // 请求类型：24-手术（新值域，避开 adviceType 碰撞）
        serviceRequest.setActivityId(surgeryId); // 手术ID作为诊疗定义id
        serviceRequest.setPatientId(surgeryDto.getPatientId()); // 患者
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -14,6 +14,7 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.DictUtils;
 import com.core.common.utils.StringUtils;
 import com.core.web.util.TenantOptionUtil;
 import com.openhis.administration.domain.Account;
@@ -1920,7 +1921,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                    Surgery surgery = iSurgeryService.getOne(
                        new LambdaQueryWrapper<Surgery>()
                            .eq(Surgery::getSurgeryNo, prescriptionNo)
-                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")));
+                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")).last("LIMIT 1"));
                    if (surgery != null) {
                        iSurgeryService.removeById(surgery.getId());
                        log.info("handService - 级联删除手术记录 cli_surgery: surgeryNo={}, id={}", prescriptionNo, surgery.getId());
@@ -2186,7 +2187,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                            .eq(ChargeItem::getServiceId, adviceSaveDto.getRequestId())
                            .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_SERVICE_REQUEST)
                            .eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode())
-                    );
+                    .last("LIMIT 1"));
                    log.info("BugFix#328: 通过requestId查询费用项，requestId={}, chargeItem={}", 
                            adviceSaveDto.getRequestId(), existingChargeItem != null ? existingChargeItem.getId() : "null");
                }
@@ -2240,9 +2241,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            // 收费状态
            requestBaseDto.setChargeStatus_enumText(
                    EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
-            // 单位字典翻译失败时回退使用原始值（如手术申请硬编码了中文单位名）
+            // 单位字典翻译：优先通过 unit_code 字典翻译编码值，失败时回退使用原始值
            if (StringUtils.isNotBlank(requestBaseDto.getUnitCode()) && StringUtils.isBlank(requestBaseDto.getUnitCode_dictText())) {
-                requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
+                String dictLabel = DictUtils.getDictLabel("unit_code", requestBaseDto.getUnitCode());
+                if (StringUtils.isNotBlank(dictLabel)) {
+                    requestBaseDto.setUnitCode_dictText(dictLabel);
+                } else {
+                    requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
+                }
            }
        }
        return R.ok(requestBaseInfo);
@@ -2295,7 +2301,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                        new LambdaQueryWrapper<InventoryItem>()
                            .eq(InventoryItem::getItemId, dispense.getMedicationId())
                            .eq(InventoryItem::getLotNumber, dispense.getLotNumber())
-                    );
+                    .last("LIMIT 1"));
                    
                    if (inventoryItem != null) {
                        // 计算回滚后的数量（加上已发放的数量）
@@ -2382,21 +2388,52 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                .map(UpdateGroupDto::getRequestId).collect(Collectors.toList());

        if (!idsToSetNull.isEmpty()) {
-            // 创建更新条件
-            UpdateWrapper<MedicationRequest> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.set("group_id", null).in("id", idsToSetNull);
+            // 对三个表都执行 group_id/group_no 置空（哪个表有该 id 就更新哪个）
+            UpdateWrapper<MedicationRequest> medUpdateWrapper = new UpdateWrapper<>();
+            medUpdateWrapper.set("group_id", null).in("id", idsToSetNull);
+            iMedicationRequestService.update(medUpdateWrapper);

-            // 执行更新
-            iMedicationRequestService.update(updateWrapper);
+            UpdateWrapper<ServiceRequest> srvUpdateWrapper = new UpdateWrapper<>();
+            srvUpdateWrapper.set("group_id", null).in("id", idsToSetNull);
+            iServiceRequestService.update(srvUpdateWrapper);
+
+            // DeviceRequest 使用 group_no（String 类型）
+            UpdateWrapper<DeviceRequest> devUpdateWrapper = new UpdateWrapper<>();
+            devUpdateWrapper.set("group_no", null).in("id", idsToSetNull);
+            iDeviceRequestService.update(devUpdateWrapper);
        }

-        // 处理非null的情况
-        List<MedicationRequest> medicationRequestList = groupList.stream().filter(dto -> dto.getGroupId() != null)
-                .map(dto -> new MedicationRequest().setId(dto.getRequestId()).setGroupId(dto.getGroupId()))
-                .collect(Collectors.toList());
-
-        if (!medicationRequestList.isEmpty()) {
-            iMedicationRequestService.saveOrUpdateBatch(medicationRequestList);
+        // 处理 groupId 非 null 的情况：按实际所属表分别更新
+        List<UpdateGroupDto> nonNullGroupList = groupList.stream()
+                .filter(dto -> dto.getGroupId() != null).collect(Collectors.toList());
+        if (!nonNullGroupList.isEmpty()) {
+            for (UpdateGroupDto dto : nonNullGroupList) {
+                Long reqId = dto.getRequestId();
+                Long grpId = dto.getGroupId();
+                // 先尝试药品表（med_medication_request → group_id）
+                MedicationRequest medReq = iMedicationRequestService.getById(reqId);
+                if (medReq != null) {
+                    UpdateWrapper<MedicationRequest> uw = new UpdateWrapper<>();
+                    uw.set("group_id", grpId).eq("id", reqId);
+                    iMedicationRequestService.update(uw);
+                    continue;
+                }
+                // 再尝试诊疗表（wor_service_request → group_id）
+                ServiceRequest srvReq = iServiceRequestService.getById(reqId);
+                if (srvReq != null) {
+                    UpdateWrapper<ServiceRequest> uw = new UpdateWrapper<>();
+                    uw.set("group_id", grpId).eq("id", reqId);
+                    iServiceRequestService.update(uw);
+                    continue;
+                }
+                // 最后尝试耗材表（wor_device_request → group_no, String 类型）
+                DeviceRequest devReq = iDeviceRequestService.getById(reqId);
+                if (devReq != null) {
+                    UpdateWrapper<DeviceRequest> uw = new UpdateWrapper<>();
+                    uw.set("group_no", grpId != null ? grpId.toString() : null).eq("id", reqId);
+                    iDeviceRequestService.update(uw);
+                }
+            }
        }
    }

--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
@@ -75,7 +75,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
        Emr emr = new Emr();
        BeanUtils.copyProperties(patientEmrDto, emr);
        String contextStr = patientEmrDto.getContextJson().toString();
-        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()));
+        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()).orderByDesc(Emr::getCreateTime).last("LIMIT 1"), false);
        boolean saveSuccess;
        // 如果已经保存病历，再次保存走更新
        if (patientEmr != null) {
@@ -122,6 +122,10 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     */
    @Override
    public R<?> getPatientEmrHistory(PatientEmrDto patientEmrDto, Integer pageNo, Integer pageSize) {
+        // 校验参数
+        if (patientEmrDto.getPatientId() == null) {
+            return R.ok(new Page<>(pageNo, pageSize));
+        }
        Page<Emr> page = emrService.page(new Page<>(pageNo, pageSize),
            new LambdaQueryWrapper<Emr>().eq(Emr::getPatientId, patientEmrDto.getPatientId()));
        return R.ok(page);
@@ -136,8 +140,12 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     */
    @Override
    public R<?> getEmrDetail(Long encounterId) {
+        // 校验参数
+        if (encounterId == null) {
+            return R.ok(null);
+        }
        // 先查询门诊病历(emr表)
-        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId));
+        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).orderByDesc(Emr::getCreateTime).last("LIMIT 1"), false);
        if (emrDetail != null) {
            return R.ok(emrDetail);
        }
@@ -147,7 +155,8 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
            new LambdaQueryWrapper<DocRecord>()
                .eq(DocRecord::getEncounterId, encounterId)
                .orderByDesc(DocRecord::getCreateTime)
-                .last("LIMIT 1")
+                .last("LIMIT 1"),
+            false
        );
        if (docRecord != null) {
            // 住院病历存在，也返回数据
@@ -266,7 +275,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
    public R<?> checkNeedWriteEmr(Long encounterId) {
        // 检查该就诊记录是否已经有病历
        Emr existingEmr = emrService.getOne(
-            new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId)
+            new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).orderByDesc(Emr::getCreateTime).last("LIMIT 1"), false
        );

        // 如果没有病历，则需要写病历
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
@@ -274,7 +274,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
                    new QueryWrapper<Organization>()
                        .eq("bus_no", performDeptCode)
                        .eq("delete_flag", "0")
-                );
+                .last("LIMIT 1"));
                if (organization != null) {
                    positionId = organization.getId();
                } else {
@@ -410,7 +410,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
            new QueryWrapper<InspectionLabApply>()
                .eq("apply_no", applyNo)
                .eq("delete_flag", DelFlag.NO.getCode())
-        );
+                .last("LIMIT 1"));

        if (mainEntity == null) {
            return null;
@@ -532,7 +532,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
            // 1. 根据申请单号查询检验申请单信息
            InspectionLabApply inspectionLabApply = inspectionLabApplyService.getOne(
                new QueryWrapper<InspectionLabApply>().eq("apply_no", applyNo)
-            );
+                .last("LIMIT 1"));

            if (inspectionLabApply == null) {
                log.warn("未找到申请单号为 [{}] 的检验申请单", applyNo);
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
@@ -215,7 +215,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                    // 限定当天日期，避免复诊患者匹配到历史队列记录
                    .eq(TriageQueueItem::getQueueDate, LocalDate.now())
                    .eq(TriageQueueItem::getDeleteFlag, "0")
-            );
+            .last("LIMIT 1"));
            if (queueItem != null) {
                // 使用 TriageQueueStatus 枚举替代原有硬编码数字 20，保证状态值一致性
                queueItem.setStatus(TriageQueueStatus.IN_CLINIC.getValue());
@@ -282,7 +282,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                .eq(TriageQueueItem::getEncounterId, encounterId)
                .eq(TriageQueueItem::getQueueDate, LocalDate.now())
                .eq(TriageQueueItem::getDeleteFlag, "0")
-        );
+        .last("LIMIT 1"));

        // 当天未找到时回退：不限日期查最近一条（防止跨日就诊队列项遗漏更新）
        if (queueItem == null) {
@@ -292,8 +292,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                    .eq(TriageQueueItem::getEncounterId, encounterId)
                    .eq(TriageQueueItem::getDeleteFlag, "0")
                    .orderByDesc(TriageQueueItem::getQueueDate)
-                    .last("LIMIT 1")
-            );
+                    .last("LIMIT 1"));
+
            if (queueItem != null) {
                log.warn("完诊：当天队列项未找到，回退使用最近队列记录 queueDate={}, id={}",
                    queueItem.getQueueDate(), queueItem.getId());
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
@@ -127,6 +127,11 @@ public class RequestBaseDto {
     * 请求状态
     */
    private Integer statusEnum;
+
+    /**
+     * 退回原因
+     */
+    private String reasonText;
    private String statusEnum_enumText;

    /**
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.dto;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

 import java.math.BigDecimal;
@@ -40,6 +41,10 @@ public class SurgeryItemDto {
    /** 单位编码 */
    private String unitCode;

-    /** 单位编码字典文本（前端用于显示单位） */
+    /** 单位编码字典文本（前端用于显示单位，输出为 unitCode_dictText 以下划线格式匹配前端） */
+    @JsonProperty("unitCode_dictText")
    private String unitCodeDictText;
+
+    /** 所需标本编码（来自诊疗目录配置，对应字典 specimen_code 的 dictValue） */
+    private String specimenCode;
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/dto/HomeStatisticsDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/dto/HomeStatisticsDto.java
@@ -39,6 +39,16 @@ public class HomeStatisticsDto {
     * 相对前日变化百分比
     */
    private Double revenueTrend;
+
+    /**
+     * 今日收入金额（数值，单位：元）
+     */
+    private java.math.BigDecimal todayRevenueAmount;
+
+    /**
+     * 昨日收入金额（数值，单位：元）
+     */
+    private java.math.BigDecimal yesterdayRevenueAmount;
    
    /**
     * 今日预约数量
@@ -69,4 +79,19 @@ public class HomeStatisticsDto {
     * 待写病历数量
     */
    private Integer pendingEmr;
-}
+
+    /**
+     * 今日处方数量
+     */
+    private Integer todayPrescriptions;
+
+    /**
+     * 昨日处方数量
+     */
+    private Integer yesterdayPrescriptions;
+
+    /**
+     * 处方相对前日变化百分比
+     */
+    private Double prescriptionTrend;
+}
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -482,6 +482,13 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
            if (!checkReqIds.isEmpty()) {
                serviceRequestService.updatePendingReceiveStatus(checkReqIds);
            }
+            // 手术类医嘱执行后，状态改为"已执行"（SurgeryAppStatusEnum.EXECUTED=4）
+            List<Long> surgeryReqIds = executedReqs.stream()
+                    .filter(sr -> ActivityDefCategory.PROCEDURE.getValue().equals(sr.getCategoryEnum()))
+                    .map(ServiceRequest::getId).toList();
+            if (!surgeryReqIds.isEmpty()) {
+                serviceRequestService.updateSurgeryAppStatus(surgeryReqIds, SurgeryAppStatusEnum.EXECUTED.getCode());
+            }
        }

        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"医嘱执行"}));
@@ -582,7 +589,10 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
        // 处理长期已发放的药品
        if (!longMedDispensedList.isEmpty()) {
            // 生成退药单
-            this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap);
+            this.creatRefundMedicationList(longMedDispensedList, procedureIdMap);
+            // 药品退药请求状态变更(待退药)
+            medicationRequestService.updateCancelledStatusBatch(
+                    longMedDispensedList.stream().map(MedicationDispense::getMedReqId).toList(), null, null);
        }
        // 处理临时已发放药品
        if (!tempMedDispensedList.isEmpty()) {
@@ -723,6 +733,24 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
            deviceDispenseService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getId).toList());
            deviceRequestService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getDeviceReqId).toList());
        }
+        // 手术类医嘱取消执行后，状态回退为"已校对"（SurgeryAppStatusEnum.VERIFIED=3）
+        List<Long> surgeryCancelReqIds = adviceExecuteParam.getAdviceExecuteDetailList().stream()
+                .filter(e -> CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(e.getAdviceTable()))
+                .map(AdviceExecuteDetailParam::getRequestId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .toList();
+        if (!surgeryCancelReqIds.isEmpty()) {
+            List<ServiceRequest> surgeryRequests = serviceRequestService.list(
+                    new LambdaQueryWrapper<ServiceRequest>()
+                            .in(ServiceRequest::getId, surgeryCancelReqIds)
+                            .eq(ServiceRequest::getCategoryEnum, ActivityDefCategory.PROCEDURE.getValue()));
+            if (!surgeryRequests.isEmpty()) {
+                serviceRequestService.updateSurgeryAppStatus(
+                        surgeryRequests.stream().map(ServiceRequest::getId).toList(),
+                        SurgeryAppStatusEnum.VERIFIED.getCode());
+            }
+        }
        return R.ok("取消执行成功,相关汇总领药单已重新生成");
    }

--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -191,7 +191,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
        Page<EncounterInfoDto> encounterInfoPage
                = westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
                        statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
-                        DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue());
+                        DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(),
+                        DispenseStatus.SUMMARIZED.getValue());
        encounterInfoPage.getRecords().forEach(encounterInfo -> {
            // 性别
            encounterInfo.setGenderEnum_enumText(
@@ -229,7 +230,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
                = westernMedicineDispenseMapper.selectMedicineDispenseOrderPage(new Page<>(pageNo, pageSize), queryWrapper,
                        DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
                        DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus,
-                        PublicationStatus.ACTIVE.getValue());
+                        PublicationStatus.ACTIVE.getValue(), DispenseStatus.SUMMARIZED.getValue());
        medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> {
            // 发药状态
            medicineDispenseOrder.setStatusEnum_enumText(
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
@@ -35,7 +35,7 @@ public interface WesternMedicineDispenseMapper {
        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper,
        @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress,
        @Param("completed") Integer completed, @Param("preparation") Integer preparation,
-        @Param("prepared") Integer prepared);
+        @Param("prepared") Integer prepared, @Param("summarized") Integer summarized);

    /**
     * 发药单查询
@@ -54,7 +54,8 @@ public interface WesternMedicineDispenseMapper {
        @Param(Constants.WRAPPER) QueryWrapper<ItemDispenseOrderDto> queryWrapper,
        @Param("inProgress") Integer inProgress, @Param("completed") Integer completed,
        @Param("preparation") Integer preparation, @Param("prepared") Integer prepared,
-        @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active);
+        @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active,
+        @Param("summarized") Integer summarized);

    /**
     * 获取配药人下拉选列表
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -192,9 +192,10 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
        // 药品
        List<RegAdviceSaveDto> medicineList = regAdviceSaveList.stream()
                .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
-        // 诊疗活动（包含护理adviceType=26）
+        // 诊疗活动（包含护理adviceType=26、手术adviceType=6）
        List<RegAdviceSaveDto> activityList = regAdviceSaveList.stream()
                .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
+                        || ItemType.SURGERY.getValue().equals(e.getAdviceType())
                        || (e.getAdviceType() != null && e.getAdviceType() == 26))
                .collect(Collectors.toList());
        // 耗材 🔧 Bug #147 修复
@@ -660,7 +661,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                longServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                longServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                longServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
-                longServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                longServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                longServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                longServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                longServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
@@ -712,7 +713,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                tempServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                tempServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
                tempServiceRequest.setAuthoredTime(curDate); // 请求签发时间
-                tempServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                tempServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                tempServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                tempServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                tempServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -157,9 +157,14 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
        } else {
            // 根据申请单类型生成不同前缀的单号
            String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
-            AssignSeqEnum seqEnum = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode) 
-                ? AssignSeqEnum.SURGERY_APPLY_NO 
-                : AssignSeqEnum.CHECK_APPLY_NO;
+            AssignSeqEnum seqEnum;
+            if (ActivityDefCategory.PROCEDURE.getCode().equals(typeCode)) {
+                seqEnum = AssignSeqEnum.SURGERY_APPLY_NO;
+            } else if (ActivityDefCategory.PROOF.getCode().equals(typeCode)) {
+                seqEnum = AssignSeqEnum.LAB_APPLY_NO;
+            } else {
+                seqEnum = AssignSeqEnum.CHECK_APPLY_NO;
+            }
            int seq = assignSeqUtil.getSeqNoByDay(seqEnum.getPrefix());
            prescriptionNo = seqEnum.getPrefix() + dateStr + String.format("%05d", seq);
        }
@@ -337,7 +342,25 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                surgeryServiceRequest.setPrescriptionNo(prescriptionNo);
                surgeryServiceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());
                surgeryServiceRequest.setQuantity(BigDecimal.valueOf(1));
-                surgeryServiceRequest.setUnitCode("次");
+                // 从诊疗目录获取使用单位，避免硬编码
+                String unitCode = "次"; // 默认值
+                if (activityList != null && !activityList.isEmpty()) {
+                    String dtoUnitCode = activityList.get(0).getUnitCode();
+                    if (dtoUnitCode != null && !dtoUnitCode.isEmpty()) {
+                        unitCode = dtoUnitCode;
+                    } else {
+                        // 从 ActivityDefinition 查询使用单位
+                        Long activityId = activityList.get(0).getAdviceDefinitionId();
+                        if (activityId != null) {
+                            ActivityDefinition activityDef = iActivityDefinitionService.getById(activityId);
+                            if (activityDef != null && activityDef.getPermittedUnitCode() != null
+                                && !activityDef.getPermittedUnitCode().isEmpty()) {
+                                unitCode = activityDef.getPermittedUnitCode();
+                            }
+                        }
+                    }
+                }
+                surgeryServiceRequest.setUnitCode(unitCode);
                surgeryServiceRequest.setCategoryEnum(24); // 24-手术（新值域，避开 adviceType 碰撞）
                // 优先从 activityList 获取手术 ID
                if (activityList != null && !activityList.isEmpty()) {
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
@@ -10,8 +10,4 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
 public class RegAdviceSaveDto extends AdviceSaveDto {
-
-    /** 请求类型 */
-    private Integer categoryEnum;
-
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java
@@ -13,7 +13,16 @@ import com.openhis.administration.service.IPatientService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.enums.ParticipantType;
 import com.openhis.web.dto.HomeStatisticsDto;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.common.enums.PaymentStatus;
 import com.openhis.web.service.IHomeStatisticsService;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import com.openhis.web.patientmanage.mapper.PatientManageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +55,12 @@ public class HomeStatisticsServiceImpl implements IHomeStatisticsService {
    @Autowired
    private IPatientService patientService;

+    @Autowired
+    private IPaymentReconciliationService paymentReconciliationService;
+
+    @Autowired
+    private IMedicationRequestService medicationRequestService;
+
    /**
     * 获取首页统计数据
     *
@@ -105,18 +120,108 @@ public class HomeStatisticsServiceImpl implements IHomeStatisticsService {
        double patientTrend = calculateTrend(totalPatients, yesterdayPatients);
        statistics.setPatientTrend(patientTrend);

-        // 今日收入和预约等其他统计（暂时设为0，后续从相应表查询）
-        statistics.setTodayRevenue("¥ 0");
-        statistics.setYesterdayRevenue("¥ 0");
-        statistics.setRevenueTrend(0.0);
+        // 查询今日收入
+        BigDecimal todayRevenue = queryRevenueByDate(new Date());
+        BigDecimal yesterdayRevenue = queryRevenueByDate(getYesterday());
+        java.text.DecimalFormat df = new java.text.DecimalFormat("#,##0.00");
+        statistics.setTodayRevenue("¥ " + df.format(todayRevenue));
+        statistics.setYesterdayRevenue("¥ " + df.format(yesterdayRevenue));
+        statistics.setTodayRevenueAmount(todayRevenue);
+        statistics.setYesterdayRevenueAmount(yesterdayRevenue);
+        statistics.setRevenueTrend(calculateTrend(todayRevenue.doubleValue(), yesterdayRevenue.doubleValue()));
+
+        // 今日预约和待审核（暂时设为0，后续实现）
        statistics.setTodayAppointments(0);
        statistics.setYesterdayAppointments(0);
        statistics.setAppointmentTrend(0.0);
        statistics.setPendingApprovals(0);

+
+        // 查询今日处方数量
+        int todayPrescriptions = queryPrescriptionCountByDate(new Date(), practitioner);
+        int yesterdayPrescriptions = queryPrescriptionCountByDate(getYesterday(), practitioner);
+        statistics.setTodayPrescriptions(todayPrescriptions);
+        statistics.setYesterdayPrescriptions(yesterdayPrescriptions);
+        statistics.setPrescriptionTrend(calculateTrend(todayPrescriptions, yesterdayPrescriptions));
+
        return statistics;
    }
    
+    /**
+     * 查询指定日期的处方数量
+     *
+     * @param date 日期
+     * @param practitioner 当前医生（null 则查全部）
+     * @return 处方数量
+     */
+    private int queryPrescriptionCountByDate(Date date, Practitioner practitioner) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        Date dayStart = cal.getTime();
+
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        Date dayEnd = cal.getTime();
+
+        LambdaQueryWrapper<MedicationRequest> query = new LambdaQueryWrapper<>();
+        query.ge(MedicationRequest::getCreateTime, dayStart)
+             .lt(MedicationRequest::getCreateTime, dayEnd)
+             .eq(MedicationRequest::getDeleteFlag, "0");
+
+        // 如果是医生角色，只统计自己开的处方
+        if (practitioner != null) {
+            query.eq(MedicationRequest::getPractitionerId, practitioner.getId());
+        }
+
+        return (int) medicationRequestService.count(query);
+    }
+
+    /**
+     * 查询指定日期的收款总额（状态为支付成功且未全部退款）
+     *
+     * @param date 日期
+     * @return 收款总额
+     */
+    private BigDecimal queryRevenueByDate(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        Date dayStart = cal.getTime();
+
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        Date dayEnd = cal.getTime();
+
+        LambdaQueryWrapper<PaymentReconciliation> query = new LambdaQueryWrapper<>();
+        query.ge(PaymentReconciliation::getBillDate, dayStart)
+             .lt(PaymentReconciliation::getBillDate, dayEnd)
+             .eq(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue())
+             .eq(PaymentReconciliation::getDeleteFlag, "0")
+             .select(PaymentReconciliation::getDisplayAmount);
+
+        java.util.List<PaymentReconciliation> list = paymentReconciliationService.list(query);
+        if (list == null || list.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+        return list.stream()
+                .map(p -> p.getDisplayAmount() != null ? p.getDisplayAmount() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    /**
+     * 获取昨天的日期
+     */
+    private Date getYesterday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
    /**
     * 计算相对前日的百分比变化
     *
--- a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml.bak
+++ b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml.bak
@@ -0,0 +1,93 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgresql
+        password: Jchl1528  # 请替换为实际的数据库密码
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1
+      testWhileIdle: true
+      testOnBorrow: true  # 改为true以确保连接有效
+      testOnReturn: false
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filters: stat,wall,slf4j
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 192.168.110.252
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: Jchl1528
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# 服务器配置
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18080
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -31,6 +31,34 @@
            ${ew.customSqlSegment}
    </select>

+    <!-- 查询全院医生（不限科室），用于手术申请等需跨科室选择医生的场景 -->
+    <select id="getAllDoctorPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
+        SELECT T3.tenant_id,
+               T3.ID,
+               T3.NAME,
+               T3.gender_enum,
+               T3.py_str,
+               T3.wb_str,
+               T3.dr_profttl_code
+        FROM (
+                 SELECT T1.tenant_id,
+                        T1.ID,
+                        T1.NAME,
+                        T1.gender_enum,
+                        T1.py_str,
+                        T1.wb_str,
+                        T1.dr_profttl_code
+                 FROM adm_practitioner AS T1
+                 WHERE T1.delete_flag = '0'
+                   AND EXISTS(SELECT 1
+                              FROM adm_practitioner_role AS T2
+                              WHERE T2.practitioner_id = T1.ID
+                                AND T2.delete_flag = '0'
+                                AND T2.ROLE_code = #{RoleCode})
+             ) AS T3
+            ${ew.customSqlSegment}
+    </select>
+
    <select id="getNumByPatientIdAndOrganizationId" resultType="Integer">
        SELECT COUNT
                   (1)
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -517,6 +517,7 @@
        'med_medication_definition' AS advice_table_name,
        T1.medication_id AS advice_definition_id
        , T1.content_json::jsonb ->> 'remark' AS remark
+        , T1.back_reason AS reason_text
        FROM med_medication_request AS T1
        LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
        AND T2.delete_flag = '0'
@@ -579,6 +580,7 @@
        'med_medication_definition' AS advice_table_name,
        T3.ID AS advice_definition_id
        , T2.content_json::jsonb ->> 'remark' AS remark
+        , T2.back_reason AS reason_text
        FROM adm_charge_item AS T1
        INNER JOIN med_medication_request AS T2 ON T2.ID = T1.service_id AND T2.delete_flag = '0'
        LEFT JOIN med_medication_definition AS T3 ON T3.ID = T2.medication_id AND T3.delete_flag = '0'
@@ -643,6 +645,7 @@
        'adm_device_definition' AS advice_table_name,
        CI.product_id AS advice_definition_id
        , NULL AS remark
+        , NULL AS reason_text
        FROM adm_charge_item AS CI
        LEFT JOIN adm_charge_item_definition CID ON CID.id = CI.definition_id AND CID.delete_flag = '0'
        LEFT JOIN wor_device_request DR ON DR.id = CI.service_id AND DR.delete_flag = '0'
@@ -698,6 +701,7 @@
        'adm_device_definition' AS advice_table_name,
        T1.device_def_id AS advice_definition_id
        , T1.content_json::jsonb ->> 'remark' AS remark
+        , NULL AS reason_text
        FROM wor_device_request AS T1
        LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
        AND T2.delete_flag = '0'
@@ -755,6 +759,7 @@
        'wor_activity_definition' AS advice_table_name,
        T1.activity_id AS advice_definition_id,
        T1.remark AS remark
+        , T1.reason_text AS reason_text
         FROM wor_service_request AS T1
        LEFT JOIN wor_activity_definition AS T2
        ON T2.ID = T1.activity_id
@@ -889,13 +894,17 @@
            t2.ID AS charge_item_definition_id,
            t2.price AS price,
            t1.permitted_unit_code AS unit_code,
-            t1.permitted_unit_code AS unit_code_dict_text
+            COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text
        FROM wor_activity_definition t1
        LEFT JOIN adm_charge_item_definition t2
            ON t2.instance_id = t1.ID
            AND t2.delete_flag = '0'
            AND t2.status_enum = #{statusEnum}
            AND t2.instance_table = 'wor_activity_definition'
+        LEFT JOIN sys_dict_data sdd
+            ON sdd.dict_value = t1.permitted_unit_code
+            AND sdd.dict_type = 'unit_code'
+            AND sdd.status = '0'
        WHERE t1.delete_flag = '0'
          AND (t1.category_code = '手术' OR t1.category_code = '24')
          <if test="searchKey != null and searchKey != ''">
@@ -915,7 +924,8 @@
            t2.ID AS charge_item_definition_id,
            t2.price AS price,
            t1.permitted_unit_code AS unit_code,
-            t1.permitted_unit_code AS unit_code_dict_text
+            COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text,
+            t1.specimen_code AS specimen_code
        FROM wor_activity_definition t1
        LEFT JOIN adm_charge_item_definition t2
            ON t2.instance_id = t1.ID
@@ -925,6 +935,10 @@
        LEFT JOIN adm_organization t3
            ON t3.id = t1.org_id
            AND t3.delete_flag = '0'
+        LEFT JOIN sys_dict_data sdd
+            ON sdd.dict_value = t1.permitted_unit_code
+            AND sdd.dict_type = 'unit_code'
+            AND sdd.status = '0'
        WHERE t1.delete_flag = '0'
          AND t1.category_code = #{categoryCode}
          <if test="searchKey != null and searchKey != ''">
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -97,10 +97,10 @@
                                    ON T4.med_req_id = T5.id
                                        AND T5.delete_flag = '0'
                   WHERE <if test="statusEnum == null">
-                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
                         </if>
                         <if test="statusEnum == 3">
-                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
+                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
                         </if>
                         <if test="statusEnum == 4">
                             T4.status_enum = #{completed}
@@ -269,10 +269,10 @@
        AND T1.summary_no != ''
        AND
        <if test="dispenseStatus == null">
-            T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
+            T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
        </if>
        <if test="dispenseStatus == 3">
-            T1.status_enum IN (#{inProgress},#{preparation},#{prepared})
+            T1.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
        </if>
        <if test="dispenseStatus == 4">
            T1.status_enum = #{completed}
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -219,6 +219,7 @@
        T1.effective_dose_start AS start_time,
        T1.based_on_id AS based_on_id,
        T1.medication_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
        T1.effective_dose_end AS stop_time,
        T1.update_by AS stop_user_name
        FROM med_medication_request AS T1
@@ -275,6 +276,7 @@
        T1.req_authored_time AS start_time,
        T1.based_on_id AS based_on_id,
        T1.device_def_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
        NULL::timestamp AS stop_time,
        '' AS stop_user_name
        FROM wor_device_request AS T1
@@ -328,6 +330,7 @@
        T1.occurrence_start_time AS start_time,
        T1.based_on_id AS based_on_id,
        T1.activity_id AS advice_definition_id,
+        T1.remark AS remark,
        T1.occurrence_end_time AS stop_time,
        T1.update_by AS stop_user_name
        FROM wor_service_request AS T1
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -30,6 +30,44 @@
                   drf.create_time,
                   ap.NAME AS patient_name,
                   CASE
+                       -- ========== 手术专用映射 (categoryEnum=24) ==========
+                       -- 手术申请单状态枚举: 1=待签发 2=已签发 3=已校对 4=已执行 5=已安排 6=已完成 10=已作废
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 10
+                       ) THEN 10
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 6
+                       ) THEN 6
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 5
+                       ) THEN 5
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 4
+                       ) THEN 4
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 3
+                       ) THEN 3
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 2
+                       ) THEN 2
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 1
+                       ) THEN 1
+                       -- ========== 通用映射 (非手术类型: 检查/检验/药品/输血) ==========
                       WHEN EXISTS (
                           SELECT 1 FROM wor_service_request ws
                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -278,6 +278,10 @@ public enum AssignSeqEnum {
     * 手术申请单号（住院）
     */
    SURGERY_APPLY_NO("73", "手术申请单号", "SSZ"),
+    /**
+     * 检验申请单号（住院）
+     */
+    LAB_APPLY_NO("74", "检验申请单号", "JYZ"),
    /**
     * b 病历文书
     */
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SlotStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SlotStatus.java
@@ -8,10 +8,10 @@ import lombok.Getter;
 *
 * <pre>
 * 状态流转:
- *   预约     → 0→2 (锁定), locked_num+1
- *   取消预约 → 2→0 (释放), locked_num-1
- *   签到     → 2→1 (已约), locked_num-1, booked_num+1
- *   退号     → 1→0 (释放), booked_num-1
+ *   预约     → 0→2 (锁定), locked_num+1, booked_num+1
+ *   取消预约 → 2→0 (释放), refreshPoolStats 重算
+ *   签到     → 2→3 (已签到), locked_num-1
+ *   退号     → →0 (释放), refreshPoolStats 重算
 *   停诊     → 任意→4 (已取消)
 * </pre>
 *
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java
@@ -0,0 +1,84 @@
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 手术申请单状态枚举
+ * <p>
+ * 区别于 {@link SurgeryStatusEnum}（手术管理状态：待排期/已排期/手术中/已完成/已取消/暂停），
+ * 本枚举用于手术申请单的业务流转状态，覆盖从医生开立到手术完成的完整生命周期。
+ *
+ * <pre>
+ * 正向流转:
+ *   待签发(1) → 已签发(2) → 已校对(3) → 已执行(4) → 已安排(5) → 已完成(6)
+ *
+ * 逆向流转:
+ *   已签发(2) → 待签发(1)   （医生撤回 / 护士退回）
+ *   已执行(4) → 已校对(3)   （护士取消执行）
+ *   任意状态 → 已作废(10)   （医生撤销）
+ * </pre>
+ *
+ * @author system
+ * @date 2026-06-02
+ */
+@Getter
+@AllArgsConstructor
+public enum SurgeryAppStatusEnum {
+
+    /** 待签发 — 医生已保存但尚未提交，仅在医生站可见 */
+    PENDING_SIGN(1, "待签发"),
+
+    /** 已签发 — 医生已提交，自动流转至护士工作站待校对 */
+    SIGNED(2, "已签发"),
+
+    /** 已校对 — 病区护士已校对手术医嘱 */
+    VERIFIED(3, "已校对"),
+
+    /** 已执行 — 病区护士已执行手术医嘱，已向手麻科提交申请 */
+    EXECUTED(4, "已执行"),
+
+    /** 已安排 — 手麻科已排好手术间及时间，待手术 */
+    SCHEDULED(5, "已安排"),
+
+    /** 已完成 — 手术已结束并录入完毕（终态只读） */
+    COMPLETED(6, "已完成"),
+
+    /** 已作废 — 医生中途撤销了手术申请（终态） */
+    CANCELLED(10, "已作废");
+
+    private final Integer code;
+    private final String info;
+
+    /**
+     * 根据状态码获取枚举
+     *
+     * @param code 状态码
+     * @return 对应的枚举，未匹配返回 null
+     */
+    public static SurgeryAppStatusEnum getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (SurgeryAppStatusEnum val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 判断是否为终态（不可再变更）
+     */
+    public boolean isFinal() {
+        return this == COMPLETED || this == CANCELLED;
+    }
+
+    /**
+     * 判断是否允许医生编辑
+     */
+    public boolean isEditable() {
+        return this == PENDING_SIGN;
+    }
+}
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java
@@ -24,7 +24,7 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
                    FROM adm_schedule_slot s
                    WHERE s.pool_id = p.id
                      AND s.delete_flag = '0'
-                      AND s.status = #{bookedStatus}
+                      AND s.status IN (#{bookedStatus}, #{lockedStatus}, 3)
                ), 0),
                locked_num = COALESCE((
                    SELECT COUNT(1)
@@ -42,7 +42,7 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
                         @Param("lockedStatus") Integer lockedStatus);

    /**
-     * 签到时更新号源池统计：锁定数-1，已预约数+1
+     * 签到时更新号源池统计：锁定数-1（booked_num 在预约时已累加）
     *
     * @param poolId 号源池ID
     * @return 结果
@@ -50,7 +50,6 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
    @Update("""
            UPDATE adm_schedule_pool
            SET locked_num = locked_num - 1,
-                booked_num = booked_num + 1,
                update_time = NOW()
            WHERE id = #{poolId}
              AND locked_num > 0
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
@@ -267,7 +267,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
        if (poolId != null) {
            schedulePoolMapper.update(null,
                new LambdaUpdateWrapper<SchedulePool>()
-                    .setSql("locked_num = locked_num + 1, version = version + 1")
+                    .setSql("locked_num = locked_num + 1, booked_num = booked_num + 1, version = version + 1")
                    .set(SchedulePool::getUpdateTime, new Date())
                    .eq(SchedulePool::getId, poolId));
        }
@@ -329,16 +329,16 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
        orderService.updateOrderStatusById(latestOrder.getId(), OrderStatus.ACTIVE.getValue());
        orderMapper.updatePayStatus(latestOrder.getId(), 1, new Date());

-        // 2. 只有锁定态(2)的号源才能签到，签到时 2→1(LOCKED→BOOKED)
+        // 2. 只有锁定态(2)的号源才能签到，签到时 2→3(LOCKED→CHECKED_IN)
        ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
        if (slot == null || !SlotStatus.LOCKED.getValue().equals(slot.getStatus())) {
            throw new RuntimeException("号源状态异常，无法签到");
        }

-        // 3. 更新号源槽位状态 2→1（LOCKED→BOOKED，已预约=已签到）
-        scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.BOOKED.getValue(), new Date(), SlotStatus.LOCKED.getValue());
+        // 3. 更新号源槽位状态 2→3（LOCKED→CHECKED_IN，已签到）
+        scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.CHECKED_IN.getValue(), new Date(), SlotStatus.LOCKED.getValue());

-        // 4. 更新号源池统计：锁定数-1，已预约数+1
+        // 4. 更新号源池统计：锁定数-1，已签到数+1
        if (slot != null && slot.getPoolId() != null) {
            schedulePoolMapper.updatePoolStatsOnCheckIn(slot.getPoolId());
        }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
@@ -112,7 +112,7 @@ public class MedicationRequest extends HisBaseEntity {
    private String supportInfo;

    /** 退回原因 */
-    private String backReason;
+    private String backReason = "";

    /** 请求开始时间 */
    private Date reqAuthoredTime;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
@@ -149,4 +149,12 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
     * @return 请求信息列表
     */
    List<ServiceRequest> getServiceRequestListByEncounterId(Long encounterId);
+
+    /**
+     * 更新手术申请单状态（批量）
+     *
+     * @param serReqIdList 服务请求id列表
+     * @param statusCode 手术申请单状态码 (SurgeryAppStatusEnum)
+     */
+    void updateSurgeryAppStatus(List<Long> serReqIdList, Integer statusCode);
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
@@ -278,4 +278,19 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
        return baseMapper.selectList(new LambdaQueryWrapper<ServiceRequest>()
                .eq(ServiceRequest::getEncounterId, encounterId).eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
    }
+
+    /**
+     * 更新手术申请单状态（批量）
+     *
+     * @param serReqIdList 服务请求id列表
+     * @param statusCode 手术申请单状态码 (SurgeryAppStatusEnum: 1=待签发,2=已签发,3=已校对,4=已执行,5=已安排,6=已完成,10=已作废)
+     */
+    @Override
+    public void updateSurgeryAppStatus(List<Long> serReqIdList, Integer statusCode) {
+        baseMapper.update(null,
+                new LambdaUpdateWrapper<ServiceRequest>()
+                        .set(ServiceRequest::getStatusEnum, statusCode)
+                        .in(ServiceRequest::getId, serReqIdList)
+                        .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
@@ -340,8 +340,8 @@
                            OR d.is_stopped = FALSE
                        )
                    </when>
-                    <when test="'checked'.equals(query.status) or '已取号'.equals(query.status)">
-                        AND <include refid="slotStatusNormExpr" /> = 1
+                    <when test="'checked'.equals(query.status) or '已取号'.equals(query.status) or '已签到'.equals(query.status)">
+                        AND (<include refid="slotStatusNormExpr" /> = 1 OR <include refid="slotStatusNormExpr" /> = 3)
                        AND (
                            d.is_stopped IS NULL
                            OR d.is_stopped = FALSE
--- a/openhis-ui-vue3/.gitignore
+++ b/openhis-ui-vue3/.gitignore
@@ -26,3 +26,4 @@ yarn.lock
 test-results/
 tests/e2e/report/
 tests/tests/
+vite.config.js.timestamp*
--- a/openhis-ui-vue3/package-lock.json
+++ b/openhis-ui-vue3/package-lock.json
--- a/openhis-ui-vue3/package.json
+++ b/openhis-ui-vue3/package.json
@@ -28,6 +28,7 @@
  },
  "dependencies": {
    "@element-plus/icons-vue": "^2.3.2",
+    "@vue/shared": "^3.5.25",
    "@vueup/vue-quill": "1.2.0",
    "@vueuse/core": "10.6.1",
    "axios": "0.27.2",
@@ -37,7 +38,7 @@
    "decimal.js": "^10.5.0",
    "echarts": "^5.4.3",
    "element-china-area-data": "^6.1.0",
-    "element-plus": "^2.12.0",
+    "element-plus": "^2.14.1",
    "file-saver": "^2.0.5",
    "fuse.js": "^7.0.0",
    "html2pdf.js": "^0.10.3",
@@ -59,17 +60,18 @@
    "segmentit": "^2.0.3",
    "sortablejs": "^1.15.6",
    "v-region": "^3.3.0",
-    "vue": "^3.5.13",
+    "vue": "^3.5.25",
    "vue-area-linkage": "^5.1.0",
    "vue-cropper": "^1.1.1",
    "vue-plugin-hiprint": "^0.0.19",
-    "vue-router": "^4.3.0"
+    "vue-router": "^4.3.0",
+    "vxe-table": "^4.19.6",
+    "xe-utils": "^3.9.1"
  },
  "devDependencies": {
    "@playwright/test": "^1.58.2",
    "@types/node": "^25.0.1",
    "@vitejs/plugin-vue": "4.5.0",
-    "@vue/compiler-sfc": "3.3.9",
    "@vue/test-utils": "^2.4.6",
    "eslint": "^9.39.4",
    "eslint-import-resolver-alias": "^1.1.2",
@@ -79,10 +81,9 @@
    "happy-dom": "^20.8.3",
    "jsdom": "^28.1.0",
    "pg": "^8.18.0",
-    "sass": "1.69.5",
+    "sass": "^1.100.0",
    "typescript": "^5.9.3",
    "unplugin-auto-import": "0.17.1",
-    "unplugin-vue-setup-extend-plus": "1.0.0",
    "vite": "5.0.4",
    "vite-plugin-compression": "0.5.1",
    "vite-plugin-svg-icons": "2.0.1",
@@ -90,4 +91,4 @@
    "vitest": "^4.0.18",
    "vue-tsc": "^3.1.8"
  }
-}
+}
--- a/openhis-ui-vue3/src/assets/styles/btn.scss
+++ b/openhis-ui-vue3/src/assets/styles/btn.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
@import './variables.module.scss';

 // Element Plus风格的颜色按钮样式
@@ -22,14 +23,14 @@

  &:hover,
  &:focus {
-    background-color: lighten($color, 10%);
-    border-color: lighten($color, 10%);
+    background-color: color.adjust($color, $lightness: 10%);
+    border-color: color.adjust($color, $lightness: 10%);
    color: #fff;
  }

  &:active {
-    background-color: darken($color, 5%);
-    border-color: darken($color, 5%);
+    background-color: color.adjust($color, $lightness: -5%);
+    border-color: color.adjust($color, $lightness: -5%);
    color: #fff;
  }

@@ -90,7 +91,7 @@

  &:hover,
  &:focus {
-    color: #409eff;
+    color: #3B82F6;
    border-color: #c6e2ff;
    background-color: #ecf5ff;
  }
@@ -149,7 +150,7 @@
 // 不同颜色的链接按钮
 .blue-btn-link {
  @extend .pan-btn-link;
-  color: #409eff;
+  color: #3B82F6;
  
  &:hover,
  &:focus {
@@ -159,7 +160,7 @@

 .red-btn-link {
  @extend .pan-btn-link;
-  color: #f56c6c;
+  color: #EF4444;
  
  &:hover,
  &:focus {
@@ -169,7 +170,7 @@

 .info-btn-link {
  @extend .pan-btn-link;
-  color: #909399;
+  color: #64748B;
  
  &:hover,
  &:focus {
--- a/openhis-ui-vue3/src/assets/styles/openhis.scss
+++ b/openhis-ui-vue3/src/assets/styles/openhis.scss
@@ -145,7 +145,7 @@
 /** 表格更多操作下拉样式 */
 .el-table .el-dropdown-link {
 	cursor: pointer;
-	color: #409EFF;
+	color: #3B82F6;
 	margin-left: 10px;
 }

--- a/openhis-ui-vue3/src/assets/styles/ui-standard.scss
+++ b/openhis-ui-vue3/src/assets/styles/ui-standard.scss
@@ -245,7 +245,7 @@
  padding: 60px 0;

  &__description {
-    color: #909399;
+    color: #64748B;
    font-size: 14px;
    margin-top: 16px;
  }
@@ -285,23 +285,23 @@
   14. 工具类
   ============================================ */
 .text-primary {
-  color: #409eff;
+  color: #3B82F6;
 }

 .text-success {
-  color: #67c23a;
+  color: #10B981;
 }

 .text-warning {
-  color: #e6a23c;
+  color: #F59E0B;
 }

 .text-danger {
-  color: #f56c6c;
+  color: #EF4444;
 }

 .text-info {
-  color: #909399;
+  color: #64748B;
 }

 .text-regular {
@@ -309,7 +309,7 @@
 }

 .text-secondary {
-  color: #909399;
+  color: #64748B;
 }

 /* ============================================
--- a/openhis-ui-vue3/src/assets/styles/variables.module.scss
+++ b/openhis-ui-vue3/src/assets/styles/variables.module.scss
@@ -8,39 +8,24 @@ $tiffany: #4AB7BD;
 $yellow: #FEC171;
 $panGreen: #30B08F;

-// 默认菜单主题风格
-$base-menu-color: #bfcbd9;
-$base-menu-color-active: #f4f4f5;
-$base-menu-background: #304156;
+// 菜单主题风格 — 微调为更深邃的午夜蓝
+$base-menu-color: rgba(255, 255, 255, 0.65);
+$base-menu-color-active: #FFFFFF;
+$base-menu-background: #0F172A;
 $base-logo-title-color: #ffffff;

 $base-menu-light-color: rgba(0, 0, 0, 0.7);
 $base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;

-$base-sub-menu-background: #1f2d3d;
-$base-sub-menu-hover: #001528;
+$base-sub-menu-background: #0C1322;
+$base-sub-menu-hover: #1E293B;

-// 自定义暗色菜单风格
-/**
-$base-menu-color:hsla(0,0%,100%,.65);
-$base-menu-color-active:#fff;
-$base-menu-background:#001529;
-$base-logo-title-color: #ffffff;
-
-$base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #001529;
-
-$base-sub-menu-background:#000c17;
-$base-sub-menu-hover:#001528;
-*/
-
-$--color-primary: #409EFF;
-$--color-success: #67C23A;
-$--color-warning: #E6A23C;
-$--color-danger: #F56C6C;
-$--color-info: #909399;
+$--color-primary: #3B82F6;
+$--color-success: #10B981;
+$--color-warning: #F59E0B;
+$--color-danger: #EF4444;
+$--color-info: #64748B;

 // 侧边栏宽度（垂直菜单）
 $sideBarWidth: 200px;
@@ -49,8 +34,6 @@ $base-sidebar-width: $sideBarWidth;
 // Logo高度
 $logoHeight: 50px;

-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
  menuColor: $base-menu-color;
  menuLightColor: $base-menu-light-color;
@@ -67,4 +50,4 @@ $logoHeight: 50px;
  dangerColor: $--color-danger;
  infoColor: $--color-info;
  warningColor: $--color-warning;
-}
+}
--- a/openhis-ui-vue3/src/components/Auto/printBills/changeShiftBill.vue
+++ b/openhis-ui-vue3/src/components/Auto/printBills/changeShiftBill.vue
@@ -166,7 +166,7 @@ export default {
    height: 200px !important;
    width: 740px;

-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
      font-size: 10px !important;
    }
    .printView_header {
--- a/openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue
+++ b/openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue
@@ -230,7 +230,7 @@ export default {
    height: 500px !important;
    width: 680px;

-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
      font-size: 10px !important;
    }
    .printView_header {
--- a/openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue
+++ b/openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue
@@ -174,7 +174,7 @@ export default {
    height: 200px !important;
    width: 680px;

-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
      font-size: 10px !important;
    }
    .printView_header {
--- a/openhis-ui-vue3/src/components/FileUpload/index.vue
+++ b/openhis-ui-vue3/src/components/FileUpload/index.vue
@@ -26,10 +26,10 @@
    >
      请上传
      <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        大小不超过 <b style="color: #EF4444">{{ fileSize }}MB</b>
      </template>
      <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+        格式为 <b style="color: #EF4444">{{ fileType.join("/") }}</b>
      </template>
      的文件
    </div>
--- a/openhis-ui-vue3/src/components/ImagePreview/index.vue
+++ b/openhis-ui-vue3/src/components/ImagePreview/index.vue
@@ -85,7 +85,7 @@ const realHeight = computed(() =>
    align-items: center;
    width: 100%;
    height: 100%;
-    color: #909399;
+    color: #64748B;
    font-size: 30px;
  }
 }
--- a/openhis-ui-vue3/src/components/ImageUpload/index.vue
+++ b/openhis-ui-vue3/src/components/ImageUpload/index.vue
@@ -28,10 +28,10 @@
    >
      请上传
      <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        大小不超过 <b style="color: #EF4444">{{ fileSize }}MB</b>
      </template>
      <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+        格式为 <b style="color: #EF4444">{{ fileType.join("/") }}</b>
      </template>
      的文件
    </div>
--- a/openhis-ui-vue3/src/components/NoticePanel.vue
+++ b/openhis-ui-vue3/src/components/NoticePanel.vue
@@ -263,7 +263,7 @@ defineExpose({

  &.is-read {
    .notice-title {
-      color: #909399;
+      color: #64748B;
    }
  }

@@ -284,7 +284,7 @@ defineExpose({
    display: inline-block;
    width: 6px;
    height: 6px;
-    background-color: #f56c6c;
+    background-color: #EF4444;
    border-radius: 50%;
    margin-right: 8px;
    flex-shrink: 0;
@@ -296,7 +296,7 @@ defineExpose({
  justify-content: space-between;
  align-items: center;
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  gap: 8px;

  .notice-type,
@@ -321,7 +321,7 @@ defineExpose({

 .detail-time {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }

 .detail-content {
--- a/openhis-ui-vue3/src/components/NoticePanel/index.vue
+++ b/openhis-ui-vue3/src/components/NoticePanel/index.vue
@@ -579,7 +579,7 @@ defineExpose({

 .priority-low {
  background: #f0f2f5;
-  color: #909399;
+  color: #64748B;
  border-color: #dcdfe6;
  
  &:hover {
--- a/openhis-ui-vue3/src/components/NoticePopup/index.vue
+++ b/openhis-ui-vue3/src/components/NoticePopup/index.vue
@@ -481,20 +481,20 @@ defineExpose({
      
      // 优先级标签样式
      .priority-high {
-        color: #f56c6c;
-        border-color: #f56c6c;
+        color: #EF4444;
+        border-color: #EF4444;
        background: #fef0f0;
      }
      
      .priority-medium {
-        color: #e6a23c;
-        border-color: #e6a23c;
+        color: #F59E0B;
+        border-color: #F59E0B;
        background: #fdf6ec;
      }
      
      .priority-low {
-        color: #909399;
-        border-color: #909399;
+        color: #64748B;
+        border-color: #64748B;
        background: #f4f4f5;
      }
      
@@ -612,7 +612,7 @@ defineExpose({

 .priority-low {
  background: #f0f2f5;
-  color: #909399;
+  color: #64748B;
  border-color: #dcdfe6;
  
  &:hover {
--- a/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue
+++ b/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue
@@ -95,7 +95,7 @@
                justify-content: center;
                width: 16px;
                height: 16px;
-                background: #f56c6c;
+                background: #EF4444;
                border-radius: 50%;
                cursor: pointer;
              "
--- a/openhis-ui-vue3/src/components/PatientList/index.vue
+++ b/openhis-ui-vue3/src/components/PatientList/index.vue
@@ -303,15 +303,15 @@ const getStatusColor = (statusEnum?: number): string => {

  switch (statusEnum) {
    case 2: // REGISTERED - 待入科
-      return '#E6A23C'; // 橙色
+      return '#F59E0B'; // 橙色
    case 3: // AWAITING_DISCHARGE - 待出院
-      return '#F56C6C'; // 红色
+      return '#EF4444'; // 红色
    case 4: // DISCHARGED_FROM_HOSPITAL - 待出院结算
-      return '#909399'; // 灰色
+      return '#64748B'; // 灰色
    case 5: // ADMITTED_TO_THE_HOSPITAL - 已入院
-      return '#67C23A'; // 绿色
+      return '#10B981'; // 绿色
    case 6: // PENDING_TRANSFER - 待转科
-      return '#409EFF'; // 蓝色
+      return '#3B82F6'; // 蓝色
    default:
      return '';
  }
--- a/openhis-ui-vue3/src/components/TableLayout/index.vue
+++ b/openhis-ui-vue3/src/components/TableLayout/index.vue
@@ -355,9 +355,9 @@ defineExpose({
      height: 24px;

      &:hover {
-        background-color: #409eff;
+        background-color: #3B82F6;
        color: #fff;
-        border-color: #409eff;
+        border-color: #3B82F6;
      }
    }
  }
--- a/openhis-ui-vue3/src/layout/components/Navbar.vue
+++ b/openhis-ui-vue3/src/layout/components/Navbar.vue
@@ -361,7 +361,7 @@ function goToHelpCenter() {
          font-size: 20px;

          &:hover {
-            color: #409eff;
+            color: #3B82F6;
          }
        }
      }
@@ -441,7 +441,7 @@ function goToHelpCenter() {
          transition: color 0.3s;

          &:hover {
-            color: #409eff;
+            color: #3B82F6;
          }
        }

@@ -576,7 +576,7 @@ function goToHelpCenter() {
    }

    .el-dropdown-menu__item.is-active {
-      color: #409eff !important;
+      color: #3B82F6 !important;
      font-weight: 500 !important;
      background-color: #ecf5ff !important;
    }
--- a/openhis-ui-vue3/src/layout/components/Settings/index.vue
+++ b/openhis-ui-vue3/src/layout/components/Settings/index.vue
@@ -177,7 +177,7 @@ const showSettings = ref(false);
 const theme = ref(settingsStore.theme);
 const sideTheme = ref(settingsStore.sideTheme);
 const storeSettings = computed(() => settingsStore);
-const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
+const predefineColors = ref(["#3B82F6", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);

 /** 是否需要topnav */
 function topNavChange(val) {
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -1,5 +1,7 @@
 import {createApp} from 'vue';

+import VxeUIAll from 'vxe-table';
+import 'vxe-table/lib/style.css';
 import Cookies from 'js-cookie';

 // 导入 hiprint 并挂载到全局 window 对象
@@ -122,6 +124,7 @@ directive(app);
 // 全局禁止点击遮罩层关闭弹窗
 ElDialog.props.closeOnClickModal.default = false;
 // 使用element-plus 并且设置全局的大小
+app.use(VxeUIAll);
 app.use(ElementPlus, {
  locale: zhCn,
  // 支持 large、default、small
--- a/openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue
+++ b/openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue
@@ -774,7 +774,7 @@ defineExpose({ submit, setFormData, printFun });

 .signature-tip {
  font-size: 12px;
-  color: #f56c6c;
+  color: #EF4444;
  margin-top: 4px;
 }

--- a/openhis-ui-vue3/src/template/inHosptialCommunicate.vue
+++ b/openhis-ui-vue3/src/template/inHosptialCommunicate.vue
@@ -659,7 +659,7 @@ defineExpose({ submit, setFormData });

 .signature-tip {
  font-size: 12px;
-  color: #f56c6c;
+  color: #EF4444;
  margin-top: 4px;
 }

--- a/openhis-ui-vue3/src/views/appoinmentmanage/deptManage/doctorschedule/index.vue
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/deptManage/doctorschedule/index.vue
@@ -991,7 +991,7 @@ watch(

 .record-icon {
  font-size: 18px;
-  color: #409eff;
+  color: #3B82F6;
  cursor: pointer;
  transition: color 0.2s;
 }
--- a/openhis-ui-vue3/src/views/appoinmentmanage/deptManage/index.vue
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/deptManage/index.vue
@@ -2307,7 +2307,7 @@ onMounted(async () => {

 .record-icon {
  font-size: 18px;
-  color: #409eff;
+  color: #3B82F6;
  cursor: pointer;
  transition: color 0.2s;
 }
@@ -2377,7 +2377,7 @@ onMounted(async () => {
  font-size: 36px !important;
  width: 36px !important;
  height: 36px !important;
-  color: #F56C6C !important; /* 直接设置为红色 */
+  color: #EF4444 !important; /* 直接设置为红色 */
  transition: all 0.2s ease-in-out;
 }

--- a/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue
@@ -1059,18 +1059,18 @@ $form-element-spacing: 16px;
  }

  &.el-button--danger {
-    color: #f56c6c;
+    color: #EF4444;

    &:hover {
-      color: lighten(#f56c6c, 10%);
+      color: lighten(#EF4444, 10%);
    }
  }

  &.el-button--info {
-    color: #909399;
+    color: #64748B;

    &:hover {
-      color: lighten(#909399, 10%);
+      color: lighten(#64748B, 10%);
    }
  }
 }
--- a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
+++ b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue
@@ -279,7 +279,7 @@
            </div>
            <!-- 7. 已预约患者信息 -->
            <div
-              v-if="(item.status === '已预约' || item.status === '已取号') && item.patientName"
+              v-if="(item.status === '已预约' || item.status === '已取号' || item.status === '已签到') && item.patientName"
              class="ticket-patient"
            >
              {{ item.patientName }}({{ item.patientId }},{{ getGenderText(item.gender || item.patientGender) }})
@@ -472,6 +472,7 @@ const STATUS_CLASS_MAP = {
  '未预约': 'status-unbooked',
  '已预约': 'status-booked',
  '已取号': 'status-checked',
+  '已签到': 'status-checked',
  '已退号': 'status-returned',
  '已停诊': 'status-cancelled',
  '已取消': 'status-cancelled'
--- a/openhis-ui-vue3/src/views/basicmanage/InvoiceManagement/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/InvoiceManagement/index.vue
@@ -1414,7 +1414,7 @@ export default {

 .role-badge.operator {
  background-color: #f6ffed;
-  color: #67c23a;
+  color: #10B981;
  border: 1px solid #d9f7be;
 }

@@ -1448,7 +1448,7 @@ export default {
  margin: 0 0 8px 0;
  font-size: 14px;
  font-weight: 600;
-  color: #f56c6c;
+  color: #EF4444;
 }

 .error-list {
@@ -1526,7 +1526,7 @@ export default {

 .employee-id {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  background-color: #f4f4f5;
  padding: 2px 6px;
  border-radius: 8px;
@@ -1555,7 +1555,7 @@ export default {
 }

 .form-control:focus {
-  border-color: #409eff;
+  border-color: #3B82F6;
  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
 }

@@ -1570,7 +1570,7 @@ export default {
 .no-data-row {
  text-align: center;
  padding: 30px 0 !important;
-  color: #909399;
+  color: #64748B;
  font-style: normal;
  background-color: #fafafa;
 }
@@ -1581,7 +1581,7 @@ export default {

 .info-card {
  background-color: #f5f7fa;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
  padding: 12px 16px;
  border-radius: 4px;
 }
--- a/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue
@@ -329,6 +329,6 @@ defineExpose({
  background: #fff;
 }
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff;
+  outline: 2px solid #3B82F6;
 }
 </style>
--- a/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue
@@ -191,6 +191,6 @@ defineExpose({
    
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #3B82F6; /* 聚焦时的高亮效果 */
 }
 </style>
--- a/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue
@@ -1375,7 +1375,7 @@ defineExpose({ getListInfo });
 .total-amount {
  font-size: 16px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  white-space: nowrap;
 }

--- a/openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue
@@ -88,7 +88,7 @@
            </el-button>
            <el-button
              link
-              style="color: #f56c6c"
+              style="color: #EF4444"
              @click="deleteTemplate(row.id)"
            >
              删除
@@ -311,7 +311,7 @@ const deleteTemplate = (id) => {

 .card-header i {
  margin-right: 10px;
-  color: #409eff;
+  color: #3B82F6;
  font-size: 18px;
 }

@@ -345,7 +345,7 @@ const deleteTemplate = (id) => {

 .custom-tree-node i {
  margin-right: 8px;
-  color: #909399;
+  color: #64748B;
 }

 .node-label {
@@ -396,7 +396,7 @@ const deleteTemplate = (id) => {
 }

 .el-button--primary {
-  background: linear-gradient(135deg, #409eff, #337ecc);
+  background: linear-gradient(135deg, #3B82F6, #337ecc);
  border: none;
 }

--- a/openhis-ui-vue3/src/views/basicmanage/tcmMedicalOrderSet/components/tcmMedicineList.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/tcmMedicalOrderSet/components/tcmMedicineList.vue
@@ -294,6 +294,6 @@ defineExpose({
  background: #fff;
 }
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff;
+  outline: 2px solid #3B82F6;
 }
 </style>
--- a/openhis-ui-vue3/src/views/cardmanagement/components/AuditDrawer.vue
+++ b/openhis-ui-vue3/src/views/cardmanagement/components/AuditDrawer.vue
@@ -511,7 +511,7 @@ watch(() => props.visible, (val) => {
  color: #303133;
  margin: 0 0 16px 0;
  padding-bottom: 8px;
-  border-bottom: 2px solid #409eff;
+  border-bottom: 2px solid #3B82F6;
 }

 .card-form-section {
@@ -530,7 +530,7 @@ watch(() => props.visible, (val) => {
  color: #606266;
  margin: 16px 0 12px 0;
  padding-left: 8px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
 }

 .audit-records-section {
@@ -561,7 +561,7 @@ watch(() => props.visible, (val) => {

 .record-status {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }

 .audit-action-section {
--- a/openhis-ui-vue3/src/views/cardmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/cardmanagement/index.vue
@@ -893,22 +893,22 @@ onMounted(() => {

 .stat-icon.pending {
  background: rgba(64, 158, 255, 0.1);
-  color: #409eff;
+  color: #3B82F6;
 }

 .stat-icon.failed {
  background: rgba(245, 108, 108, 0.1);
-  color: #f56c6c;
+  color: #EF4444;
 }

 .stat-icon.success {
  background: rgba(103, 194, 58, 0.1);
-  color: #67c23a;
+  color: #10B981;
 }

 .stat-icon.reported {
  background: rgba(144, 147, 153, 0.1);
-  color: #909399;
+  color: #64748B;
 }

 .stat-content {
@@ -924,7 +924,7 @@ onMounted(() => {

 .stat-label {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
  margin-top: 4px;
 }

--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -115,7 +115,6 @@
                v-model="form.categoryCode"
                clearable
                filterable
-                :disabled="form.isEditInfoDisable === 1"
                no-data-text=""
              >
                <el-option
@@ -192,7 +191,6 @@
                clearable
                filterable
                style="width: 240px"
-                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                no-data-text=""
              >
                <el-option
@@ -258,7 +256,6 @@
                placeholder=""
                clearable
                filterable
-                :disabled="form.isEditInfoDisable === 1"
                no-data-text=""
              >
                <el-option
@@ -323,7 +320,6 @@
              <el-input
                v-model="form.retailPrice"
                placeholder=""
-                :disabled="form.isEditInfoDisable === 1"
                @input="updatePrices"
              />
            </el-form-item>
@@ -389,7 +385,7 @@
                        right: 3px;
                        top: 50%;
                        transform: translateY(-50%);
-                        color: #909399;
+                        color: #64748B;
                      "
                      @click.stop="clearItem(index)"
                    />
@@ -404,7 +400,6 @@
                    controls-position="right"
                    :min="1"
                    :max="999"
-                    :disabled="form.isEditInfoDisable === 1"
                    @change="calculateTotalPrice"
                  />
                </el-form-item>
@@ -605,8 +600,6 @@ function calculateTotalPrice() {
    );
    if (hasValidItem) {
      form.value.retailPrice = parseFloat(totalPrice.value) || 0;
-    } else {
-      form.value.retailPrice = undefined;
    }
  } catch (error) {
    totalPrice.value = '0.00';
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -675,7 +675,7 @@ getList();
  }
  
  /* 表格样式调整，移除默认的最大宽度限制 */
-  .table-scroll-container >>> .el-table {
+  .table-scroll-container :deep(.el-table) {
    min-width: 100%;
    width: auto;
  }
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -2152,7 +2152,7 @@ async function confirmCheckIn() {
      accountFormData: {
        patientId: realPatientId,
        typeCode: 1, // 个人现金账户
-        contractNo: '0000', // 默认自费
+        contractNo: form.value.contractNo || '0000', // 使用用户选择的费用性质，默认自费
      },
      chargeItemFormData: {
        patientId: realPatientId,
@@ -2177,8 +2177,7 @@ async function confirmCheckIn() {
      healthcareName: service.name || '',
    };

-    // 同步设置 form 的 contractNo，ChargeDialog 的 feeType 会读取它
-    form.value.contractNo = '0000';
+    // 保留用户选择的 contractNo，ChargeDialog 的 feeType 会读取它

    // 5. 调用预结算接口（reg-pre-pay）
    const res = await addOutpatientRegistration(registrationParam);
--- a/openhis-ui-vue3/src/views/charge/patientCardRenewal/index.vue
+++ b/openhis-ui-vue3/src/views/charge/patientCardRenewal/index.vue
@@ -175,13 +175,13 @@
          <div style="display: flex; justify-content: flex-start; gap: 10px; padding: 10px 20px; background-color: #e6f4ff;">
            <el-button
              type="primary"
-              style="background-color: #409eff; border-color: #409eff; padding: 8px 16px; font-size: 14px;"
+              style="background-color: #3B82F6; border-color: #3B82F6; padding: 8px 16px; font-size: 14px;"
              @click="confirmSelectPatient"
            >
              确认(Q)
            </el-button>
            <el-button
-              style="background-color: #f56c6c; border-color: #f56c6c; color: white; padding: 8px 16px; font-size: 14px;"
+              style="background-color: #EF4444; border-color: #EF4444; color: white; padding: 8px 16px; font-size: 14px;"
              @click="showPatientList = false; selectedPatient = null"
            >
              关闭(C)
@@ -656,8 +656,8 @@ const confirmSelectPatient = () => {

 .dialog-footer .el-button {
  min-width: 80px;
-  background-color: #f56c6c;
-  border-color: #f56c6c;
+  background-color: #EF4444;
+  border-color: #EF4444;
  color: white;
 }

@@ -726,7 +726,7 @@ const confirmSelectPatient = () => {
 }

 .title-bar {
-  background: #409eff;
+  background: #3B82F6;
  color: white;
  padding: 10px 15px;
  margin: -10px -10px 15px -10px;
@@ -803,7 +803,7 @@ const confirmSelectPatient = () => {
 .success-icon {
  width: 50px;
  height: 50px;
-  background: #67c23a;
+  background: #10B981;
  color: white;
  border-radius: 50%;
  display: flex;
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
@@ -280,6 +280,6 @@ defineExpose({
    
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #3B82F6; /* 聚焦时的高亮效果 */
 }
 </style>
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -97,7 +97,7 @@
                    <!-- 库存为空时显示提示 -->
                    <span
                      v-else
-                      style="color: #f56c6c; margin-right: 20px; font-size: 14px;"
+                      style="color: #EF4444; margin-right: 20px; font-size: 14px;"
                    >
                      无可用库存
                    </span>
@@ -375,7 +375,7 @@
      >
        <template #default="scope">
          <span v-if="!scope.row.isEdit">
-            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+            {{ formatUnitText(scope.row) }}
          </span>
        </template>
      </el-table-column>
@@ -613,6 +613,26 @@ function getRowDisabled(row) {
  return row.isEdit;
 }

+function formatUnitText(row) {
+  if (!row.quantity) return ''
+  const unitText = row.unitCode_dictText
+  // unitCode_dictText 为有效文本时直接使用
+  if (unitText && !/^\d+$/.test(unitText)) return row.quantity + ' ' + unitText
+  // 优先从行级 unitCodeList 查找
+  const list = row.unitCodeList
+  if (list && list.length) {
+    const match = list.find(u => u.value === row.unitCode)
+    if (match) return row.quantity + ' ' + match.label
+  }
+  // 回退：从字典 unit_code 查找
+  if (unit_code.value && unit_code.value.length) {
+    const dictMatch = unit_code.value.find(d => d.value === row.unitCode)
+    if (dictMatch) return row.quantity + ' ' + dictMatch.label
+  }
+  // 最后兜底用 unitCode
+  return row.quantity + ' ' + (row.unitCode || '')
+}
+
 /**
 * 是否已由医生接诊（非待诊）
 * EncounterStatus: 1=待诊 2=在诊 3=暂离 …
@@ -1382,7 +1402,7 @@ defineExpose({ getListInfo, closeAllPopovers });
 .total-amount {
  font-size: 16px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  white-space: nowrap;
 }

--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -608,7 +608,7 @@ getPharmacyCabinetLists();
 }

 .info-label {
-  color: #909399;
+  color: #64748B;
  font-size: 13px;
  white-space: nowrap;
  min-width: 90px;
@@ -661,7 +661,7 @@ getPharmacyCabinetLists();
 }

 .value-highlight {
-  color: #409eff;
+  color: #3B82F6;
  font-weight: 700;
  font-size: 15px;
 }
@@ -677,16 +677,16 @@ getPharmacyCabinetLists();

 .summary-label {
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
 }

 .section-title {
  font-size: 15px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  padding: 8px 0 8px 12px;
  margin: 8px 0 6px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
  background: linear-gradient(90deg, rgba(64, 158, 255, 0.05) 0%, transparent 100%);
 }

--- a/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
@@ -513,7 +513,7 @@ function cancel() {
 .total-amount {
  font-size: 16px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  white-space: nowrap;
 }

--- a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
@@ -224,7 +224,7 @@ function close() {

  .total {
    margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
    font-weight: 500;
  }
 }
--- a/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
@@ -494,7 +494,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {

  &.active {
    background-color: #ecf5ff;
-    border-left: 4px solid #409eff;
+    border-left: 4px solid #3B82F6;
  }
 }

@@ -527,7 +527,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {

  .total {
    margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
    font-weight: 500;
  }
 }
--- a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
@@ -592,7 +592,7 @@ getNurseListData();

 .title-info {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
 }

 .patient-cards {
@@ -612,12 +612,12 @@ getNurseListData();
 }

 .patient-card:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }

 .patient-card.actived {
-  border-color: #409eff;
+  border-color: #3B82F6;
  background: #ecf5ff;
  box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.2);
 }
@@ -637,7 +637,7 @@ getNurseListData();

 .patient-info {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
 }

 .card-divider {
@@ -658,7 +658,7 @@ getNurseListData();
 }

 .card-item .label {
-  color: #909399;
+  color: #64748B;
  min-width: 70px;
 }

@@ -672,15 +672,15 @@ getNurseListData();
 }

 .status-success {
-  color: #67c23a;
+  color: #10B981;
 }

 .status-warning {
-  color: #e6a23c;
+  color: #F59E0B;
 }

 .status-danger {
-  color: #f56c6c;
+  color: #EF4444;
 }

 :deep(.el-table tbody tr:hover > td) {
--- a/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/index.vue
+++ b/openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/index.vue
@@ -994,11 +994,11 @@ onMounted(() => {

 :deep(.el-input.is-disabled .el-input__inner) {
  background-color: #f5f7fa;
-  color: #909399;
+  color: #64748B;
 }

 :deep(.el-textarea.is-disabled .el-textarea__inner) {
  background-color: #f5f7fa;
-  color: #909399;
+  color: #64748B;
 }
 </style>
--- a/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue
+++ b/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue
@@ -832,7 +832,7 @@ onMounted(() => {
 .opinion-footer {
  margin-top: 8px;
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  text-align: right;
 }

--- a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
+++ b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
@@ -21,7 +21,7 @@
          >
            <div
              class="stat-card-border"
-              style="border-left-color: #409eff;"
+              style="border-left-color: #3B82F6;"
            />
            <div class="stat-content">
              <div
@@ -30,7 +30,7 @@
              >
                <el-icon
                  :size="28"
-                  color="#409eff"
+                  color="#3B82F6"
                >
                  <Clock />
                </el-icon>
@@ -54,7 +54,7 @@
          >
            <div
              class="stat-card-border"
-              style="border-left-color: #f56c6c;"
+              style="border-left-color: #EF4444;"
            />
            <div class="stat-content">
              <div
@@ -63,7 +63,7 @@
              >
                <el-icon
                  :size="28"
-                  color="#f56c6c"
+                  color="#EF4444"
                >
                  <CircleClose />
                </el-icon>
@@ -87,7 +87,7 @@
          >
            <div
              class="stat-card-border"
-              style="border-left-color: #67c23a;"
+              style="border-left-color: #10B981;"
            />
            <div class="stat-content">
              <div
@@ -96,7 +96,7 @@
              >
                <el-icon
                  :size="28"
-                  color="#67c23a"
+                  color="#10B981"
                >
                  <CircleCheck />
                </el-icon>
@@ -120,7 +120,7 @@
          >
            <div
              class="stat-card-border"
-              style="border-left-color: #e6a23c;"
+              style="border-left-color: #F59E0B;"
            />
            <div class="stat-content">
              <div
@@ -129,7 +129,7 @@
              >
                <el-icon
                  :size="28"
-                  color="#e6a23c"
+                  color="#F59E0B"
                >
                  <Document />
                </el-icon>
@@ -995,7 +995,7 @@
      width="500px"
      :before-close="handleBatchReturnClose"
    >
-      <span style="color: #f56c6c;">即将退回 {{ selectedRows.length }} 张报卡，请谨慎操作</span>
+      <span style="color: #EF4444;">即将退回 {{ selectedRows.length }} 张报卡，请谨慎操作</span>
      <el-form
        :model="batchReturnForm"
        label-width="80px"
@@ -1838,7 +1838,7 @@ function getAuditTypeName(type) {

 .stat-label {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
  margin-top: 4px;
 }

@@ -1930,7 +1930,7 @@ function getAuditTypeName(type) {
  color: #303133;
  margin: 0 0 16px 0;
  padding-bottom: 8px;
-  border-bottom: 2px solid #409eff;
+  border-bottom: 2px solid #3B82F6;
 }

 .card-detail-section {
@@ -1949,7 +1949,7 @@ function getAuditTypeName(type) {
  color: #606266;
  margin: 16px 0 12px 0;
  padding-left: 8px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
 }

 .audit-records-section {
@@ -1980,7 +1980,7 @@ function getAuditTypeName(type) {

 .record-status {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }

 .audit-action-section {
--- a/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue
@@ -181,7 +181,7 @@
              <el-button
                type="danger"
                size="small"
-                style="background-color: #f56c6c; border-color: #f56c6c;"
+                style="background-color: #EF4444; border-color: #EF4444;"
                @click="handleCompleteRow(row)"
              >
                结束
@@ -465,7 +465,7 @@
            v-if="selectedPhysiciansList.length > 0" 
            type="text" 
            size="small" 
-            style="margin-left: auto; color: #f56c6c;"
+            style="margin-left: auto; color: #EF4444;"
            @click="clearAllSelections"
          >
            清空
@@ -1501,7 +1501,7 @@ onUnmounted(() => {
        color: #303133;
        margin-bottom: 15px;
        padding-bottom: 10px;
-        border-bottom: 2px solid #409eff;
+        border-bottom: 2px solid #3B82F6;
      }
      
      .section-title {
@@ -1524,7 +1524,7 @@ onUnmounted(() => {
          min-height: 60px;
          padding: 10px;
          background: #f0f9ff;
-          border: 1px dashed #409eff;
+          border: 1px dashed #3B82F6;
          border-radius: 4px;
          
          .invited-list {
@@ -1534,7 +1534,7 @@ onUnmounted(() => {
          }
          
          .empty-invited {
-            color: #909399;
+            color: #64748B;
            font-size: 13px;
            text-align: center;
            padding: 10px 0;
@@ -1556,7 +1556,7 @@ onUnmounted(() => {
        color: #303133;
        margin-bottom: 15px;
        padding-bottom: 10px;
-        border-bottom: 2px solid #409eff;
+        border-bottom: 2px solid #3B82F6;
      }
      
      .selected-summary {
@@ -1576,7 +1576,7 @@ onUnmounted(() => {
        .summary-count {
          font-size: 18px;
          font-weight: bold;
-          color: #409eff;
+          color: #3B82F6;
          margin: 0 4px;
        }
      }
@@ -1634,7 +1634,7 @@ onUnmounted(() => {
                height: 20px;
                line-height: 20px;
                text-align: center;
-                background: #67c23a;
+                background: #10B981;
                color: #fff;
                border-radius: 10px;
                font-size: 12px;
@@ -1662,14 +1662,14 @@ onUnmounted(() => {
          }
          
                  &.is-checked .el-checkbox__label {
-                    color: #409eff;
+                    color: #3B82F6;
                    font-weight: 500;
                  }
            }
          }
          
              .no-physicians {
-            color: #909399;
+            color: #64748B;
                font-size: 12px;
            text-align: center;
                padding: 10px 0;
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -1145,7 +1145,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }

 .diagnosis-text:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
 }

 .diagnosis-text-content {
@@ -1158,12 +1158,12 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }

 .diagnosis-text-icon {
-  color: #909399;
+  color: #64748B;
  font-size: 12px;
 }

 .diagnosis-text:hover .diagnosis-text-icon {
-  color: #409eff;
+  color: #3B82F6;
 }

 /* 诊断选择弹窗样式 */
@@ -1202,7 +1202,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }

 .diagnosis-text:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
 }

 .diagnosis-text:empty::before {
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -2161,7 +2161,7 @@ defineExpose({ show, showReport, close: handleClose });
 }

 :deep(.el-input__wrapper.is-focus) {
-  box-shadow: 0 0 0 1px var(--el-input-focus-border-color, #409eff) inset;
+  box-shadow: 0 0 0 1px var(--el-input-focus-border-color, #3B82F6) inset;
 }

 /* 标题区样式 */
@@ -2294,7 +2294,7 @@ defineExpose({ show, showReport, close: handleClose });
 }

 .address-selects :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }

 .address-selects :deep(.el-input__inner) {
@@ -2321,7 +2321,7 @@ defineExpose({ show, showReport, close: handleClose });
 }

 .underline-input :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }

 .underline-input :deep(.el-input__inner) {
@@ -2352,7 +2352,7 @@ defineExpose({ show, showReport, close: handleClose });
 }

 .underline-select :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }

 .underline-select :deep(.el-input__inner) {
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
@@ -393,7 +393,7 @@
                  <el-option
                    v-for="category in elep_rate_code"
                    :key="category.value"
-                    :label="category.label"
+                    :label="category.value + ' ' + category.label"
                    :value="category.value"
                  />
                </el-select>
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
@@ -616,7 +616,7 @@ defineExpose({ getList });
 .total-amount {
  font-size: 16px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  white-space: nowrap;
 }

--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
  <div
    class="exam-app-container"
    style="width: 100%; max-width: 1200px;"
@@ -358,7 +358,7 @@
                        :value="opt.value"
                      />
                      <template #empty>
-                        <div style="padding: 10px 0; color: #909399; text-align: center;">
+                        <div style="padding: 10px 0; color: #64748B; text-align: center;">
                          {{ orgLoading ? '加载中...' : '暂无匹配科室' }}
                        </div>
                      </template>
@@ -569,7 +569,7 @@
                    </span>
                    <span
                      v-else-if="scope.row.methods && scope.row.methods.length > 0"
-                      style="color: #909399;"
+                      style="color: #64748B;"
                    >
                      未选择
                    </span>
@@ -707,7 +707,7 @@
                      class="item-checkbox"
                      @change="(val) => handleItemSelect(val, item, cat)"
                    >
-                      {{ item.name }}
+                      {{ getDisplayItemName(item) }}
                    </el-checkbox>
                    <span class="item-price">¥{{ item.price }}/{{ item.unit || "次" }}</span>
                  </div>
@@ -806,7 +806,7 @@
              <div
                v-for="(method, idx) in selectedMethods"
                :key="'method-' + method.id"
-                class="selected-item-card"
+                class="selected-item-card method-child-card"
                :class="{ 'is-expanded': method.expanded }"
              >
                <div
@@ -873,12 +873,8 @@
                  </div>
                </template>
              </div>
-            </div>

-            </div>
-          </div>
-
-          <!-- 独立检查方法勾选区：与"已选择"区域解耦，支持分别手动勾选 -->
+          <!-- 检查方法勾选区：点击检查类型时出现在已选择框内 -->
          <div class="method-picker-section">
            <div
              v-if="methodsForActiveCategory.length > 0"
@@ -909,6 +905,9 @@
                </div>
              </div>
            </div>
+            </div>
+          </div>
+            </div>
          </div>
        </div>
      </div>
@@ -1265,7 +1264,12 @@ const activeCategory = computed(() => {
 const activeCategoryName = computed(() => activeCategory.value?.typeName || activeCategory.value?.categoryName || '');

 const methodsForActiveCategory = computed(() => {
-  const arr = activeCategory.value?.methods;
+  // Bug #550修复: 直接从 categoryList 查找，避免 activeCategory 中间 computed 缓存阻断响应式
+  const id = activeNames.value;
+  if (id === '' || id === null || id === undefined) return [];
+  const cat = categoryList.value.find(c => String(c.typeId) === String(id));
+  if (!cat) return [];
+  const arr = cat.methods;
  return Array.isArray(arr) ? arr : [];
 });

@@ -1944,6 +1948,11 @@ async function handleItemSelect(checked, item, cat) {
      console.error('加载检查方法失败', err);
    }

+    // Bug #550修复: 同步方法到分类，确保右侧方法选择器可见
+    if (methods.length > 0 && cat && (!cat.methods || cat.methods.length === 0)) {
+      cat.methods = methods;
+    }
+
    if (selectedItems.value.length > 0) {
      const currentCategory = selectedItems.value[0].checkType;
      // Bug #428修复: 使用 cat.typeName 进行比较（与 effectiveCheckType 保持一致）
@@ -2292,7 +2301,7 @@ defineExpose({ getList });
 .total-amount {
  font-size: 15px;
  font-weight: bold;
-  color: #f56c6c;
+  color: #EF4444;
  margin-left: 4px;
 }

@@ -2336,7 +2345,7 @@ defineExpose({ getList });
  min-height: 300px;   /* Bug #500: 增大最小高度，避免折叠动画期间容器高度突变 */
 }
 .empty-hint {
-  color: #909399;
+  color: #64748B;
  font-size: 12px;
  text-align: center;
  padding: 20px 0;
@@ -2354,7 +2363,7 @@ defineExpose({ getList });
  width: 6px;
  height: 6px;
  border-radius: 50%;
-  background: #409eff;
+  background: #3B82F6;
  margin-left: 6px;
  animation: dotPulse 1s ease-in-out infinite;
 }
@@ -2398,7 +2407,7 @@ defineExpose({ getList });
 .method-section-title {
  font-size: 12px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  margin-bottom: 4px;
  padding-bottom: 3px;
  border-bottom: 1px dashed #d9ecff;
@@ -2428,7 +2437,7 @@ defineExpose({ getList });

 .method-price-tag {
  font-size: 11px;
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: 500;
  flex-shrink: 0;
  margin-left: 6px;
@@ -2459,28 +2468,24 @@ defineExpose({ getList });
  flex-direction: column;
  gap: 8px;
  flex-shrink: 0;
+  width: 280px;
+  min-width: 260px;
 }

 .method-picker-section {
-  width: 260px;
-  min-width: 240px;
-  max-width: 320px;
  flex-shrink: 0;
  display: flex;
  flex-direction: column;
-  margin-top: 8px;
 }

 .selected-panel {
-  width: 260px;
-  min-width: 240px;
-  max-width: 320px;
-  flex-shrink: 0;
+  min-width: 0;
+  flex: 1;
  display: flex;
  flex-direction: column;
+  overflow-y: auto;
 }
 .selected-tags {
-  flex: 1;
  overflow-y: auto;
  overflow-x: hidden;
  display: flex;
@@ -2488,6 +2493,27 @@ defineExpose({ getList });
  gap: 8px;
  padding-right: 2px;
 }
+
+/* 已选择面板中项目/方法区域分隔 */
+.section-divider {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 0 2px;
+}
+.section-divider::before {
+  content: '';
+  flex: 1;
+  height: 1px;
+  background: #dcdfe6;
+}
+.divider-label {
+  font-size: 11px;
+  font-weight: 600;
+  color: #64748B;
+  letter-spacing: 0.03em;
+  flex-shrink: 0;
+}
 .selected-tag {
  max-width: 100%;
  overflow: hidden;
@@ -2510,6 +2536,13 @@ defineExpose({ getList });
  overflow: hidden;
 }

+/* 方法卡片：子级缩进，表示从属于检查项目 */
+.selected-item-card.method-child-card {
+  margin-left: 20px;
+  border-left: 3px solid #F59E0B;
+  border-radius: 0 6px 6px 0;
+}
+
 /* 项目上 / 方法下：各自独立下拉条 */
 .fold-strip {
  border-bottom: 1px solid var(--el-border-color-lighter);
@@ -2538,7 +2571,7 @@ defineExpose({ getList });

 .fold-chevron {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
  transition: transform 0.2s ease;
  flex-shrink: 0;
  margin-top: 2px;
@@ -2568,7 +2601,7 @@ defineExpose({ getList });
 .fold-kicker {
  font-size: 11px;
  font-weight: 600;
-  color: #909399;
+  color: #64748B;
  letter-spacing: 0.03em;
 }

@@ -2594,14 +2627,14 @@ defineExpose({ getList });

 .fold-price-strong {
  font-size: 13px;
-  color: #409eff;
+  color: #3B82F6;
  font-weight: 600;
  flex-shrink: 0;
  margin-top: 2px;
 }

 .fold-price-strong.warn {
-  color: #e6a23c;
+  color: #F59E0B;
 }

 .fold-strip-body {
@@ -2616,7 +2649,7 @@ defineExpose({ getList });

 .fold-strip-muted {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  padding: 10px 0 4px;
 }

@@ -2652,13 +2685,13 @@ defineExpose({ getList });

 .global-method-picker-scope {
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  flex-shrink: 0;
 }

 .method-picker-arrow {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
  transition: transform 0.2s ease;
  flex-shrink: 0;
  transform: rotate(-90deg);
@@ -2683,7 +2716,7 @@ defineExpose({ getList });

 .expand-icon {
  font-size: 14px;
-  color: #909399;
+  color: #64748B;
  transition: transform 0.2s ease;
  flex-shrink: 0;
  transform: rotate(-90deg);
@@ -2723,7 +2756,7 @@ defineExpose({ getList });
 }

 .detail-info {
-  color: #909399;
+  color: #64748B;
  font-size: 10px;
  white-space: nowrap;
 }
@@ -2736,7 +2769,7 @@ defineExpose({ getList });
 .selected-section-title {
  font-size: 12px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  margin-bottom: 8px;
  padding-bottom: 6px;
  border-bottom: 1px dashed #d9ecff;
@@ -2767,14 +2800,14 @@ defineExpose({ getList });
  padding: 10px;
  font-size: 12px;
  font-weight: 600;
-  color: #909399;
+  color: #64748B;
  cursor: pointer;
  border-bottom: 1px dashed #dcdfe6;
  background: #fffbe6;
 }

 .package-toggle:hover {
-  color: #409eff;
+  color: #3B82F6;
 }

 /* 收起态：仅展示折叠箭头，不显示「套餐明细」等冗余标题 */
@@ -2791,7 +2824,7 @@ defineExpose({ getList });
 }

 .package-toggle-minimal:hover {
-  color: #409eff;
+  color: #3B82F6;
  background: #f5f9ff;
 }

@@ -2824,7 +2857,7 @@ defineExpose({ getList });
 .package-details-empty {
  padding: 12px 10px;
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
  text-align: center;
 }

@@ -2839,7 +2872,7 @@ defineExpose({ getList });
 .package-details-head {
  font-size: 11px;
  font-weight: 600;
-  color: #909399;
+  color: #64748B;
  letter-spacing: 0.02em;
  margin-bottom: 8px;
  padding-bottom: 6px;
@@ -2883,14 +2916,14 @@ defineExpose({ getList });

 .detail-qty {
  font-size: 11px;
-  color: #909399;
+  color: #64748B;
  font-variant-numeric: tabular-nums;
 }

 .detail-price {
  font-size: 12px;
  font-weight: 600;
-  color: #e6a23c;
+  color: #F59E0B;
  font-variant-numeric: tabular-nums;
 }

@@ -2919,7 +2952,7 @@ defineExpose({ getList });
 }
 /* Bug #500: 分类加载中提示样式 */
 .category-loading-hint {
-  color: #909399;
+  color: #64748B;
  font-size: 12px;
  text-align: center;
  padding: 8px 0;
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -152,7 +152,7 @@
            <template #default="scope">
              <el-icon
                v-if="scope.row.priorityCode == 1"
-                color="#409EFF"
+                color="#3B82F6"
                :size="18"
              >
                <Check />
@@ -168,7 +168,7 @@
            <template #default="scope">
              <el-icon
                v-if="scope.row.applyStatus == 1"
-                color="#409EFF"
+                color="#3B82F6"
                :size="18"
              >
                <Check />
@@ -184,7 +184,7 @@
            <template #default="scope">
              <el-icon
                v-if="scope.row.needRefund"
-                color="#409EFF"
+                color="#3B82F6"
                :size="18"
              >
                <Check />
@@ -200,7 +200,7 @@
            <template #default="scope">
              <el-icon
                v-if="scope.row.needExecute"
-                color="#409EFF"
+                color="#3B82F6"
                :size="18"
              >
                <Check />
@@ -243,7 +243,7 @@
                  link
                  size="default"
                  :icon="Delete"
-                  style="color: #f56c6c; font-size: 16px"
+                  style="color: #EF4444; font-size: 16px"
                  title="删除"
                  @click.stop="handleDelete(scope.row)"
                />
@@ -1009,7 +1009,7 @@
                  <el-icon
                    v-if="category.loading"
                    class="is-loading"
-                    style="margin-left: 8px; color: #409eff;"
+                    style="margin-left: 8px; color: #3B82F6;"
                  >
                    <Loading />
                  </el-icon>
@@ -1122,7 +1122,7 @@
                    <el-button
                      link
                      size="small"
-                      style="color: #f56c6c; margin-left: auto"
+                      style="color: #EF4444; margin-left: auto"
                      @click.stop="removeInspectionItem(item)"
                    >
                      删除
@@ -2852,13 +2852,13 @@ defineExpose({
  }

  .el-pager li:hover {
-    border-color: #409eff;
-    color: #409eff;
+    border-color: #3B82F6;
+    color: #3B82F6;
  }

  .el-pager li.is-active {
-    border-color: #409eff;
-    background-color: #409eff;
+    border-color: #3B82F6;
+    background-color: #3B82F6;
    color: #fff;
  }

@@ -2937,12 +2937,12 @@ defineExpose({
 }

 .category-tab:hover {
-  color: #409eff;
+  color: #3B82F6;
 }

 .category-tab.active {
-  color: #409eff;
-  border-bottom-color: #409eff;
+  color: #3B82F6;
+  border-bottom-color: #3B82F6;
  font-weight: bold;
 }

@@ -2964,12 +2964,12 @@ defineExpose({
 }

 .inspection-item:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
  background-color: #ecf5ff;
 }

 .inspection-item.selected {
-  border-color: #409eff;
+  border-color: #3B82F6;
  background-color: #ecf5ff;
 }

@@ -2978,7 +2978,7 @@ defineExpose({
 }

 .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: bold;
 }

@@ -3027,7 +3027,7 @@ defineExpose({

 .category-item.active {
  background-color: #e6f7ff;
-  color: #409eff;
+  color: #3B82F6;
  font-weight: bold;
 }

@@ -3071,12 +3071,12 @@ defineExpose({
 }

 .inspection-selector .inspection-item:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
  background-color: #ecf5ff;
 }

 .inspection-selector .inspection-item.selected {
-  border-color: #409eff;
+  border-color: #3B82F6;
  background-color: #ecf5ff;
  font-weight: bold;
 }
@@ -3142,7 +3142,7 @@ defineExpose({
 }

 :deep(.inspection-table .el-button--link) {
-  color: #409eff;
+  color: #3B82F6;
  transition: color 0.3s ease;
 }

@@ -3151,7 +3151,7 @@ defineExpose({
 }

 :deep(.inspection-table .el-button--link:last-child) {
-  color: #f56c6c;
+  color: #EF4444;
 }

 :deep(.inspection-table .el-button--link:last-child:hover) {
@@ -3225,7 +3225,7 @@ defineExpose({
  align-items: center;
  justify-content: center;
  padding: 20px;
-  color: #909399;
+  color: #64748B;
  font-size: 14px;
 }

@@ -3241,7 +3241,7 @@ defineExpose({
 .load-info {
  margin-left: 8px;
  font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }

 /* 没有更多数据提示 */
@@ -3281,7 +3281,7 @@ defineExpose({
 }

 .inspection-tree-item .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: bold;
  margin-left: 10px;
 }
@@ -3321,7 +3321,7 @@ defineExpose({
 }

 .selected-item-content .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: bold;
  margin-right: 10px;
 }
@@ -3345,7 +3345,7 @@ defineExpose({
 }

 .selected-tree-header .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: bold;
  margin-left: 16px;
  min-width: 60px;
@@ -3410,14 +3410,14 @@ defineExpose({
 .selected-tree-detail .detail-price {
  width: 60px;
  text-align: right;
-  color: #e6a23c;
+  color: #F59E0B;
  font-weight: 500;
 }

 .no-detail {
  text-align: center;
  padding: 10px;
-  color: #909399;
+  color: #64748B;
  font-size: 12px;
 }

@@ -3426,7 +3426,7 @@ defineExpose({
  align-items: center;
  justify-content: center;
  padding: 15px;
-  color: #909399;
+  color: #64748B;
  font-size: 12px;
 }

@@ -3439,20 +3439,20 @@ defineExpose({
 /* 表单验证错误样式 */
 .form-item-error .el-input__inner,
 .form-item-error .el-textarea__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }

 .form-item-error .el-select .el-input__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }

 .is-error.el-input .el-input__inner,
 .is-error.el-textarea .el-textarea__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }

 .error-message {
-  color: #f56c6c;
+  color: #EF4444;
  font-size: 12px;
  margin-top: 4px;
  line-height: 1;
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
@@ -73,7 +73,7 @@
              placement="top"
            >
              <span 
-                style="cursor: pointer; color: #409eff; font-weight: 500; text-decoration: underline;"
+                style="cursor: pointer; color: #3B82F6; font-weight: 500; text-decoration: underline;"
                @click="handleEditGroup(scope.row)"
              >
                {{ scope.row.name }}
@@ -129,7 +129,7 @@
      
      <div
        v-if="filteredOrderList.length === 0 && !loading"
-        style="text-align: center; padding: 40px; color: #909399;"
+        style="text-align: center; padding: 40px; color: #64748B;"
      >
        <el-icon
          :size="48"
@@ -323,7 +323,7 @@
                <el-option 
                  v-for="dict in rate_code" 
                  :key="dict.value" 
-                  :label="dict.label" 
+                  :label="dict.value + ' ' + dict.label" 
                  :value="dict.value" 
                />
              </el-select>
@@ -350,7 +350,7 @@
        
        <div
          v-if="!editingGroup.detailList || editingGroup.detailList.length === 0" 
-          style="text-align: center; padding: 30px; color: #909399; border: 1px dashed #dcdfe6; margin-top: 10px;"
+          style="text-align: center; padding: 30px; color: #64748B; border: 1px dashed #dcdfe6; margin-top: 10px;"
        >
          <p>暂无项目，点击"添加项目"按钮添加</p>
        </div>
@@ -366,7 +366,7 @@
    >
      <div v-if="currentGroup">
        <h4>{{ currentGroup.name }}</h4>
-        <p style="color: #909399; font-size: 14px;">
+        <p style="color: #64748B; font-size: 14px;">
          使用范围：{{ currentGroup.rangeCode_dictText }} | 
          包含 {{ currentGroup.detailList?.length || 0 }} 个医嘱项
        </p>
@@ -500,7 +500,7 @@
      
      <div
        v-if="adviceItemList.length === 0 && !itemLoading" 
-        style="text-align: center; padding: 30px; color: #909399;"
+        style="text-align: center; padding: 30px; color: #64748B;"
      >
        <p>请输入关键词搜索医嘱项目</p>
      </div>
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -539,7 +539,7 @@
                          <el-option
                            v-for="dict in rate_code"
                            :key="dict.value"
-                            :label="dict.label"
+                            :label="dict.value + ' ' + dict.label"
                            :value="dict.value"
                            @click="() => (scope.row.rateCode_dictText = dict.label)"
                          />
@@ -1267,7 +1267,7 @@
                <el-option
                  v-for="item in rate_code"
                  :key="item.value"
-                  :label="item.label"
+                  :label="item.value + ' ' + item.label"
                  :value="item.value"
                />
              </el-select>
@@ -1345,6 +1345,18 @@
            </span>
          </template>
        </el-table-column>
+        <el-table-column
+          label="退回原因"
+          align="center"
+          prop="reasonText"
+          width="160"
+        >
+          <template #default="scope">
+            <span v-if="!scope.row.isEdit" style="color: #F59E0B;">
+              {{ scope.row.reasonText || '-' }}
+            </span>
+          </template>
+        </el-table-column>
        <el-table-column
          label="诊断"
          align="center"
@@ -5409,7 +5421,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 .total-amount {
  font-size: 16px;
  font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
  white-space: nowrap;
 }

@@ -5543,21 +5555,21 @@ defineExpose({ getListInfo, getDiagnosisInfo });

 .order-group-action-icon {
  cursor: pointer;
-  color: #909399;
+  color: #64748B;
  font-size: 14px;
  transition: color 0.2s;
  padding: 2px;
 }

 .order-group-action-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }

 .order-group-add {
  padding: 8px 12px;
  cursor: pointer;
  text-align: center;
-  color: #409eff;
+  color: #3B82F6;
  font-size: 13px;
  border-top: 1px solid #f2f3f5;
  display: flex;
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
@@ -349,7 +349,7 @@ function clickRow(row) {

  .total {
    margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
    font-weight: 500;
  }
 }
--- a/Show More
+++ b/Show More