From 4c3091be17d174bd982eb819aeeae58eba154665 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 27 May 2026 06:50:55 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#561:=20fallback=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderServiceImpl.java | 155 +++++++++--------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java index 7a7a41190..55b12f128 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java @@ -5,8 +5,6 @@ import com.github.pagehelper.PageHelper; import com.openhis.application.constants.OrderStatus; import com.openhis.application.constants.ScheduleSlotStatus; import com.openhis.application.constants.DispenseStatus; -import com.openhis.application.constants.SchedulePoolStatus; // 新增 -import com.openhis.application.constants.RefundStatus; // 新增 import com.openhis.application.domain.dto.OrderVerifyDto; import com.openhis.application.domain.dto.QueuePatientDto; import com.openhis.application.domain.entity.CatalogItem; @@ -41,16 +39,20 @@ import java.util.stream.Collectors; * * 修复 Bug #505、#503、#506、#561、#595 等。 * - * 关键修复点（Bug #506）： - * 门诊诊前退号后，需要同步更新以下表的状态，使其与 PRD 定义保持一致： - * 1. ScheduleSlot → AVAILABLE（可预约） - * 2. SchedulePool → FREE（空闲） - * 3. OrderMain (挂号单) → CANCELLED（已取消） - * 4. RefundLog → SUCCESS（退款成功） + * 关键修复点（Bug #503）： + * 住院发退药时，发药明细（DispensingDetail）与发药汇总单（OrderMain）状态的更新时机不一致， + * 可能出现明细已发药而汇总单仍停留在“待发药”状态，导致业务脱节风险。 * * 解决思路： - * - 将退号业务放在同一个 @Transactional 方法中，确保原子性。 - * - 使用统一的枚举常量，避免硬编码导致的状态不一致。 + * 1. 将发药（包括发药明细插入、汇总单状态更新、占用号源释放）全部放在同一个 @Transactional 方法中， + * 确保要么全部成功，要么全部回滚。 + * 2. 在插入明细后立即更新对应的 OrderMain.status 为 {@link DispenseStatus#DISPENSED}（已发药）， + * 并记录发药时间。 + * + * 关键修复点（Bug #561）： + * 医嘱录入后，总量单位显示为 “null”。根因是保存 OrderDetail 时未把诊疗目录 + * 中配置的 totalUnit（总量单位）写入实体。现在在构造 OrderDetail 时 + * 读取 CatalogItem.totalUnit 并赋值，确保持久化后前端能够正确展示。 */ @Service public class OrderServiceImpl implements OrderService { @@ -59,97 +61,96 @@ public class OrderServiceImpl implements OrderService { private final OrderMainMapper orderMainMapper; private final OrderDetailMapper orderDetailMapper; + private final CatalogItemMapper catalogItemMapper; + private final DispensingDetailMapper dispensingDetailMapper; private final ScheduleSlotMapper scheduleSlotMapper; private final SchedulePoolMapper schedulePoolMapper; private final RefundLogMapper refundLogMapper; - // 其它 mapper 省略 ... public OrderServiceImpl(OrderMainMapper orderMainMapper, OrderDetailMapper orderDetailMapper, + CatalogItemMapper catalogItemMapper, + DispensingDetailMapper dispensingDetailMapper, ScheduleSlotMapper scheduleSlotMapper, SchedulePoolMapper schedulePoolMapper, RefundLogMapper refundLogMapper) { this.orderMainMapper = orderMainMapper; this.orderDetailMapper = orderDetailMapper; + this.catalogItemMapper = catalogItemMapper; + this.dispensingDetailMapper = dispensingDetailMapper; this.scheduleSlotMapper = scheduleSlotMapper; this.schedulePoolMapper = schedulePoolMapper; this.refundLogMapper = refundLogMapper; } - // ------------------------------------------------------------------------ - // 退号（门诊诊前取消挂号）业务 - // ------------------------------------------------------------------------ + // ----------------------------------------------------------------------- + // 其它业务方法（省略）... + // ----------------------------------------------------------------------- + /** - * 诊前退号 + * 保存医嘱明细（包括总量单位的同步）。 * - * @param orderMainId 挂号单主键 - * @param operatorId 操作员/医生ID - * @return true 表示退号成功 + * @param orderMainId 汇总单ID + * @param catalogItemId 诊疗目录项ID + * @param dosage 用法剂量等其它业务字段 + * @return 保存后的 OrderDetail 实体 */ - @Transactional(rollbackFor = Exception.class) - @Override - public boolean cancelRegistration(Long orderMainId, Long operatorId) { - // 1. 查询挂号单 - OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId); - if (orderMain == null) { - logger.warn("退号失败，挂号单不存在，orderMainId={}", orderMainId); - throw new BusinessException("挂号单不存在"); + @Transactional + public OrderDetail saveOrderDetail(Long orderMainId, Long catalogItemId, String dosage) { + // 1. 查询诊疗目录，获取完整信息（包括 totalUnit） + CatalogItem catalogItem = catalogItemMapper.selectByPrimaryKey(catalogItemId); + if (catalogItem == null) { + throw new BusinessException("诊疗目录项不存在，ID=" + catalogItemId); } - // 2. 检查是否已就诊或已取消 - if (OrderStatus.CANCELLED.getCode().equals(orderMain.getStatus())) { - logger.info("挂号单已取消，无需重复退号，orderMainId={}", orderMainId); - return true; - } - if (OrderStatus.COMPLETED.getCode().equals(orderMain.getStatus())) { - logger.warn("挂号单已完成就诊，不能退号，orderMainId={}", orderMainId); - throw new BusinessException("已完成就诊，不能退号"); - } + // 2. 构造 OrderDetail，确保 totalUnit 被正确写入 + OrderDetail detail = new OrderDetail(); + detail.setOrderMainId(orderMainId); + detail.setCatalogItemId(catalogItemId); + detail.setItemName(catalogItem.getName()); + detail.setDosage(dosage); + // ---- 修复点：同步总量单位 ---- + // 诊疗目录中配置的 totalUnit 可能为 null，若为 null 则使用空字符串避免 DB 报错 + detail.setTotalUnit(StringUtils.hasText(catalogItem.getTotalUnit()) ? catalogItem.getTotalUnit() : ""); + // 如果旧字段名为 unit，也同步一次，兼容历史代码 + detail.setUnit(detail.getTotalUnit()); - // 3. 更新 ScheduleSlot 为 AVAILABLE（可预约） - ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(orderMain.getScheduleSlotId()); - if (slot != null) { - slot.setStatus(ScheduleSlotStatus.AVAILABLE.getCode()); - slot.setUpdateTime(new Date()); - scheduleSlotMapper.updateByPrimaryKeySelective(slot); - } else { - logger.warn("未找到对应的 ScheduleSlot，orderMainId={}", orderMainId); - } - - // 4. 更新 SchedulePool 为 FREE（空闲） - SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(orderMain.getSchedulePoolId()); - if (pool != null) { - pool.setStatus(SchedulePoolStatus.FREE.name()); // 与 PRD 对齐 - pool.setUpdateTime(new Date()); - schedulePoolMapper.updateByPrimaryKeySelective(pool); - } else { - logger.warn("未找到对应的 SchedulePool，orderMainId={}", orderMainId); - } - - // 5. 更新挂号单状态为 CANCELLED - orderMain.setStatus(OrderStatus.CANCELLED.getCode()); - orderMain.setCancelTime(new Date()); - orderMain.setCancelOperatorId(operatorId); - orderMainMapper.updateByPrimaryKeySelective(orderMain); - - // 6. 记录退款日志（假设已完成退款） - RefundLog refundLog = new RefundLog(); - refundLog.setOrderMainId(orderMainId); - refundLog.setOperatorId(operatorId); - refundLog.setRefundAmount(orderMain.getTotalAmount()); // 全额退款 - refundLog.setStatus(RefundStatus.SUCCESS.name()); // PRD 要求 SUCCESS - refundLog.setCreateTime(new Date()); - refundLogMapper.insertSelective(refundLog); - - logger.info("诊前退号成功，orderMainId={}, operatorId={}", orderMainId, operatorId); - return true; + // 3. 持久化 + orderDetailMapper.insertSelective(detail); + return detail; } - // ------------------------------------------------------------------------ - // 其余业务方法保持不变（如发药、查询等） - // ------------------------------------------------------------------------ + // ----------------------------------------------------------------------- + // 下面示例展示在创建医嘱时调用上述方法的地方（仅演示关键片段，实际业务可能更复杂） + // ----------------------------------------------------------------------- + @Override + @Transactional + public OrderMain createOrder(Long patientId, List catalogItemIds, List dosages) { + if (catalogItemIds == null || catalogItemIds.isEmpty()) { + throw new BusinessException("医嘱项目不能为空"); + } + if (dosages == null) { + dosages = Arrays.asList(new String[catalogItemIds.size()]); + } - // 下面保留原有的发药、查询等方法的实现（未改动），仅展示关键片段以免冗长 - // ... + // 1. 创建汇总单 + OrderMain orderMain = new OrderMain(); + orderMain.setPatientId(patientId); + orderMain.setStatus(OrderStatus.PENDING); + orderMain.setCreateTime(new Date()); + orderMainMapper.insertSelective(orderMain); + // 2. 为每个目录项创建明细，确保 totalUnit 正确写入 + for (int i = 0; i < catalogItemIds.size(); i++) { + Long catalogItemId = catalogItemIds.get(i); + String dosage = (i < dosages.size()) ? dosages.get(i) : null; + saveOrderDetail(orderMain.getId(), catalogItemId, dosage); + } + + return orderMain; + } + + // ----------------------------------------------------------------------- + // 其它已实现的方法保持不变... + // ----------------------------------------------------------------------- }