Merge remote-tracking branch 'origin/develop' into develop

修复取消预约次数限制逻辑与配置不一致的问题，使用配置值而非硬编码值进行校验。同时优化诊前退号检查逻辑，增加病历记录、费用明细、班段结束时间等校验条件，防止不当退号操作。

refactor(检验申请): 优化检验申请单列表查询SQL
从明细表聚合项目名称和金额，避免直接查询申请单表导致的数据重复问题。

BUGFIX_ANALYSIS.md

@@ -0,0 +1,91 @@
+# Bug 根因分析与修复方案
+
+## Bug 335 - 门诊医生站开立药品医嘱保存报错
+
+### 问题分析
+根据代码分析，`DoctorStationAdviceAppServiceImpl.saveAdvice()` 方法处理药品医嘱保存时可能报错的原因：
+
+1. **patientId/encounterId 为 null** - 删除操作时前端可能未传
+2. **accountId 为 null** - 患者账户信息未正确获取
+3. **definitionId/definitionDetailId 为 null** - 定价信息缺失
+4. **库存校验失败** - 药品库存不足
+
+### 修复方案
+✅ 已部分修复（见代码中的 BugFix 注释）
+- 已添加 patientId/encounterId 自动补全逻辑
+- 已添加 accountId 自动创建逻辑
+- 需要进一步验证 definitionId 的处理
+
+---
+
+## Bug 336 - 门诊医生站开立诊疗项目保存报错
+
+### 问题分析
+诊疗项目保存与药品类似，但有以下特殊点：
+
+1. **必须选择执行科室** - 代码中有校验 `throw new ServiceException("诊疗项目必须选择执行科室")`
+2. **活动绑定设备处理** - 需要处理 `handService()` 中的设备绑定逻辑
+3. **库存校验** - 诊疗项目可能关联耗材
+
+### 修复方案
+- 确保前端传递 executeDeptId（执行科室）
+- 检查 handService() 方法中的异常处理
+- 添加更详细的错误日志
+
+---
+
+## Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录
+
+### 问题分析
+**这是患者安全问题！** 未接诊患者也可新增划价项目可能导致：
+- 收费错误
+- 医疗纠纷
+- 数据不一致
+
+当前代码问题：
+- `OutpatientPricingAppServiceImpl.getAdviceBaseInfo()` 仅查询医嘱，未校验就诊状态
+- 前端划价保存接口未找到（可能在其他地方）
+
+### 修复方案
+1. 在划价查询时增加就诊状态校验
+2. 在划价保存时增加诊断记录校验
+3. 未接诊患者禁止划价
+
+---
+
+## Bug 339 - 药房筛选条件失效
+
+### 问题分析
+查询结果中包含非选中药房的数据，可能原因：
+- SQL WHERE 条件未正确应用 locationId
+- 多表关联时过滤条件丢失
+
+### 修复方案
+- 检查 `DoctorStationAdviceAppMapper.getAdviceBaseInfo()` 的 SQL
+- 确保 locationId 条件正确应用
+
+---
+
+## 修复优先级
+
+1. **Bug 338** - 患者安全问题，最高优先级
+2. **Bug 335/336** - 核心功能阻断，高优先级
+3. **Bug 339** - 数据准确性问题，中优先级
+
+---
+
+## 测试用例
+
+### Bug 338 测试
+1. 选择未接诊患者，尝试划价 → 应禁止
+2. 选择已接诊但无诊断的患者，尝试划价 → 应提示补充诊断
+3. 选择正常接诊患者，划价 → 应成功
+
+### Bug 335/336 测试
+1. 门诊医生站开立药品医嘱 → 应成功保存
+2. 门诊医生站开立诊疗项目 → 应成功保存
+3. 签发医嘱 → 应成功
+
+### Bug 339 测试
+1. 选择"西药房"筛选 → 结果应仅包含西药房数据
+2. 选择"中药房"筛选 → 结果应仅包含中药房数据

BUGFIX_PLAN.md

@@ -0,0 +1,84 @@
+# HIS 系统 Bug 修复计划
+
+## 修复负责人
+华佗 (AI 团队)
+
+## 修复时间
+2026-04-05 开始
+
+---
+
+## Bug 清单与修复优先级
+
+### 🔴 高优先级（核心业务阻断）
+
+#### Bug 335 - 门诊医生站开立药品医嘱保存报错
+- **模块**: 医生工作站
+- **文件**: `DoctorStationAdviceAppServiceImpl.java`
+- **根因分析**: 待分析
+- **修复状态**: 🔄 分析中
+
+#### Bug 336 - 门诊医生站开立诊疗项目保存报错
+- **模块**: 医生工作站
+- **文件**: `DoctorStationAdviceAppServiceImpl.java`
+- **根因分析**: 待分析
+- **修复状态**: ⏳ 等待 335 修复后验证
+
+#### Bug 338 - 门诊划价新增时未校验就诊记录及诊断记录
+- **模块**: 门诊收费
+- **问题**: 未接诊患者也可新增划价项目（患者安全问题）
+- **修复方案**: 在划价保存前增加就诊状态和诊断记录校验
+- **修复状态**: ⏳ 待修复
+
+### 🟡 中优先级（数据准确性/用户体验）
+
+#### Bug 339 - 药房筛选条件失效
+- **模块**: 药房药库报表管理
+- **问题**: 查询结果中包含非选中药房的数据
+- **修复状态**: ⏳ 待分析
+
+#### Bug 333 - 耗材医嘱类型错误
+- **模块**: 医生工作站
+- **问题**: 类型误转为"中成药"且保存报错
+- **修复状态**: ⏳ 待分析
+
+#### Bug 337 - 挂号时间显示异常
+- **模块**: 建档挂号管理
+- **问题**: 未显示当前实际挂号时间
+- **修复状态**: ⏳ 待分析
+
+#### Bug 334 - 检验申请界面布局优化
+- **模块**: 门诊医生工作站
+- **问题**: 按钮布局需要调整
+- **修复状态**: ⏳ 待修复（前端）
+
+### 🟢 低优先级（历史遗留问题）
+
+#### Bug 249/253/280/300 - 3 月份遗留 bug
+- **修复状态**: ⏳ 后续处理
+
+---
+
+## 修复流程
+
+1. **分析根因** - 查看代码和日志，定位问题
+2. **编写修复** - 修改代码并添加必要校验
+3. **本地测试** - 确保修复有效且不引入新问题
+4. **提交代码** - commit 并推送到 gitea
+5. **验证关闭** - 在禅道更新 Bug 状态
+
+---
+
+## 测试要求
+
+- 修复后必须测试
+- 测试不通过继续修
+- 确保不影响其他功能
+
+---
+
+## 备注
+
+- 所有修复基于 develop 分支
+- 修复完成后统一提交
+- 重要修复添加详细注释

BUG_FIX_PROGRESS.md

@@ -0,0 +1,61 @@
+# HIS项目 Bug修复与需求开发进度表
+
+## 项目信息
+- **项目名称**: 开源HIS改造落地
+- **当前分支**: develop
+- **代码路径**: 
+  - 前端: openhis-ui-vue3
+  - 后端: openhis-server-new
+- ** Git仓库**: https://gitea.gentronhealth.com/wangyizhe/his
+- **禅道地址**: https://zentao.gentronhealth.com
+
+## 当前状态
+- ✅ 代码已克隆完成
+- ✅ Bug 已重新分配（管理员操作）
+- ⏳ 等待修复人员开始工作
+- 📋 张飞负责测试验证
+
+## Bug修复任务列表（重新分配后）
+
+| Bug ID | 严重程度 | 状态 | 模块 | 标题 | 原指派给 | **新指派给** | 进度 |
+|--------|----------|------|------|------|----------|--------------|------|
+| 339 | 3 | 激活 | 药房药库报表管理 | 药房筛选条件失效 | 王怡哲 | **关羽** | 待处理 |
+| 338 | 3 | 激活 | 门诊收费管理 | 未校验就诊记录 | 王怡哲 | **关羽** | 待处理 |
+| 337 | 3 | 激活 | 建档挂号管理 | 挂号时间显示异常 | 王怡哲 | **关羽** | 待处理 |
+| 336 | 3 | 激活 | 门诊医生工作站 | 开立诊疗项目保存报错 | 王怡哲 | **关羽** | 待处理 |
+| 335 | 3 | 激活 | 门诊医生工作站 | 开立药品医嘱保存报错 | 王怡哲 | **关羽** | 待处理 |
+| 334 | 3 | 激活 | 门诊医生工作站 | 检验申请界面布局优化 | 王建 | **子龙** | 待处理 |
+| 333 | 3 | 激活 | 门诊医生工作站 | 耗材医嘱类型误转 | 陈显精 | **关羽** | 待处理 |
+
+## P0 级别 Bug（紧急，优先修复）
+
+| Bug ID | 标题 | 严重程度 | 负责人 |
+|--------|------|----------|--------|
+| 335 | 开立药品医嘱保存报错 | 严重 | 关羽 |
+| 336 | 开立诊疗项目保存报错 | 严重 | 关羽 |
+| 338 | 未校验就诊记录 | 严重 | 关羽 |
+
+## 需求开发任务列表（10个，全部未关闭）
+
+待进一步确认分配情况...
+
+## 工作流程
+1. **认领任务** - 在禅道将 Bug 分配给自己
+2. **修改代码** - 从 develop 分支创建新分支：`bug/bug-id`
+3. **本地测试** - 确保本地 JDK 17 环境编译通过
+4. **提交PR** - 提交 Pull Request 到 develop 分支
+5. **测试验证** - 张飞进行测试
+6. **合并分支** - 测试通过后合并到 develop
+
+## 注意事项
+- 所有代码修改必须先创建新分支
+- 分支命名：`bug/bug-id` 或 `feature/feedback-id`
+- 提交信息必须包含禅道Bug/需求ID
+- 修改前请先阅读 `AGENTS.md` 了解项目规范
+- **JDK 17 配置** - 确保本地开发环境使用 JDK 17
+
+## 今日会议纪要
+- 2026-04-05 15:09: 管理员重新分配 Bug 给群内武将
+- 2026-04-05 14:58: 确认将王怡哲的 Bug 分配给关羽、张飞、陈琳
+- 2026-04-05 13:47: 统一调度分配人员任务
+- 2026-04-05 12:45: 初始任务分配完成

GIT_TEST_GUANYU.md

@@ -0,0 +1,2 @@
+# 关羽 Git 配置测试
+测试时间: Mon Apr  6 07:03:56 AM CST 2026

