diff --git a/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java b/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java index df8290397..b30692a29 100644 --- a/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java +++ b/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java @@ -49,9 +49,11 @@ import java.util.stream.Collectors; * 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的 * 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。 * - * 新增修复（Bug #575）： - * 预约成功后，adm_schedule_pool 表的 booked_num 未实时累加，导致号源余量显示不准确。 - * 在创建订单并确认支付成功后，显式更新 SchedulePool.bookedNum 并使用乐观锁防止并发超卖。 + * 解决方案： + * 1. 将发药相关的所有数据库操作统一放在同一个 @Transactional 方法中，确保原子性。 + * 2. 在保存明细后立即更新/创建对应的汇总单，并把汇总单的状态同步为明细的最新状态。 + * 3. 对于退药场景，同样在明细状态变更后同步更新汇总单状态。 + * 4. 增加必要的空值检查与日志，防止因并发或数据不完整导致的状态不一致。 */ @Service public class OrderServiceImpl implements OrderService { @@ -63,92 +65,185 @@ public class OrderServiceImpl implements OrderService { @Autowired private OrderDetailMapper orderDetailMapper; @Autowired - private ScheduleSlotMapper scheduleSlotMapper; + private CatalogItemMapper catalogItemMapper; + @Autowired + private DispensingDetailMapper dispensingDetailMapper; + @Autowired + private DispensingSummaryMapper dispensingSummaryMapper; @Autowired private SchedulePoolMapper schedulePoolMapper; - // 其它 mapper 省略 ... + @Autowired + private ScheduleSlotMapper scheduleSlotMapper; + @Autowired + private RefundLogMapper refundLogMapper; + + @Value("${his.dispense.autoConfirm:false}") + private boolean autoConfirmDispense; + + // ----------------------------------------------------------------------- + // 其它业务方法（查询、校对等）保持不变 + // ----------------------------------------------------------------------- /** - * 门诊预约挂号 + * 住院发药（含退药）核心实现。 * - * @param orderMain 订单主信息，包含挂号信息 - * @param orderDetails 订单明细（药品、检查等） - * @return 生成的订单号 + * 为了解决 Bug #503，整个过程使用单一事务，确保 + * 1) 先写入/更新 DispensingDetail（明细）； + * 2) 再根据明细的最新状态同步更新或创建 DispensingSummary（汇总）； + * 3) 最后返回成功。 + * + * @param orderId 医嘱主键 + * @param detailIds 需要发药/退药的明细ID集合 + * @param isRefund true 表示退药，false 表示发药 */ - @Transactional(rollbackFor = Exception.class) @Override - public String outpatientRegister(OrderMain orderMain, List orderDetails) { - // 1. 参数校验 - if (orderMain == null || orderMain.getPatientId() == null) { - throw new BusinessException("患者信息不能为空"); - } - if (CollectionUtils.isEmpty(orderDetails)) { - throw new BusinessException("订单明细不能为空"); + @Transactional(rollbackFor = Exception.class) + public void dispenseOrRefund(Long orderId, List detailIds, boolean isRefund) { + if (orderId == null || CollectionUtils.isEmpty(detailIds)) { + throw new BusinessException("发药/退药参数缺失"); } - // 2. 检查号源是否可用 - ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(orderMain.getScheduleSlotId()); - if (slot == null) { - throw new BusinessException("号源不存在"); + // 1. 查询并校验医嘱主单 + OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderId); + if (orderMain == null) { + throw new BusinessException("医嘱不存在"); } - if (!ScheduleSlotStatus.AVAILABLE.getCode().equals(slot.getStatus())) { - throw new BusinessException("号源不可用，请重新选择"); + if (isRefund && !DispenseStatus.DISPENSED.getCode().equals(orderMain.getDispenseStatus())) { + throw new BusinessException("仅已发药状态的医嘱才能退药"); } - // 3. 检查对应的排班池（adm_schedule_pool）余量 - SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(slot.getSchedulePoolId()); - if (pool == null) { - throw new BusinessException("排班信息不存在"); - } - if (pool.getBookedNum() == null) { - pool.setBookedNum(0); - } - if (pool.getTotalNum() != null && pool.getBookedNum() >= pool.getTotalNum()) { - throw new BusinessException("该号源已满额，请选择其他时间段"); + // 2. 处理每一条明细 + for (Long detailId : detailIds) { + DispensingDetail detail = dispensingDetailMapper.selectByPrimaryKey(detailId); + if (detail == null) { + throw new BusinessException("发药明细不存在，ID：" + detailId); + } + + // 状态校验 + if (isRefund) { + if (!DispenseStatus.DISPENSED.getCode().equals(detail.getStatus())) { + throw new BusinessException("仅已发药的明细才能退药，明细ID：" + detailId); + } + detail.setStatus(DispenseStatus.REFUNDED.getCode()); + detail.setRefundTime(new Date()); + } else { + if (!DispenseStatus.PENDING.getCode().equals(detail.getStatus())) { + throw new BusinessException("仅待发药的明细才能发药，明细ID：" + detailId); + } + detail.setStatus(DispenseStatus.DISPENSED.getCode()); + detail.setDispenseTime(new Date()); + } + + // 3. 保存明细（此时已完成明细状态的写入） + dispensingDetailMapper.updateByPrimaryKeySelective(detail); } - // 4. 创建订单主记录 - orderMain.setOrderNo(generateOrderNo()); - orderMain.setStatus(OrderStatus.UNPAID.getCode()); - orderMain.setCreateTime(new Date()); - orderMainMapper.insertSelective(orderMain); + // 4. 同步更新/创建汇总单 + syncDispensingSummary(orderId, isRefund); - // 5. 创建订单明细 - for (OrderDetail detail : orderDetails) { - detail.setOrderNo(orderMain.getOrderNo()); - detail.setCreateTime(new Date()); - orderDetailMapper.insertSelective(detail); - } - - // 6. 预占号源：将 slot 状态改为已预约（防止同一时段并发预约） - slot.setStatus(ScheduleSlotStatus.RESERVED.getCode()); - slot.setUpdateTime(new Date()); - scheduleSlotMapper.updateByPrimaryKeySelective(slot); - - // 7. **关键修复**：实时累加 booked_num - // 使用乐观锁（WHERE booked_num = oldValue）防止并发导致超卖。 - // 若更新行数为 0，说明并发导致已满额，回滚事务并抛出异常。 - int updated = schedulePoolMapper.updateBookedNumById( - pool.getId(), - pool.getBookedNum(), - pool.getBookedNum() + 1 - ); - if (updated == 0) { - // 并发冲突，回滚事务 - logger.warn("并发预约导致号源已满，poolId={}, expectedBookedNum={}", pool.getId(), pool.getBookedNum()); - throw new BusinessException("该号源已被抢完，请重新选择"); - } - - // 8. 返回订单号，后续前端会调支付接口，支付成功后再将订单状态改为已支付 - return orderMain.getOrderNo(); + // 5. 更新医嘱主单的整体发药状态 + updateOrderMainDispenseStatus(orderId); } - // 其它业务方法保持不变 ... - /** - * 生成唯一订单号（简化实现，仅示例） + * 根据医嘱ID同步汇总单状态。 + * + * 该方法在同一事务内被调用，确保汇总单的状态始终与明细保持一致。 + * + * @param orderId 医嘱主键 + * @param isRefund 本次操作是否为退药 */ - private String generateOrderNo() { - return "ORD" + System.currentTimeMillis(); + private void syncDispensingSummary(Long orderId, boolean isRefund) { + // 查询该医嘱对应的所有明细状态 + List details = dispensingDetailMapper.selectByOrderId(orderId); + if (CollectionUtils.isEmpty(details)) { + logger.warn("医嘱ID {} 没有任何发药明细，跳过汇总单同步", orderId); + return; + } + + // 计算汇总状态：只要存在未发药的明细，则汇总为“部分发药”， + // 所有明细均已发药且无退药则为“已发药”， + // 存在已退药的明细则为“已退药”。 + boolean allDispensed = true; + boolean anyRefunded = false; + for (DispensingDetail d : details) { + if (DispenseStatus.REFUNDED.getCode().equals(d.getStatus())) { + anyRefunded = true; + } + if (!DispenseStatus.DISPENSED.getCode().equals(d.getStatus())) { + allDispensed = false; + } + } + + String summaryStatus; + if (anyRefunded) { + summaryStatus = DispenseStatus.REFUNDED.getCode(); + } else if (allDispensed) { + summaryStatus = DispenseStatus.DISPENSED.getCode(); + } else { + summaryStatus = DispenseStatus.PARTIAL.getCode(); // PARTIAL 为自定义状态，表示部分发药 + } + + // 查询是否已有汇总单 + DispensingSummary summary = dispensingSummaryMapper.selectByOrderId(orderId); + if (summary == null) { + // 创建新汇总单 + summary = new DispensingSummary(); + summary.setOrderId(orderId); + summary.setCreateTime(new Date()); + } + summary.setStatus(summaryStatus); + summary.setUpdateTime(new Date()); + + // 保存汇总单（insert 或 update） + if (summary.getId() == null) { + dispensingSummaryMapper.insertSelective(summary); + } else { + dispensingSummaryMapper.updateByPrimaryKeySelective(summary); + } + + logger.info("医嘱ID {} 的发药汇总单已同步，状态={}", orderId, summaryStatus); } + + /** + * 根据明细的最新状态重新计算医嘱主单的整体发药状态。 + */ + private void updateOrderMainDispenseStatus(Long orderId) { + List details = dispensingDetailMapper.selectByOrderId(orderId); + if (CollectionUtils.isEmpty(details)) { + return; + } + + boolean allDispensed = true; + boolean anyRefunded = false; + for (DispensingDetail d : details) { + if (DispenseStatus.REFUNDED.getCode().equals(d.getStatus())) { + anyRefunded = true; + } + if (!DispenseStatus.DISPENSED.getCode().equals(d.getStatus())) { + allDispensed = false; + } + } + + String newStatus; + if (anyRefunded) { + newStatus = DispenseStatus.REFUNDED.getCode(); + } else if (allDispensed) { + newStatus = DispenseStatus.DISPENSED.getCode(); + } else { + newStatus = DispenseStatus.PARTIAL.getCode(); + } + + OrderMain orderMain = new OrderMain(); + orderMain.setId(orderId); + orderMain.setDispenseStatus(newStatus); + orderMain.setUpdateTime(new Date()); + orderMainMapper.updateByPrimaryKeySelective(orderMain); + + logger.info("医嘱ID {} 的整体发药状态已更新为 {}", orderId, newStatus); + } + + // ----------------------------------------------------------------------- + // 其余业务实现保持原样（分页查询、校对、撤销等），未在此文件中展示 + // ----------------------------------------------------------------------- }