md/BUG_ANALYSIS.md

@@ -0,0 +1,70 @@
+# HIS项目 Bug 分析与修复日志
+
+## 2026-04-05 23:55 - 子龙开始工作
+
+### Bug 334 分析：门诊医生站-检验申请界面按钮布局优化
+
+**文件位置**：
+- `/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue`
+
+**当前布局问题**：
+1. 顶部操作按钮区高度 60px，可能有优化空间
+2. 表单区域 padding 较大
+3. 需要优化垂直空间利用率
+
+**修复方案**：
+- 减少不必要的 padding 和 margin
+- 优化表单字段布局
+- 调整按钮区域高度
+
+---
+
+### Bug 335 分析：门诊医生站开立药品医嘱点击【保存】时报错
+
+**文件位置**：
+- `/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
+
+**问题定位**：
+- 方法：`saveAdvice()` -> `handMedication()`
+- 可能原因：
+  1. encounterId 或 patientId 为 null
+  2. 库存校验失败
+  3. 账户ID缺失
+
+**代码已修复**：
+- 行 488-588：已添加 encounterId 和 patientId 校验
+- 行 497-588：自动补全逻辑
+
+---
+
+### Bug 336 分析：门诊医生站开立诊疗项目后点击【保存】报错
+
+**文件位置**：
+- 同上文件
+
+**问题定位**：
+- 方法：`saveAdvice()` -> `handService()`
+- 可能原因：
+  1. effectiveOrgId（执行科室）为 null
+  2. accountId 为 null
+
+**代码已修复**：
+- 行 1290-1390：已添加 accountId 自动补全
+- 行 1338-1343：诊疗项目执行科室非空校验
+
+---
+
+## 工作分工
+
+| Bug ID | 负责人 | 状态 |
+|--------|--------|------|
+| 334 | 子龙 | 分析中 |
+| 335 | 关羽 | 待修复 |
+| 336 | 关羽 | 待修复 |
+| 338 | 关羽 | 待修复 |
+
+## 下一步行动
+
+1. 子龙修复 Bug 334（检验申请界面布局优化）
+2. 关羽修复 Bug 335、336、338
+3. 张飞测试验证

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java

@@ -1,8 +1,10 @@
 package com.openhis.web.appointmentmanage.appservice.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.appointmentmanage.domain.DoctorSchedule;
 import com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto;
 import com.openhis.appointmentmanage.domain.SchedulePool;
@@ -497,6 +499,15 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         if (ObjectUtil.isNotEmpty(pools)) {
             List<Long> poolIds = pools.stream().map(SchedulePool::getId).collect(java.util.stream.Collectors.toList());
 
+            // 该排班下存在有效患者预约（号源槽：已预约/已锁定/已取号）则禁止删除；已退号、仅可用/已取消槽位不计入
+            long appointmentCount = scheduleSlotService.count(new QueryWrapper<ScheduleSlot>()
+                    .in("pool_id", poolIds)
+                    .in("status", CommonConstants.SlotStatus.BOOKED, CommonConstants.SlotStatus.LOCKED,
+                            CommonConstants.SlotStatus.CHECKED_IN));
+            if (appointmentCount > 0) {
+                return R.fail("该排班已有患者预约，禁止删除！如需取消请先处理患者退预约或使用'停诊'功能。");
+            }
+
             // 2. 根据号源池ID找到所有关联的号源槽
             List<ScheduleSlot> slots = scheduleSlotService.list(
                     new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<ScheduleSlot>()

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java

@@ -155,10 +155,16 @@ public class TicketAppServiceImpl implements ITicketAppService {
                 dto.setDepartmentId(raw.getDepartmentId());
                 dto.setRealPatientId(raw.getPatientId()); 
 
-                // 性别处理：直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
-                if (raw.getPatientGender() != null) {
-                    String pg = raw.getPatientGender().trim();
-                    dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
+                // 性别处理：直接使用患者表中的 genderEnum
+                Integer genderEnum = raw.getGenderEnum();
+                if (genderEnum != null) {
+                    if (Integer.valueOf(1).equals(genderEnum)) {
+                        dto.setGender("男");
+                    } else if (Integer.valueOf(2).equals(genderEnum)) {
+                        dto.setGender("女");
+                    } else {
+                        dto.setGender("未知");
+                    }
                 } else {
                     dto.setGender("未知");
                 }

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

@@ -22,6 +22,8 @@ import com.openhis.common.enums.ybenums.YbPayment;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.appointmentmanage.domain.SchedulePool;
+import com.openhis.appointmentmanage.domain.ScheduleSlot;
 import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
 import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
 import com.openhis.clinical.domain.Order;
@@ -52,6 +54,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -111,6 +114,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Resource
     SchedulePoolMapper schedulePoolMapper;
 
+    @Resource
+    com.openhis.document.service.IEmrService iEmrService;
+
     /**
      * 门诊挂号 - 查询患者信息
      *
@@ -256,14 +262,24 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R<?> returnRegister(CancelRegPaymentDto cancelRegPaymentDto) {
         Encounter byId = iEncounterService.getById(cancelRegPaymentDto.getEncounterId());
+        if (byId == null) {
+            return R.fail(null, "就诊记录不存在");
+        }
         if (EncounterStatus.CANCELLED.getValue().equals(byId.getStatusEnum())) {
             return R.fail(null, "该患者已经退号，请勿重复退号");
         }
         // 只有待诊状态才能退号
         if (!EncounterStatus.PLANNED.getValue().equals(byId.getStatusEnum())) {
-            return R.fail(null, "该患者医生已接诊，不能退号！");
+            return R.fail(null, "该患者已开始就诊，不能退号！");
+        }
+
+        // 诊前退号检查：病历、费用明细、班段时间
+        R<?> checkResult = checkPreConsultationRefund(byId);
+        if (checkResult != null) {
+            return checkResult;
         }
         iEncounterService.returnRegister(cancelRegPaymentDto.getEncounterId());
         // 查询账户信息
@@ -317,6 +333,149 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return R.ok(paymentRecon, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"退号"}));
     }
 
+    /**
+     * 诊前退号检查
+     * 检查项：病历记录、费用明细、当日就诊、班段结束时间
+     *
+     * @param encounter 就诊记录
+     * @return null 表示通过检查，否则返回失败原因
+     */
+    private R<?> checkPreConsultationRefund(Encounter encounter) {
+        Long encounterId = encounter.getId();
+
+        // 当日时间范围：今天 00:00:00 到 明天 00:00:00
+        LocalDate today = LocalDate.now();
+        LocalDateTime todayStart = today.atStartOfDay();
+        LocalDateTime tomorrowStart = today.plusDays(1).atStartOfDay();
+        Date todayStartDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
+        Date tomorrowStartDate = Date.from(tomorrowStart.atZone(ZoneId.systemDefault()).toInstant());
+
+        // 1. 检查是否有当日病历记录（医生已写病历则不能退号）
+        // 只检查当天的病历，避免误判历史数据
+        // 条件：(recordTime在当天范围内) OR (recordTime为空 AND createTime在当天范围内)
+        long emrCount = iEmrService.count(new LambdaQueryWrapper<com.openhis.document.domain.Emr>()
+            .eq(com.openhis.document.domain.Emr::getEncounterId, encounterId)
+            .and(wrapper -> wrapper
+                .and(w -> w
+                    .ge(com.openhis.document.domain.Emr::getRecordTime, todayStartDate)
+                    .lt(com.openhis.document.domain.Emr::getRecordTime, tomorrowStartDate)
+                )
+                .or()
+                .and(w -> w
+                    .isNull(com.openhis.document.domain.Emr::getRecordTime)
+                    .ge(com.openhis.document.domain.Emr::getCreateTime, todayStartDate)
+                    .lt(com.openhis.document.domain.Emr::getCreateTime, tomorrowStartDate)
+                )
+            ));
+        if (emrCount > 0) {
+            return R.fail(null, "该患者已有病历记录，不能退号！");
+        }
+
+        // 2. 检查是否有当日费用明细（除挂号费外的其他费用）
+        // 只检查当天的费用明细，避免误判历史数据
+        // 条件：(occurrenceTime在当天范围内) OR (occurrenceTime为空 AND createTime在当天范围内)
+        long chargeItemCount = iChargeItemService.count(new LambdaQueryWrapper<ChargeItem>()
+            .eq(ChargeItem::getEncounterId, encounterId)
+            .ne(ChargeItem::getContextEnum, ChargeItemContext.REGISTER.getValue())
+            .ne(ChargeItem::getStatusEnum, ChargeItemStatus.REFUNDED.getValue())
+            .and(wrapper -> wrapper
+                .and(w -> w
+                    .ge(ChargeItem::getOccurrenceTime, todayStartDate)
+                    .lt(ChargeItem::getOccurrenceTime, tomorrowStartDate)
+                )
+                .or()
+                .and(w -> w
+                    .isNull(ChargeItem::getOccurrenceTime)
+                    .ge(ChargeItem::getCreateTime, todayStartDate)
+                    .lt(ChargeItem::getCreateTime, tomorrowStartDate)
+                )
+            ));
+        if (chargeItemCount > 0) {
+            return R.fail(null, "该患者已产生诊疗费用，不能退号！");
+        }
+
+        // 3. 检查是否当日就诊（防止隔日财务封账）
+        if (encounter.getCreateTime() != null) {
+            LocalDate encounterDate = encounter.getCreateTime().toInstant()
+                .atZone(ZoneId.systemDefault()).toLocalDate();
+            if (encounterDate.isBefore(today)) {
+                return R.fail(null, "非当日就诊记录，不能退号！");
+            }
+        }
+
+        // 4. 检查班段是否已结束（通过预约订单获取班段信息）
+        R<?> shiftCheckResult = checkShiftEnded(encounter);
+        if (shiftCheckResult != null) {
+            return shiftCheckResult;
+        }
+
+        return null; // 检查通过
+    }
+
+    /**
+     * 检查班段是否已结束
+     * 截止时间 = 班段结束时间
+     *
+     * @param encounter 就诊记录
+     * @return null 表示通过检查，否则返回失败原因
+     */
+    private R<?> checkShiftEnded(Encounter encounter) {
+        try {
+            // 通过患者、科室、日期查找关联的预约订单
+            LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<Order>()
+                .eq(Order::getPatientId, encounter.getPatientId())
+                .in(Order::getStatus, CommonConstants.AppointmentOrderStatus.BOOKED,
+                    CommonConstants.AppointmentOrderStatus.CHECKED_IN)
+                .orderByDesc(Order::getUpdateTime)
+                .orderByDesc(Order::getCreateTime)
+                .last("LIMIT 1");
+
+            if (encounter.getOrganizationId() != null) {
+                queryWrapper.eq(Order::getDepartmentId, encounter.getOrganizationId());
+            }
+            if (encounter.getTenantId() != null) {
+                queryWrapper.eq(Order::getTenantId, encounter.getTenantId());
+            }
+            if (encounter.getCreateTime() != null) {
+                LocalDate encounterDate = encounter.getCreateTime().toInstant()
+                    .atZone(ZoneId.systemDefault()).toLocalDate();
+                Date startOfDay = Date.from(encounterDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+                Date nextDayStart = Date.from(encounterDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+                queryWrapper.ge(Order::getAppointmentDate, startOfDay)
+                    .lt(Order::getAppointmentDate, nextDayStart);
+            }
+
+            Order appointmentOrder = orderService.getOne(queryWrapper, false);
+            if (appointmentOrder == null || appointmentOrder.getSlotId() == null) {
+                // 没有关联的预约订单，跳过班段检查（非预约挂号的场景）
+                return null;
+            }
+
+            // 获取号源槽位
+            ScheduleSlot slot = scheduleSlotMapper.selectById(appointmentOrder.getSlotId());
+            if (slot == null || slot.getPoolId() == null) {
+                return null;
+            }
+
+            // 获取号源池（班段信息）
+            SchedulePool pool = schedulePoolMapper.selectById(slot.getPoolId());
+            if (pool == null || pool.getEndTime() == null) {
+                return null;
+            }
+            // 检查当前时间是否已过班段结束时间
+            LocalTime now = LocalTime.now();
+            if (now.isAfter(pool.getEndTime())) {
+                return R.fail(null, "当前班段已结束，不能退号！");
+            }
+
+            return null;
+        } catch (Exception e) {
+            log.warn("检查班段结束时间失败, encounterId={}", encounter.getId(), e);
+            // 异常情况下允许退号，避免阻断正常业务
+            return null;
+        }
+    }
+
     /**
      * 查询当日就诊数据
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java

@@ -2,6 +2,7 @@ package com.openhis.web.clinicalmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -87,6 +88,7 @@ public class SurgeryDto {
     private String statusEnum_dictText;
 
     /** 计划手术时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "GMT+8")
     private Date plannedTime;
 
     /** 实际开始时间 */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java

@@ -421,6 +421,20 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
 
             // 新增：更新门诊医嘱表状态为已提交
             updateServiceRequestStatus(entity.getOrderId(), RequestStatus.ACTIVE.getValue());
+
+            // 🎯 更新会诊关联费用项状态为"待收费"，提交后即可在收费界面看到
+            if (entity.getOrderId() != null) {
+                LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
+                chargeItemWrapper.eq(ChargeItem::getServiceId, entity.getOrderId())
+                        .eq(ChargeItem::getServiceTable, "wor_service_request");
+                List<ChargeItem> chargeItems = iChargeItemService.list(chargeItemWrapper);
+                for (ChargeItem chargeItem : chargeItems) {
+                    chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
+                    iChargeItemService.updateById(chargeItem);
+                }
+                log.info("会诊提交，更新关联费用项状态为待收费，更新数量: {}", chargeItems.size());
+            }
+
             return true;
         } catch (Exception e) {
             log.error("提交会诊申请失败", e);
@@ -464,6 +478,18 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
                 // 更新门诊医嘱表状态为新开
                 updateServiceRequestStatus(entity.getOrderId(), RequestStatus.DRAFT.getValue());
 
+                // 更新关联费用项状态为草稿
+                if (entity.getOrderId() != null) {
+                    LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
+                    chargeItemWrapper.eq(ChargeItem::getServiceId, entity.getOrderId())
+                            .eq(ChargeItem::getServiceTable, "wor_service_request");
+                    List<ChargeItem> chargeItems = iChargeItemService.list(chargeItemWrapper);
+                    for (ChargeItem chargeItem : chargeItems) {
+                        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue());
+                        iChargeItemService.updateById(chargeItem);
+                    }
+                }
+
             } else {
                 // 作废：状态校验 - 已确认(20)、已签名(30)、已完成(40) 状态禁止作废
                 ConsultationStatusEnum currentStatus = ConsultationStatusEnum.getByCode(entity.getConsultationStatus());
@@ -480,6 +506,18 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
                 // 更新门诊医嘱表状态为已作废
                 updateServiceRequestStatus(entity.getOrderId(), RequestStatus.CANCELLED.getValue());
 
+                // 更新关联费用项状态为终止
+                if (entity.getOrderId() != null) {
+                    LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
+                    chargeItemWrapper.eq(ChargeItem::getServiceId, entity.getOrderId())
+                            .eq(ChargeItem::getServiceTable, "wor_service_request");
+                    List<ChargeItem> chargeItems = iChargeItemService.list(chargeItemWrapper);
+                    for (ChargeItem chargeItem : chargeItems) {
+                        chargeItem.setStatusEnum(ChargeItemStatus.ABORTED.getValue());
+                        iChargeItemService.updateById(chargeItem);
+                    }
+                }
+
             }
 
             return true;
@@ -668,12 +706,14 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
     @Override
     public List<ConsultationRequestDto> getMyInvitations() {
         try {
-            // 获取当前登录医生ID
+            // 获取当前登录医生ID和租户ID
             Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId();
+            Long tenantId = SecurityUtils.getLoginUser().getTenantId().longValue();
 
             // 查询邀请我的会诊申请
             LambdaQueryWrapper<ConsultationInvited> invitedWrapper = new LambdaQueryWrapper<>();
-            invitedWrapper.eq(ConsultationInvited::getInvitedPhysicianId, currentPhysicianId)
+            invitedWrapper.eq(ConsultationInvited::getTenantId, tenantId)
+                    .eq(ConsultationInvited::getInvitedPhysicianId, currentPhysicianId)
                     .orderByDesc(ConsultationInvited::getCreateTime);
 
             List<ConsultationInvited> invitedList = consultationInvitedMapper.selectList(invitedWrapper);
@@ -1201,15 +1241,17 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
     @Override
     public List<ConsultationConfirmationDto> getPendingConfirmationList() {
         try {
-            // 获取当前登录医生ID
+            // 获取当前登录医生ID和租户ID
             Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId();
+            Long tenantId = SecurityUtils.getLoginUser().getTenantId().longValue();
             log.info("获取待确认会诊列表，当前医生ID: {}", currentPhysicianId);
 
             // 🎯 关键修改：查询当前医生个人状态为"待确认"、"已确认"或"已签名"的邀请记录
             // 10=已提交（待确认）、20=已确认（待签名）、30=已签名，排除40=已完成
             LambdaQueryWrapper<ConsultationInvited> invitedWrapper = new LambdaQueryWrapper<>();
-            invitedWrapper.eq(ConsultationInvited::getInvitedPhysicianId, currentPhysicianId)
-                    .in(ConsultationInvited::getInvitedStatus, 
+            invitedWrapper.eq(ConsultationInvited::getTenantId, tenantId)
+                    .eq(ConsultationInvited::getInvitedPhysicianId, currentPhysicianId)
+                    .in(ConsultationInvited::getInvitedStatus,
                             ConsultationStatusEnum.SUBMITTED.getCode(),  // 10-待确认
                             ConsultationStatusEnum.CONFIRMED.getCode(),  // 20-已确认（待签名）
                             ConsultationStatusEnum.SIGNED.getCode())     // 30-已签名
@@ -1233,7 +1275,8 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
             // 🎯 查询会诊申请详情（白名单：只查询正在进行中的会诊，明确业务范围）
             // 查询已提交、已确认、已签名状态的会诊，排除已完成（40）
             LambdaQueryWrapper<ConsultationRequest> requestWrapper = new LambdaQueryWrapper<>();
-            requestWrapper.in(ConsultationRequest::getId, requestIds)
+            requestWrapper.eq(ConsultationRequest::getTenantId, tenantId)
+                    .in(ConsultationRequest::getId, requestIds)
                     .in(ConsultationRequest::getConsultationStatus,
                             ConsultationStatusEnum.SUBMITTED.getCode(),   // 10-已提交
                             ConsultationStatusEnum.CONFIRMED.getCode(),   // 20-已确认
@@ -1322,10 +1365,13 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
             }
 
             // 4. 更新邀请记录（存储会诊意见）
-            // 格式：科室-医生：意见内容
+            // 格式：科室-会诊确认参加医师：意见内容
+            // 兼容：若前端未填写“会诊确认参加医师”，则回退为当前医生姓名
+            String confirmingPhysicianText =
+                StringUtils.hasText(dto.getConfirmingPhysician()) ? dto.getConfirmingPhysician().trim() : currentPhysicianName;
             String formattedOpinion = String.format("%s-%s：%s",
                 currentDeptName,
-                currentPhysicianName,
+                confirmingPhysicianText,
                 dto.getConsultationOpinion());
             
             invited.setInvitedStatus(ConsultationStatusEnum.CONFIRMED.getCode()); // 已确认
@@ -1633,7 +1679,20 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
 
                 // 更新医嘱状态为"已完成"
                 updateServiceRequestStatus(request.getOrderId(), RequestStatus.COMPLETED.getValue());
-                
+
+                // 🎯 更新会诊关联费用项状态为"待收费"，这样收费界面就能看到了
+                if (request.getOrderId() != null) {
+                    LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
+                    chargeItemWrapper.eq(ChargeItem::getServiceId, request.getOrderId())
+                            .eq(ChargeItem::getServiceTable, "wor_service_request");
+                    List<ChargeItem> chargeItems = iChargeItemService.list(chargeItemWrapper);
+                    for (ChargeItem chargeItem : chargeItems) {
+                        chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
+                        iChargeItemService.updateById(chargeItem);
+                    }
+                    log.info("会诊完成，更新关联费用项状态为待收费，更新数量: {}", chargeItems.size());
+                }
+
                 log.info("所有医生都已签名，会诊申请状态更新为：已签名(30)");
             } else {
                 // 🎯 关键修改：部分医生签名，整体状态不变（保持为10或20）

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java

@@ -147,6 +147,12 @@ public class DiagnosisTreatmentDto {
     /** 费用套餐名称（JOIN inspection_basic_information.package_name） */
     private String packageName;
 
+    /** 套餐金额（JOIN inspection_basic_information.package_amount） */
+    private BigDecimal packageAmount;
+
+    /** 套餐服务费（JOIN inspection_basic_information.service_fee） */
+    private BigDecimal serviceFee;
+
     /** 下级医技类型ID（关联 inspection_type 子类） */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long subItemId;

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

@@ -205,6 +205,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 构建查询条件
         QueryWrapper<AdviceBaseDto> queryWrapper = HisQueryUtils.buildQueryWrapper(adviceBaseDto, searchKey,
                 new HashSet<>(Arrays.asList("advice_name", "py_str", "wb_str")), null);
+        // 🔧 BugFix#339: 药房筛选条件失效 - 添加 locationId 过滤条件
+        if (locationId != null) {
+            queryWrapper.eq("location_id", locationId);
+            log.info("BugFix#339: 添加药房筛选条件 locationId={}", locationId);
+        }
         IPage<AdviceBaseDto> adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo(
                 new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
@@ -561,6 +566,25 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                         return R.fail(null, "无法获取患者信息，请重新选择患者");
                     }
                 }
+                
+                // 🔧 BugFix#338: 门诊划价新增时校验就诊状态和诊断记录（患者安全）
+                // 仅对新增/修改操作进行校验，删除操作不需要
+                if (!DbOpType.DELETE.getCode().equals(adviceSaveDto.getDbOpType())) {
+                    // 1. 校验就诊状态：必须是已接诊状态
+                    Encounter encounterCheck = iEncounterService.getById(adviceSaveDto.getEncounterId());
+                    if (encounterCheck != null) {
+                        // 就诊状态：1=待诊(PLANNED)，允许保存的状态 = 2(IN_PROGRESS在诊)、3(ON_HOLD暂离)、4(DISCHARGED诊毕)、5(COMPLETED完成)
+                        if (encounterCheck.getStatusEnum() != null &&
+                            encounterCheck.getStatusEnum() != EncounterStatus.IN_PROGRESS.getValue() &&
+                            encounterCheck.getStatusEnum() != EncounterStatus.ON_HOLD.getValue() &&
+                            encounterCheck.getStatusEnum() != EncounterStatus.DISCHARGED.getValue() &&
+                            encounterCheck.getStatusEnum() != EncounterStatus.COMPLETED.getValue()) {
+                            log.error("BugFix#338: 患者未接诊，禁止划价/保存医嘱：encounterId={}, status={}",
+                                    adviceSaveDto.getEncounterId(), encounterCheck.getStatusEnum());
+                            return R.fail(null, "患者尚未接诊，无法保存医嘱。请先完成接诊操作！");
+                        }
+                    }
+                }
             }
             
             // 药品（前端adviceType=1）
@@ -770,6 +794,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 }
             }
             
+            // 🔧 Bug Fix: 确保practitionerId不为null
+            if (adviceSaveDto.getPractitionerId() == null) {
+                adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                log.info("handMedication - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
+            }
+            
+            // 🔧 Bug Fix: 确保founderOrgId不为null
+            if (adviceSaveDto.getFounderOrgId() == null) {
+                adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
+                log.info("handMedication - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
+            }
+            
             boolean firstTimeSave = false;// 第一次保存
             medicationRequest = new MedicationRequest();
             medicationRequest.setId(adviceSaveDto.getRequestId()); // 主键id
@@ -932,13 +968,20 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             // 处理耗材发放
             Long dispenseId = iDeviceDispenseService.handleDeviceDispense(deviceRequest, DbOpType.INSERT.getCode());
 
-            // 查询耗材定价信息
-            AdviceBaseDto deviceAdviceDto = new AdviceBaseDto();
-            deviceAdviceDto.setAdviceDefinitionId(boundDevice.getDevActId());
-            deviceAdviceDto.setAdviceTableName(CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-            IPage<AdviceBaseDto> devicePage = getAdviceBaseInfo(deviceAdviceDto, null, null, null,
-                    adviceSaveDto.getFounderOrgId(), 1, 1, Whether.NO.getValue(),
-                    List.of(ItemType.DEVICE.getValue()), null, null);
+            // 查询耗材定价信息 - 直接使用mapper查询，避免递归调用getAdviceBaseInfo导致栈溢出
+            IPage<AdviceBaseDto> devicePage = doctorStationAdviceAppMapper.getAdviceBaseInfo(
+                    new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(1, 1),
+                    PublicationStatus.ACTIVE.getValue(),
+                    adviceSaveDto.getFounderOrgId(),
+                    null,
+                    CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                    null,
+                    null,
+                    List.of(boundDevice.getDevActId()),
+                    null,
+                    null,
+                    null,
+                    null);
 
             if (devicePage == null || devicePage.getRecords().isEmpty()) {
                 log.warn("无法找到耗材定价信息: deviceDefId={}", boundDevice.getDevActId());
@@ -946,12 +989,19 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
 
             AdviceBaseDto deviceBaseInfo = devicePage.getRecords().get(0);
-            if (deviceBaseInfo.getPriceList() == null || deviceBaseInfo.getPriceList().isEmpty()) {
+
+            // 查询价格信息 - 直接查询定价主表
+            List<AdvicePriceDto> mainCharge = doctorStationAdviceAppMapper.getMainCharge(
+                    List.of(deviceBaseInfo.getChargeItemDefinitionId()), PublicationStatus.ACTIVE.getValue());
+
+            if (mainCharge == null || mainCharge.isEmpty()) {
                 log.warn("耗材没有定价信息: deviceDefId={}", boundDevice.getDevActId());
                 continue;
             }
 
-            AdvicePriceDto devicePrice = deviceBaseInfo.getPriceList().get(0);
+            AdvicePriceDto devicePrice = mainCharge.get(0);
+            devicePrice.setDefinitionId(deviceBaseInfo.getChargeItemDefinitionId());
+            // 如果需要定价子表ID，可以从mainCharge中获取
 
             // 创建耗材费用项
             ChargeItem deviceChargeItem = new ChargeItem();
@@ -1137,6 +1187,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 }
             }
             
+            // 🔧 Bug Fix: 确保practitionerId不为null
+            if (adviceSaveDto.getPractitionerId() == null) {
+                adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                log.info("自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
+            }
+            
+            // 🔧 Bug Fix: 确保founderOrgId不为null
+            if (adviceSaveDto.getFounderOrgId() == null) {
+                adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
+                log.info("自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
+            }
+            
             deviceRequest = new DeviceRequest();
             deviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
@@ -1364,6 +1426,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 }
             }
             
+            // 🔧 Bug Fix: 确保practitionerId不为null
+            if (adviceSaveDto.getPractitionerId() == null) {
+                adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                log.info("handService - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
+            }
+            
+            // 🔧 Bug Fix: 确保founderOrgId不为null
+            if (adviceSaveDto.getFounderOrgId() == null) {
+                adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
+                log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
+            }
+            
             // 🔧 Bug Fix #238: 诊疗项目执行科室非空校验
             if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3) {
                 Long effectiveOrgId = adviceSaveDto.getEffectiveOrgId();
@@ -1495,6 +1569,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 //     }
                 //     log.error(e.getMessage(), e);
                 // }
+                // 签发时将收费项目状态从草稿改为待收费
+                Long chargeItemId = adviceSaveDto.getChargeItemId();
+                if (chargeItemId != null) {
+                    ChargeItem existingChargeItem = iChargeItemService.getById(chargeItemId);
+                    if (existingChargeItem != null) {
+                        existingChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
+                        iChargeItemService.updateById(existingChargeItem);
+                    }
+                }
             }
         }
     }

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

@@ -59,7 +59,7 @@
                T9.gender_enum AS genderEnum,
                T9.id_card AS idCard,
                T9.status_enum AS statusEnum,
-               T9.register_time AS registerTime,
+               T9.register_time AS register_time,
                T9.total_price AS totalPrice,
                T9.account_name AS accountName,
                T9.enterer_name AS entererName,
@@ -84,7 +84,7 @@
                         T8.gender_enum     AS gender_enum,
                         T8.id_card         AS id_card,
                         T1.status_enum     AS status_enum,
-                        T1.create_time     AS register_time,
+                         T1.create_time     AS "register_time",
                         T10.total_price,
                         T11."name"         AS account_name,
                         T12."name"         AS enterer_name,

openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml

@@ -35,6 +35,8 @@
             T1.sub_item_id,
             T3.name AS test_type,
             T5.package_name,
+            T5.package_amount,
+            T5.service_fee,
             T6.name AS sub_item_name
         FROM lab_activity_definition T1
         /* 检验类型关联（逻辑关联，无外键） */
@@ -97,6 +99,8 @@
             T1.sub_item_id,
             T3.name AS test_type,
             T5.package_name,
+            T5.package_amount,
+            T5.service_fee,
             T6.name AS sub_item_name
         FROM lab_activity_definition T1
         LEFT JOIN inspection_type T3

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

@@ -41,11 +41,18 @@
     </select>
 
     <!-- 分页查询检验申请单列表（根据就诊ID查询，按申请时间降序）
-         直接查询申请单表，不关联明细表，避免重复记录-->
+         从明细表聚合项目名称和金额-->
     <select id="getInspectionApplyListPage" resultType="com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto">
         SELECT t1.id              AS applicationId,
                t1.apply_no        AS applyNo,
-               t1.inspection_item AS itemName,
+               (SELECT STRING_AGG(t2.item_name, '+')
+                FROM lab_apply_item t2
+                WHERE t2.apply_no = t1.apply_no AND t2.delete_flag = '0'
+               )                  AS itemName,
+               (SELECT SUM(t2.item_amount)
+                FROM lab_apply_item t2
+                WHERE t2.apply_no = t1.apply_no AND t2.delete_flag = '0'
+               )                  AS itemAmount,
                t1.apply_doc_name  AS applyDocName,
                t1.priority_code   AS priorityCode,
                t1.apply_status    AS applyStatus,

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

@@ -49,7 +49,7 @@
         T8.phone AS phone,
         T8.birth_date AS birth_date,
         T1.status_enum AS status_enum,
-        T1.create_time AS register_time,
+         T1.create_time AS "register_time",
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
         T8.bus_no AS bus_no,

openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml

@@ -43,7 +43,7 @@
                         T8.gender_enum     AS gender_enum,
                         T8.id_card         AS id_card,
                         T1.status_enum     AS status_enum,
-                        T1.create_time     AS register_time,
+                         T1.create_time     AS "register_time",
                         T10.total_price,
                         T11."name"         AS account_name,
                         T12."name"         AS enterer_name,
@@ -140,7 +140,7 @@
         T8.phone AS phone,
         T8.birth_date AS birth_date,
         T1.status_enum AS status_enum,
-        T1.create_time AS register_time,
+        T1.create_time AS "register_time",
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
         T8.bus_no AS bus_no,

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java

@@ -42,4 +42,23 @@ public interface OrderMapper extends BaseMapper<Order> {
      * @return 结果
      */
     int updatePayStatus(@Param("orderId") Long orderId, @Param("payStatus") Integer payStatus, @Param("payTime") Date payTime);
+
+    /**
+     * 统计同一患者在同一科室、同一自然日（预约日 00:00～次日 00:00）内的有效预约订单数量。
+     * 匹配规则：优先 {@code department_id}（对应 adm_organization.id）；仅当 ID 为空时用 {@code department_name} 兜底。
+     *
+     * @param patientId 患者ID
+     * @param departmentId 科室 ID（order_main.department_id）
+     * @param departmentName 科室名称（ID 为空时与 order_main.department_name 比对）
+     * @param startTime 时段起始时间（含）
+     * @param endTime 时段结束时间（不含）
+     * @param statuses 订单状态集合（如 1=已预约,2=已取号）
+     * @return 数量
+     */
+    int countPatientDeptOrdersInPeriod(@Param("patientId") Long patientId,
+        @Param("departmentId") Long departmentId,
+        @Param("departmentName") String departmentName,
+        @Param("startTime") Date startTime,
+        @Param("endTime") Date endTime,
+        @Param("statuses") List<Integer> statuses);
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java

@@ -28,6 +28,7 @@ import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Date;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -163,7 +164,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
                 long cancelledCount = orderService.countPatientCancellations(patientId, tenantId, startTime);
                 if (cancelledCount >= config.getCancelAppointmentCount()) {
                     String periodName = getPeriodName(config.getCancelAppointmentType());
-                    throw new RuntimeException("由于您在" + periodName + "内累计取消预约已达" + cancelledCount + "次，触发系统限制，暂时无法在线预约，请联系分诊台或咨询客服。");
+                    int limitCount = config.getCancelAppointmentCount();
+                    throw new RuntimeException("由于您在" + periodName + "内累计取消预约已达" + limitCount + "次，触发系统限制，暂时无法在线预约，请联系分诊台或咨询客服。");
                 }
             }
         }
@@ -182,6 +184,26 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             throw new RuntimeException("该排班医生已停诊");
         }
 
+        // 2.1 同一患者同一天/同一科室不可重复预约（自然日 00:00～次日 00:00，上午+下午共限 1 次；科室以 department_id 为准，无 ID 时用科室名兜底）
+        if (dto.getPatientId() != null && slot.getScheduleDate() != null
+                && (slot.getDepartmentId() != null
+                    || (slot.getDepartmentName() != null && !slot.getDepartmentName().isBlank()))) {
+            LocalDate scheduleDateForCheck = slot.getScheduleDate();
+            LocalDateTime periodStart = LocalDateTime.of(scheduleDateForCheck, LocalTime.MIN);
+            LocalDateTime periodEnd = LocalDateTime.of(scheduleDateForCheck.plusDays(1), LocalTime.MIN);
+
+            Date startTime = Date.from(periodStart.atZone(ZoneId.systemDefault()).toInstant());
+            Date endTime = Date.from(periodEnd.atZone(ZoneId.systemDefault()).toInstant());
+
+            // 预约去重以订单为准（order_main），因为预约成功会先落订单；clinical_ticket 不一定在此链路写入
+            List<Integer> effectiveOrderStatuses = Arrays.asList(AppointmentOrderStatus.BOOKED, AppointmentOrderStatus.CHECKED_IN);
+            int exists = orderMapper.countPatientDeptOrdersInPeriod(dto.getPatientId(), slot.getDepartmentId(), slot.getDepartmentName(),
+                startTime, endTime, effectiveOrderStatuses);
+            if (exists > 0) {
+                throw new RuntimeException("该患者已在当前科室当日存在预约记录，不可重复预约");
+            }
+        }
+
         // 原子抢占：避免并发下同一槽位被重复预约
         int lockRows = scheduleSlotMapper.lockSlotForBooking(slotId);
         if (lockRows <= 0) {
@@ -264,9 +286,6 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             throw new RuntimeException("当前号源没有可取消的预约订单");
         }
 
-        // 获取订单信息
-        Order latestOrder = orders.get(0);
-
         // 直接执行取消，不再检查取消限制
         // 根据需求，取消限制应在预约挂号时检查，而非取消预约时
         for (Order order : orders) {

openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml

@@ -217,6 +217,33 @@
         where id = #{id}
     </update>
 
+    <select id="countPatientDeptOrdersInPeriod" resultType="int">
+        select count(*)
+        from order_main
+        <where>
+            and patient_id = #{patientId}
+            <choose>
+                <when test="departmentId != null">
+                    and department_id = #{departmentId}
+                </when>
+                <when test="departmentName != null and departmentName != ''">
+                    and trim(department_name) = trim(#{departmentName})
+                </when>
+                <otherwise>
+                    and 1 = 0
+                </otherwise>
+            </choose>
+            and appointment_time &gt;= #{startTime}
+            and appointment_time &lt; #{endTime}
+            <if test="statuses != null and statuses.size() &gt; 0">
+                and status in
+                <foreach item="s" collection="statuses" open="(" separator="," close=")">
+                    #{s}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
     <update id="updateOrderStatusById">
         update order_main set status = #{status} where id = #{id}
     </update>

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

@@ -196,7 +196,6 @@
                   <td>{{ index + 1 }}</td>
                   <td>{{ patient.name }}</td>
                   <td>{{ patient.identifierNo || patient.medicalCard || patient.id }}</td>
-                  <td>{{ patient.identifierNo }}</td>
                   <td>{{ getGenderText(patient.genderEnum_enumText || patient.genderEnum || patient.gender || patient.sex) }}</td>
                   <td>{{ patient.idCard }}</td>
                   <td>{{ patient.phone }}</td>
@@ -315,21 +314,21 @@ export default {
   computed: {
     filteredDoctors() {
       let filtered = [...this.doctors];
-      
+
       // 根据号源类型过滤医生列表
       if (this.selectedType === 'general') {
         filtered = filtered.filter(doctor => doctor.type === 'general');
       } else if (this.selectedType === 'expert') {
         filtered = filtered.filter(doctor => doctor.type === 'expert');
       }
-      
+
       // 根据搜索关键词过滤
       if (this.searchQuery) {
-        filtered = filtered.filter(doctor => 
+        filtered = filtered.filter(doctor =>
           doctor.name.includes(this.searchQuery)
         );
       }
-      
+
       return filtered;
     },
     filteredTickets() {
@@ -434,21 +433,21 @@ export default {
       this.selectedPatient = null;
       this.searchPatients();
     },
-    
+
     // 双击未预约卡片触发患者选择流程
     handleDoubleClick(ticket) {
       if (ticket.status === '未预约') {
         this.currentTicket = ticket;
         this.patientKeyword = '';
         this.selectedPatientId = null;
-        this.selectedPatient = null;  
+        this.selectedPatient = null;
         // 先打开弹窗，再加载患者数据，避免等待
         this.showPatientModal = true;
         // 调用患者搜索接口，加载患者列表
         this.searchPatients();
       }
     },
-    
+
     // 右键已预约卡片显示取消预约菜单
     handleRightClick(event, ticket) {
       if (ticket.status === '已预约') {
@@ -457,13 +456,13 @@ export default {
         this.contextMenuVisible = true;
       }
     },
-    
+
     // 关闭右键菜单
     closeContextMenu() {
       this.contextMenuVisible = false;
       this.selectedTicketForCancel = null;
     },
-    
+
     // 确认取消预约
     confirmCancelAppointment() {
       if (this.selectedTicketForCancel) {
@@ -485,7 +484,7 @@ export default {
         });
       }
     },
-    
+
     // 取消预约API调用
     cancelAppointment(ticket) {
       if (!ticket || !ticket.slot_id) {
@@ -493,13 +492,13 @@ export default {
         this.closeContextMenu();
         return;
       }
-      
+
       // 使用真实API调用取消预约，传递slot_id
-      cancelTicket(ticket.slot_id).then(response => {        
+      cancelTicket(ticket.slot_id).then(response => {
         // 根据后端返回判断是否成功
         if (response.code === 200 || response.msg === '取消成功' || response.message === '取消成功') {
           console.log('取消预约成功，更新前端状态');
-          
+
           // API调用成功后，更新当前卡片状态
           const ticketIndex = this.tickets.findIndex(t => t.slot_id === ticket.slot_id);
           if (ticketIndex !== -1) {
@@ -514,7 +513,7 @@ export default {
           }
 
           this.fetchTickets({ refreshDepartments: false, refreshDoctors: true }).catch(() => {});
-          
+
           // 关闭上下文菜单
           this.closeContextMenu();
           ElMessage.success('预约已取消，号源已释放');
@@ -631,24 +630,24 @@ export default {
       if (genderValue === null || genderValue === undefined) {
         return '未知';
       }
-      
+
       // 将值转换为字符串进行比较
       const strValue = String(genderValue).toLowerCase();
-      
+
       // 处理男性值
-      if (strValue === '0' || strValue === '男' || strValue === 'male' || strValue === 'm' || 
-          strValue === 'malegender' || strValue === 'man' || strValue === 'boy' || 
+      if (strValue === '0' || strValue === '男' || strValue === 'male' || strValue === 'm' ||
+          strValue === 'malegender' || strValue === 'man' || strValue === 'boy' ||
           strValue === '男性' || strValue === '男士') {
         return '男';
       }
-      
+
       // 处理女性值
-      if (strValue === '1' || strValue === '女' || strValue === 'female' || strValue === 'f' || 
-          strValue === 'femalegender' || strValue === 'woman' || strValue === 'girl' || 
+      if (strValue === '1' || strValue === '女' || strValue === 'female' || strValue === 'f' ||
+          strValue === 'femalegender' || strValue === 'woman' || strValue === 'girl' ||
           strValue === '女性' || strValue === '女士') {
         return '女';
       }
-      
+
       // 如果都不是，返回"未知"
       return '未知';
     },
@@ -661,7 +660,7 @@ export default {
       if (patient.gender !== undefined && patient.gender !== null) {
         return patient.gender;
       }
-      
+
       // 如果genderEnum_enumText是"男性"或"女性"，转换为对应的数字
       if (patient.genderEnum_enumText) {
         const text = patient.genderEnum_enumText.toLowerCase();
@@ -674,8 +673,8 @@ export default {
       // 默认返回0（男性）
       return 0;
     },
-    
-    // 检测是否为移动设备
+
+    // 检测是否为移动设备。
     checkMobileDevice() {
       this.isMobile = window.innerWidth <= 768;
     },
@@ -893,8 +892,8 @@ export default {
 </script>
 
 <style scoped>
-/* 颜色变量定义 */
-:root {
+/* 颜色变量定义 - 使用组件内CSS变量 */
+.ticket-management-container {
   --primary-color: #1890FF;
   --secondary-color: #FF6B35;
   --status-unbooked: #5A8DEE;
@@ -968,7 +967,8 @@ export default {
 }
 
 .date-picker {
-  width: 100%;
+  width: 160px;
+  z-index: 1;
 }
 
 /* 搜索控件样式 */
@@ -1039,12 +1039,6 @@ export default {
   cursor: not-allowed;
 }
 
-/* 日期选择器样式 */
-.date-picker {
-  width: 160px;
-  z-index: 1;
-}
-
 /* 状态筛选器样式 */
 .status-filter {
   z-index: 2;
@@ -1130,50 +1124,50 @@ export default {
   width: 100%;
 }
 
-  /* 响应式设计 */
-  @media (max-width: 768px) {
-    /* 顶部搜索区域改为纵向排列 */
-    .top-search-area {
-      flex-direction: column;
-      height: auto;
-      padding: 16px;
-      gap: 16px;
-    }
+/* 响应式设计 */
+@media (max-width: 768px) {
+  /* 顶部搜索区域改为纵向排列 */
+  .top-search-area {
+    flex-direction: column;
+    height: auto;
+    padding: 16px;
+    gap: 16px;
+  }
 
-    /* 汉堡菜单显示 */
-    .hamburger-menu {
-      display: block;
-      align-self: flex-start;
-    }
+  /* 汉堡菜单显示 */
+  .hamburger-menu {
+    display: block;
+    align-self: flex-start;
+  }
 
-    /* 搜索区域元素宽度100% */
-    .date-picker,
-    .status-filter,
-    .patient-search,
-    .card-search,
-    .phone-search,
-    .search-button,
-    .add-patient {
-      width: 100%;
-    }
+  /* 搜索区域元素宽度100% */
+  .date-picker,
+  .status-filter,
+  .patient-search,
+  .card-search,
+  .phone-search,
+  .search-button,
+  .add-patient {
+    width: 100%;
+  }
 
-    /* 右侧内容区卡片布局调整 */
-    .virtual-list {
-      grid-template-columns: 1fr;
-      gap: 12px;
-      padding: 12px;
-    }
+  /* 右侧内容区卡片布局调整 */
+  .virtual-list {
+    grid-template-columns: 1fr;
+    gap: 12px;
+    padding: 12px;
+  }
 
-    /* 左侧边栏默认隐藏 */
-    .left-sidebar {
-      transform: translateX(-100%);
-    }
+  /* 左侧边栏默认隐藏 */
+  .left-sidebar {
+    transform: translateX(-100%);
+  }
 
-    /* 右侧内容区占满屏幕 */
-     .right-content {
-       width: 100%;
-     }
-   }
+  /* 右侧内容区占满屏幕 */
+  .right-content {
+    width: 100%;
+  }
+}
    
    /* 确保卡片样式正确应用 */
    .ticket-card {
@@ -1599,9 +1593,28 @@ export default {
 }
 
 .modal-header {
+  padding: 16px 20px;
+  border-bottom: 1px solid #e0e0e0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   flex-shrink: 0;
 }
 
+.modal-header h3 {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  font-size: 24px;
+  cursor: pointer;
+  color: #999;
+}
+
 .modal-body {
   flex: 1;
   overflow-y: auto;
@@ -1669,32 +1682,6 @@ export default {
   border-color: var(--primary-color);
 }
 
-.modal-header {
-  padding: 16px 20px;
-  border-bottom: 1px solid #e0e0e0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.modal-header h3 {
-  margin: 0;
-  font-size: 18px;
-  font-weight: 600;
-}
-
-.close-btn {
-  background: none;
-  border: none;
-  font-size: 24px;
-  cursor: pointer;
-  color: #999;
-}
-
-.modal-body {
-  padding: 20px;
-}
-
 .patient-search-toolbar {
   display: flex;
   align-items: center;

openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue

@@ -352,7 +352,20 @@ const applyRowToForm = (row) => {
 
     if (myOpinion) {
       // 如果当前医生已确认，回显其信息
-      formData.value.confirmingPhysician = myOpinion.physicianName || ''
+      // 回显“会诊确认参加医师”：优先从 opinion 前缀解析（格式：科室-参加医师：意见）
+      // 兼容旧数据（格式：科室-医生：意见）以及异常格式
+      if (myOpinion.opinion) {
+        const opinionText = myOpinion.opinion
+        const colonIndex = opinionText.indexOf('：')
+        const dashIndex = opinionText.indexOf('-')
+        if (dashIndex >= 0 && colonIndex > dashIndex) {
+          formData.value.confirmingPhysician = opinionText.substring(dashIndex + 1, colonIndex).trim()
+        } else {
+          formData.value.confirmingPhysician = myOpinion.physicianName || ''
+        }
+      } else {
+        formData.value.confirmingPhysician = myOpinion.physicianName || ''
+      }
       formData.value.confirmingPhysicianName = myOpinion.physicianName
       formData.value.confirmingDeptName = myOpinion.deptName
 

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

@@ -257,15 +257,16 @@ function fetchFromApi(searchKey) {
       searchKey: searchKey || '',
       statusEnum: 2,
     }).then((res) => {
-      console.log('[Debug] 耗材列表返回数据:', res.data);
+      console.log('[BugFix] 耗材列表返回数据:', res.data);
       if (res.data && res.data.records) {
         adviceBaseList.value = res.data.records.map((item) => {
-          console.log('[Debug] 耗材项:', item.name, 'price:', item.price, 'retailPrice:', item.retailPrice);
-          return {
+          console.log('[BugFix] 耗材项:', item.name, 'price:', item.price, 'retailPrice:', item.retailPrice);
+          const mappedItem = {
             ...item,
             // 🔧 Bug Fix: 强制覆盖后端返回的字段，确保数据正确
             adviceName: item.name || item.busNo,
             adviceType: 4,  // 强制设置为前端耗材类型
+            adviceType_dictText: '耗材',  // 🔧 Bug Fix: 设置医嘱类型显示文本
             adviceTableName: 'adm_device_definition',
             unitCode: item.unitCode || '',
             unitCode_dictText: item.unitCode_dictText || '',
@@ -293,12 +294,14 @@ function fetchFromApi(searchKey) {
             deviceName: item.name,
             // 🔧 Bug #220 修复：正确处理耗材价格，支持price或retailPrice字段
             // 价格字段优先使用retailPrice
-            priceList: (item.retailPrice !== undefined && item.retailPrice !== null) 
-              ? [{ price: item.retailPrice }] 
-              : ((item.price !== undefined && item.price !== null) 
-                  ? [{ price: item.price }] 
+            priceList: (item.retailPrice !== undefined && item.retailPrice !== null)
+              ? [{ price: item.retailPrice }]
+              : ((item.price !== undefined && item.price !== null)
+                  ? [{ price: item.price }]
                   : []),
           };
+          console.log('[BugFix] 映射后的耗材项:', mappedItem.adviceName, 'adviceType:', mappedItem.adviceType, 'adviceType_dictText:', mappedItem.adviceType_dictText);
+          return mappedItem;
         });
         nextTick(() => {
           currentIndex.value = 0;

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

@@ -1,28 +1,24 @@
 <template>
   <el-container class="inspection-application-container">
 
-    <!-- 顶部操作按钮区 -->
-    <el-header class="top-action-bar" height="60px">
-      <el-row class="action-buttons" type="flex" justify="end" :gutter="10">
-        <el-button type="primary" size="large" @click="handleSave" class="save-btn" :loading="saving">
-          <el-icon><Document /></el-icon>
-          保存
-        </el-button>
-        <el-button type="primary" size="large"  @click="handleNewApplication" class="new-btn">
-          <el-icon><Plus /></el-icon>
-          新增
-        </el-button>
-      </el-row>
-    </el-header>
+    <!-- 占位 header，保持 el-container 布局结构 -->
+    <el-header height="0" />
 
     <!-- 检验信息表格区 -->
     <el-main class="inspection-section" style="width: 100%; max-width: 100%">
       <el-card class="table-card" style="width: 100%">
         <template #header>
-          <el-row class="card-header" type="flex" align="middle">
-            <el-icon><DocumentChecked /></el-icon>
-            <span>检验信息</span>
-            </el-row>
+          <div class="table-card-header-bar">
+            <span class="table-card-title"><el-icon><DocumentChecked /></el-icon> 检验信息</span>
+            <span class="table-card-btns">
+              <el-button type="primary" size="default" @click="handleSave" :loading="saving">
+                <el-icon><Document /></el-icon> 保存
+              </el-button>
+              <el-button type="primary" size="default" @click="handleNewApplication">
+                <el-icon><Plus /></el-icon> 新增
+              </el-button>
+            </span>
+          </div>
         </template>
         <el-table
           ref="inspectionTableRef"
@@ -512,28 +508,58 @@
               </el-row>
           </template>
 
-          <!-- 已选项目列表 -->
+          <!-- 已选项目列表 - 支持树形展开 -->
           <el-scrollbar class="selected-tree" style="max-height: 220px">
-            <el-list v-if="selectedInspectionItems.length > 0" :data="selectedInspectionItems" class="selected-items-list">
-              <el-list-item
+            <div v-if="selectedInspectionItems.length > 0" class="selected-items-list">
+              <div
                 v-for="item in selectedInspectionItems"
                 :key="item.itemId"
-                class="selected-list-item"
+                class="selected-item-wrapper"
               >
-                <el-row class="selected-item-content" type="flex" align="middle" style="width: 100%">
+                <!-- 主项目行 -->
+                <div
+                  :class="['selected-item-content', { 'is-package': item.feePackageId }]"
+                  @click="item.feePackageId && togglePackageExpand(item)"
+                >
+                  <!-- 套餐展开图标 -->
+                  <el-icon
+                    v-if="item.feePackageId"
+                    :class="['expand-icon', { 'is-expanded': item.expanded }]"
+                  >
+                    <ArrowRight />
+                  </el-icon>
                   <span class="item-itemName">{{ item.itemName }}</span>
                   <span class="item-price">¥{{ item.itemPrice }}</span>
                   <el-button
                     link
                     size="small"
                     style="color: #f56c6c; margin-left: auto"
-                    @click="removeInspectionItem(item)"
+                    @click.stop="removeInspectionItem(item)"
                   >
                     删除
                   </el-button>
-                </el-row>
-              </el-list-item>
-            </el-list>
+                </div>
+
+                <!-- 套餐明细项（树形展开） -->
+                <div v-if="item.feePackageId && item.expanded" class="package-details">
+                  <div v-if="item.loadingDetails" class="loading-details">
+                    <el-icon class="is-loading"><Loading /></el-icon>
+                    <span>加载中...</span>
+                  </div>
+                  <div v-else-if="item.details && item.details.length > 0">
+                    <div
+                      v-for="detail in item.details"
+                      :key="detail.detailId"
+                      class="detail-item"
+                    >
+                      <span class="detail-name">{{ detail.itemName }}</span>
+                      <span class="detail-price">¥{{ detail.unitPrice || 0 }}</span>
+                    </div>
+                  </div>
+                  <div v-else class="no-details">暂无明细</div>
+                </div>
+              </div>
+            </div>
             <el-empty v-if="selectedInspectionItems.length === 0" class="no-selection" description="暂无选择项目" />
           </el-scrollbar>
         </el-card>
@@ -546,15 +572,16 @@
 <script setup>
 import {onMounted, onUnmounted, reactive, ref, watch, computed, getCurrentInstance} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
-import { DocumentChecked, Plus, Document, Printer, Delete, Check, Loading } from '@element-plus/icons-vue'
+import { DocumentChecked, Plus, Document, Printer, Delete, Check, Loading, ArrowRight } from '@element-plus/icons-vue'
 import {
   deleteInspectionApplication, getApplyList,
   saveInspectionApplication,
   getInspectionTypeList,
-  getInspectionItemList,
   getEncounterDiagnosis,
   getInspectionApplyDetail
 } from '../api'
+import { getLabActivityDefinitionPage } from '@/api/lab/labActivityDefinition'
+import { listInspectionPackageDetails } from '@/api/system/inspectionPackage'
 import useUserStore from '@/store/modules/user.js'
 // 迁移到 hiprint
 import { previewPrint } from '@/utils/printUtils.js'
@@ -806,7 +833,7 @@ const loadCategoryItems = async (categoryKey, loadMore = false) => {
       params.inspectionTypeId = category.typeId
     }
 
-    const res = await getInspectionItemList(params)
+    const res = await getLabActivityDefinitionPage(params)
 
     // 解析数据
     let records = []
@@ -822,22 +849,31 @@ const loadCategoryItems = async (categoryKey, loadMore = false) => {
       total = records.length
     }
 
-    // 映射数据格式
-    const mappedItems = records.map(item => ({
-      itemId: item.id || item.activityId || Math.random().toString(36).substring(2, 11),
-      itemName: item.name || item.itemName || '',
-      itemPrice: item.retailPrice || item.price || 0,
-      itemAmount: item.retailPrice || item.price || 0,
-      sampleType: item.specimenCode_dictText || item.sampleType || '血液',
-      unit: item.unit || '',
-      itemQty: 1,
-      serviceFee: 0,
-      type: category.label,
-      isSelfPay: false,
-      activityId: item.activityId,
-      code: item.busNo || item.code || item.activityCode,
-      inspectionTypeId: item.inspectionTypeId || null
-    }))
+    // 映射数据格式，计算套餐价格
+    const mappedItems = records.map(item => {
+      // 计算价格：套餐项目使用 packageAmount + serviceFee，否则使用 retailPrice
+      let itemPrice = item.retailPrice || 0
+      if (item.feePackageId && item.packageAmount) {
+        itemPrice = (Number(item.packageAmount) || 0) + (Number(item.serviceFee) || 0)
+      }
+
+      return {
+        itemId: item.id || Math.random().toString(36).substring(2, 11),
+        itemName: item.name || '',
+        itemPrice: itemPrice,
+        itemAmount: itemPrice,
+        sampleType: item.specimenCode_dictText || '血液',
+        unit: item.permittedUnitCode || '',
+        itemQty: 1,
+        serviceFee: item.serviceFee || 0,
+        type: category.label,
+        isSelfPay: false,
+        code: item.busNo || '',
+        inspectionTypeId: item.inspectionTypeId || null,
+        feePackageId: item.feePackageId || null,
+        packageName: item.packageName || null
+      }
+    })
 
     // 更新分类数据
     if (loadMore) {
@@ -936,21 +972,28 @@ const querySearchInspectionItems = async (queryString, cb) => {
       searchKey: queryString
     }
 
-    const res = await getInspectionItemList(params)
+    const res = await getLabActivityDefinitionPage(params)
 
     let suggestions = []
     if (res.data && res.data.records) {
       // 映射数据格式，与 loadInspectionItemsByType 保持一致
-      suggestions = res.data.records.map(item => ({
-        itemId: item.id || item.activityId,
-        itemName: item.name || item.itemName || '',
-        itemPrice: item.retailPrice || item.price || 0,
-        sampleType: item.specimenCode_dictText || item.sampleType || '血液',
-        unit: item.unit || '',
-        code: item.busNo || item.code || item.activityCode,
-        activityId: item.activityId,
-        inspectionTypeId: item.inspectionTypeId || null
-      }))
+      suggestions = res.data.records.map(item => {
+        // 计算价格
+        let itemPrice = item.retailPrice || 0
+        if (item.feePackageId && item.packageAmount) {
+          itemPrice = (Number(item.packageAmount) || 0) + (Number(item.serviceFee) || 0)
+        }
+        return {
+          itemId: item.id,
+          itemName: item.name || '',
+          itemPrice: itemPrice,
+          sampleType: item.specimenCode_dictText || '血液',
+          unit: item.permittedUnitCode || '',
+          code: item.busNo || '',
+          inspectionTypeId: item.inspectionTypeId || null,
+          feePackageId: item.feePackageId || null
+        }
+      })
     }
 
     cb(suggestions)
@@ -1384,6 +1427,25 @@ const removeInspectionItem = (item) => {
   }
 }
 
+// 切换套餐展开状态（Bug #325）
+const togglePackageExpand = async (item) => {
+  item.expanded = !item.expanded
+  if (item.expanded && !item.details && item.feePackageId) {
+    item.loadingDetails = true
+    try {
+      const res = await listInspectionPackageDetails(item.feePackageId)
+      if (res.code === 200 && res.data) {
+        item.details = res.data
+      }
+    } catch (error) {
+      console.error('获取套餐明细失败', error)
+      item.details = []
+    } finally {
+      item.loadingDetails = false
+    }
+  }
+}
+
 // 清空所有选择
 const clearAllSelected = () => {
   selectedInspectionItems.value = []
@@ -1647,19 +1709,30 @@ defineExpose({
   padding: 0;
 }
 
-/* 顶部操作按钮区 */
-.top-action-bar {
+/* 表格卡片标题行：标题在左，按钮在右 */
+.table-card-header-bar {
   display: flex;
   align-items: center;
-  justify-content: flex-end;
-  border-bottom: 1px solid var(--el-border-color-light);
-  background: var(--el-bg-color);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  justify-content: space-between;
+  width: 100%;
+}
+
+.table-card-header-bar .table-card-title {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.table-card-header-bar .table-card-btns {
+  display: flex;
+  gap: 8px;
 }
 
 .action-buttons {
   display: flex;
-  gap: 10px;
+  gap: 8px;
 }
 
 /* 新增按钮样式 - PRD要求蓝色背景 #4a89dc */
@@ -1686,9 +1759,9 @@ defineExpose({
   border-color: #58dfbd !important;
 }
 
-/* 检验信息表格区 - 紧凑高度 */
+/* Bug#334: 检验信息表格区 - 优化垂直空间利用率 */
 .inspection-section {
-  padding: 4px 10px 0 10px;
+  padding: 2px 10px 0 10px;
 }
 
 .table-card {
@@ -1696,7 +1769,7 @@ defineExpose({
 }
 
 .table-card :deep(.el-card__body) {
-  padding-bottom: 8px;
+  padding-bottom: 6px;
 }
 
 .card-header {
@@ -1707,9 +1780,9 @@ defineExpose({
   color: var(--el-text-color-primary);
 }
 
-/* 底部内容区域 */
+/* Bug#334: 底部内容区域 - 优化垂直空间利用率 */
 .bottom-content-area {
-  padding: 4px 10px;
+  padding: 2px 10px;
 }
 
 /* 表单区域 */
@@ -1732,7 +1805,7 @@ defineExpose({
 
 .application-form {
   overflow: visible;
-  padding: 6px 8px;
+  padding: 4px 8px;
   border: 1px solid #e4e7ed;
   border-radius: 4px;
   margin: 2px;
@@ -2244,6 +2317,24 @@ defineExpose({
   margin: 2px 0;
 }
 
+.selected-item-content.is-package {
+  cursor: pointer;
+}
+
+.selected-item-content.is-package:hover {
+  background: #f0f1f2;
+}
+
+.selected-item-content .expand-icon {
+  margin-right: 6px;
+  transition: transform 0.3s;
+  color: #909399;
+}
+
+.selected-item-content .expand-icon.is-expanded {
+  transform: rotate(90deg);
+}
+
 .selected-item-content .item-itemName {
   flex: 1;
   font-weight: 500;
@@ -2255,6 +2346,44 @@ defineExpose({
   margin-right: 10px;
 }
 
+/* 套餐明细样式 */
+.package-details {
+  margin-left: 24px;
+  padding: 4px 0 4px 12px;
+  border-left: 2px solid #e4e7ed;
+}
+
+.package-details .detail-item {
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  font-size: 13px;
+  color: #606266;
+}
+
+.package-details .detail-name {
+  flex: 1;
+}
+
+.package-details .detail-price {
+  color: #e6a23c;
+}
+
+.package-details .loading-details {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px;
+  color: #909399;
+  font-size: 13px;
+}
+
+.package-details .no-details {
+  padding: 8px;
+  color: #909399;
+  font-size: 13px;
+}
+
 .no-selection {
   text-align: center;
   padding: 40px 20px;
@@ -2335,10 +2464,6 @@ defineExpose({
     display: none;
   }
   
-  .top-action-bar {
-    padding: 0 10px;
-  }
-  
   .action-buttons {
     flex-direction: column;
     gap: 5px;

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

@@ -223,7 +223,12 @@
                       style="width: 70px; margin-right: 20px" />
                   </el-form-item>
                   <span class="medicine-info"> 诊断：{{ diagnosisName }} </span>
-                  <span class="medicine-info"> 皮试：{{ scope.row.skinTestFlag_enumText }} </span>
+                  <span class="medicine-info" style="display: flex; align-items: center; gap: 5px;">
+                    皮试：<el-checkbox v-model="scope.row.skinTestFlag" :true-value="1" :false-value="0"
+                      @change="handleSkinTestChange(scope.row, scope.$index)">
+                      是
+                    </el-checkbox>
+                  </span>
                   <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
                   <span class="total-amount">
                     总金额：{{
@@ -470,6 +475,12 @@
                       </template>
                     </el-select>
                   </el-form-item>
+                  <span class="medicine-info" style="display: flex; align-items: center; gap: 5px;">
+                    皮试：<el-checkbox v-model="scope.row.skinTestFlag" :true-value="1" :false-value="0"
+                      @change="handleSkinTestChange(scope.row, scope.$index)">
+                      是
+                    </el-checkbox>
+                  </span>
                   <span class="total-amount">
                     总金额：{{
                       (scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice)
@@ -761,7 +772,13 @@
       </el-table-column>
       <el-table-column label="皮试" align="center" prop="" width="80">
         <template #default="scope">
-          <span v-if="!scope.row.isEdit">
+          <template v-if="scope.row.isEdit">
+            <el-checkbox v-model="scope.row.skinTestFlag" :true-value="1" :false-value="0"
+              @change="handleSkinTestChange(scope.row, scope.$index)">
+              是
+            </el-checkbox>
+          </template>
+          <span v-else>
             {{ scope.row.skinTestFlag_enumText || '-' }}
           </span>
         </template>
@@ -1908,6 +1925,34 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
  * 选择药品回调
  */
 function selectAdviceBase(key, row) {
+  // 🔧 Bug Fix: 检查药品是否需要皮试，如果需要则弹出确认框
+  if (row.skinTestFlag == 1) {
+    ElMessageBox.confirm(`药品：${row.adviceName}需要做皮试，是否做皮试？`, '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      type: 'warning',
+      center: true,
+      customClass: 'skin-test-confirm-dialog',
+      beforeClose: (action, instance, done) => {
+        if (action === 'confirm') {
+          // 用户点击右边的按钮（confirm），保持皮试标记为1
+          setNewRow(key, row);
+          done();
+        } else if (action === 'cancel') {
+          // 用户点击左边的按钮（cancel），将皮试标记改为0
+          row.skinTestFlag = 0;
+          row.skinTestFlag_enumText = '否';
+          setNewRow(key, row);
+          done();
+        } else {
+          done();
+        }
+      }
+    });
+    return;
+  }
+  
+  // 检查检查检验项目是否有历史记录（30天内）
   if (row.categoryCode == 22 || row.categoryCode == 23) {
     checkServicesHistory({
       patientId: props.patientInfo.patientId,
@@ -1930,6 +1975,7 @@ function selectAdviceBase(key, row) {
   }
 
   async function setNewRow(key, row) {
+    console.log('[BugFix] setNewRow - row.adviceType:', row.adviceType, 'row.adviceType_dictText:', row.adviceType_dictText, 'row.adviceTableName:', row.adviceTableName);
     // 每次选择药品时，将当前行数据完全重置，清空所有旧数据
     const preservedData = {
       uniqueKey: prescriptionList.value[rowIndex.value].uniqueKey,
@@ -1942,26 +1988,28 @@ function selectAdviceBase(key, row) {
     prescriptionList.value[rowIndex.value] = preservedData;
 
     setValue(row);
-    
+
+    console.log('[BugFix] setNewRow after setValue - prescriptionList[rowIndex].adviceType:', prescriptionList.value[rowIndex.value].adviceType, 'adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
+
     // 🔧 Bug #220 修复：确保在setValue之后重新计算耗材类型的总金额
     // 耗材(adviceType=4)和诊疗(adviceType=3)需要重新计算以确保显示正确
     const currentRow = prescriptionList.value[rowIndex.value];
     if (currentRow && (currentRow.adviceType == 3 || currentRow.adviceType == 4)) {
       calculateTotalPrice(currentRow, rowIndex.value);
     }
-    
+
     // 确保在setValue之后再次设置showPopover为false，防止被覆盖
     prescriptionList.value[rowIndex.value].showPopover = false;
-    
+
     expandOrder.value = [key];
-    
+
     // 自动聚焦到单次用量字段 - 使用 async/await 多次尝试
     await nextTick();
-    
+
     // 第一次尝试 - 快速定位
     await sleep(300);
     focusDoseQuantityInput(row);
-    
+
   }
   
   // 聚焦到单次用量输入框的函数
@@ -3067,10 +3115,8 @@ function handleSaveBatch(prescriptionId) {
 
         // 🔧 Bug Fix: 处理accountId，如果是'ZIFEI'或0则转为null，让后端查询默认账户
         let itemAccountId = finalAccountId;
-        if (itemAccountId === 'ZIFEI' || itemAccountId === 0) {
+        if (itemAccountId === 'ZIFEI' || itemAccountId === 0 || itemAccountId === '0') {
           itemAccountId = null;
-        } else if (itemAccountId && !isNaN(Number(itemAccountId))) {
-          itemAccountId = Number(itemAccountId);
         }
 
         // 🔧 Bug Fix: 确保库存匹配成功的关键字段
@@ -3117,7 +3163,11 @@ function handleSaveBatch(prescriptionId) {
           accountId: itemAccountId,
           // 🔧 Bug Fix: 确保库存匹配成功
           adviceTableName: adviceTableNameVal,
-          locationId: locationIdVal
+          locationId: locationIdVal,
+          // 🔧 Bug Fix: 确保 minUnitQuantity、minUnitCode 等字段被传递（药品必填字段）
+          minUnitQuantity: item.minUnitQuantity,
+          minUnitCode: item.minUnitCode,
+          minUnitCode_dictText: item.minUnitCode_dictText
         };
       });
   // --- 【修改结束】 ---
@@ -3279,10 +3329,13 @@ function setValue(row) {
     : 0;
 
   // 创建一个新的对象，而不是合并旧数据，以避免残留数据问题
+  console.log('[BugFix] setValue - row.adviceType:', row.adviceType, 'row.adviceType_dictText:', row.adviceType_dictText, 'row.adviceTableName:', row.adviceTableName);
   prescriptionList.value[rowIndex.value] = {
     ...JSON.parse(JSON.stringify(row)),
     // 确保adviceType为数字类型，避免类型不匹配导致的显示问题
     adviceType: Number(row.adviceType),
+    // 🔧 Bug Fix: 确保adviceType_dictText被正确设置，避免展开行时显示错误
+    adviceType_dictText: row.adviceType_dictText || mapAdviceTypeLabel(row.adviceType, row.adviceTableName),
     skinTestFlag: skinTestFlag, // 确保皮试字段是数字类型
     skinTestFlag_enumText: skinTestFlag == 1 ? '是' : '否', // 更新显示文本
     // 保留原来设置的初始状态值
@@ -3291,6 +3344,7 @@ function setValue(row) {
     statusEnum: prescriptionList.value[rowIndex.value].statusEnum,
     showPopover: false, // 确保查询框关闭
   };
+  console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
   // 🔧 Bug #218 修复：保留组套中的值，不要强制设为undefined
   // 只有当值未定义时才使用默认值
   prescriptionList.value[rowIndex.value].orgId = row.positionId || row.orgId;
@@ -4511,6 +4565,36 @@ function handleOrderSetSaved() {
 defineExpose({ getListInfo, getDiagnosisInfo });
 </script>
 
+<style lang="scss">
+/* 皮试确认弹窗全局样式 - 反转按钮顺序，左边是是，右边是否 */
+.skin-test-confirm-dialog.el-message-box {
+  .el-message-box__btns {
+    display: flex !important;
+    flex-direction: row-reverse !important;
+    justify-content: center !important;
+    
+    .el-button {
+      margin-left: 10px !important;
+      margin-right: 10px !important;
+    }
+  }
+}
+
+/* 如果自定义类名不生效，使用更强的选择器 */
+.el-message-box.skin-test-confirm-dialog {
+  .el-message-box__btns {
+    display: flex !important;
+    flex-direction: row-reverse !important;
+    justify-content: center !important;
+    
+    .el-button {
+      margin-left: 10px !important;
+      margin-right: 10px !important;
+    }
+  }
+}
+</style>
+
 <style lang="scss" scoped>
 :deep(.el-table__expand-icon) {
   display: none !important;

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -733,10 +733,15 @@ function handleAdd() {
   // 自动填充患者信息
   form.value.patientId = props.patientInfo.patientId
   form.value.encounterId = props.patientInfo.encounterId
-  form.value.encounterNo = props.patientInfo.busNo
+  form.value.encounterNo = props.patientInfo.identifierNo
   form.value.patientName = props.patientInfo.patientName
   form.value.patientGender = props.patientInfo.genderEnum_enumText
-  form.value.patientAge = props.patientInfo.age
+  // el-input-number 只接受 number；age 可能是 "12" / "12岁"
+  const rawAge = props.patientInfo.age
+  const parsedAge = rawAge === null || rawAge === undefined
+    ? undefined
+    : Number.parseInt(String(rawAge).replace(/[^\d]/g, ''), 10)
+  form.value.patientAge = Number.isFinite(parsedAge) ? parsedAge : undefined
   form.value.applyDoctorName = userStore.nickName
   form.value.applyDeptName = userStore.orgName || props.patientInfo.deptName || ''
 

openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue

@@ -1411,7 +1411,7 @@ const loadObservationItems = async (resetPage = false) => {
           package: item.packageName || '',
           feePackageId: item.feePackageId ? String(item.feePackageId) : null,
           sampleType: item.specimenCode || '',
-          amount: parseFloat(item.retailPrice || 0),
+          amount: parseFloat(item.packageAmount || 0),
           sortOrder: item.sortOrder || null,
           serviceRange: item.serviceRange || '全部',
           subItemName: item.subItemName || '',
@@ -2067,7 +2067,6 @@ const saveItem = async (item) => {
 
     editingRowId.value = null;
   } catch (error) {
-    console.error('保存检验项目失败:', error);
     ElMessage.error('保存失败，请稍后重试');
   }
 };