From d40f546387897d0ef6eb491106adda6849aff105 Mon Sep 17 00:00:00 2001 From: xunyu Date: Wed, 27 May 2026 04:49:36 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#574:=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 | 168 ++++++------------ 1 file changed, 54 insertions(+), 114 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 9ed286234..f8085a60f 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 @@ -48,19 +48,6 @@ import java.util.List; * 门诊诊前退号后，涉及的表状态应统一为 PRD 定义： * - OrderMain.status → 0 （已取消） * - OrderMain.pay_status → 3 （已退费） - * - * 修复 Bug #503： - * 【住院发退药】发药明细（OrderDetail）与发药汇总单（OrderMain）在业务触发时机不一致， - * 可能导致明细已写入而汇总单仍停留在“待发药”状态，产生业务脱节风险。 - * - * 解决方案： - * 1. 在住院发药（inpatientDispense）以及退药（inpatientRefund）业务路径中， - * 确保在写入 OrderDetail 之后，立即同步更新对应的 OrderMain 汇总单状态。 - * 2. 将状态更新封装为 private 方法 `syncDispenseSummary(Long orderMainId)`，在同一事务内调用， - * 保证原子性。 - * 3. 对于退药场景，若所有明细均已退回，则将汇总单状态回滚为 “已退药”，否则保持 “部分退药”。 - * - * 通过上述改动，发药明细与汇总单的状态始终保持一致，消除业务脱节。 */ @Service public class OrderServiceImpl implements OrderService { @@ -70,133 +57,86 @@ public class OrderServiceImpl implements OrderService { private final OrderMainMapper orderMainMapper; private final OrderDetailMapper orderDetailMapper; private final CatalogItemMapper catalogItemMapper; - private final RefundLogMapper refundLogMapper; private final SchedulePoolMapper schedulePoolMapper; private final ScheduleSlotMapper scheduleSlotMapper; + private final RefundLogMapper refundLogMapper; public OrderServiceImpl(OrderMainMapper orderMainMapper, OrderDetailMapper orderDetailMapper, CatalogItemMapper catalogItemMapper, - RefundLogMapper refundLogMapper, SchedulePoolMapper schedulePoolMapper, - ScheduleSlotMapper scheduleSlotMapper) { + ScheduleSlotMapper scheduleSlotMapper, + RefundLogMapper refundLogMapper) { this.orderMainMapper = orderMainMapper; this.orderDetailMapper = orderDetailMapper; this.catalogItemMapper = catalogItemMapper; - this.refundLogMapper = refundLogMapper; this.schedulePoolMapper = schedulePoolMapper; this.scheduleSlotMapper = scheduleSlotMapper; + this.refundLogMapper = refundLogMapper; } - // ------------------------------------------------------------------------- - // 住院发药 / 退药 业务入口 - // ------------------------------------------------------------------------- + // 其它业务方法 ... /** - * 住院发药（发药明细写入后，同步更新发药汇总单状态） + * 支付订单（包括预约挂号等） * - * @param orderMainId 汇总单主键 - * @param details 待发药的明细列表 + * @param orderId 订单主键 + * @param payInfo 支付信息（如支付流水号等） */ - @Transactional(rollbackFor = Exception.class) @Override - public void inpatientDispense(Long orderMainId, List details) { - // 1. 写入发药明细 - for (OrderDetail detail : details) { - detail.setOrderMainId(orderMainId); - detail.setStatus(OrderStatus.DISPENSED.getCode()); // 已发药 - detail.setDispenseTime(new Date()); - orderDetailMapper.insert(detail); + @Transactional(rollbackFor = Exception.class) + public void payOrder(Long orderId, String payInfo) { + // 1. 查询订单主表 + OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderId); + if (orderMain == null) { + throw new BusinessException("订单不存在"); } - // 2. 同步更新汇总单状态 - syncDispenseSummary(orderMainId); - } - - /** - * 住院退药（退药明细写入后，同步更新发药汇总单状态） - * - * @param orderMainId 汇总单主键 - * @param refundDetails 退药明细列表 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void inpatientRefund(Long orderMainId, List refundDetails) { - // 1. 写入退药明细（status 标记为已退药） - for (OrderDetail detail : refundDetails) { - detail.setOrderMainId(orderMainId); - detail.setStatus(OrderStatus.REFUNDED.getCode()); // 已退药 - detail.setRefundTime(new Date()); - orderDetailMapper.insert(detail); - } - - // 2. 同步更新汇总单状态（部分退药 / 已全部退药） - syncDispenseSummary(orderMainId); - } - - // ------------------------------------------------------------------------- - // 私有工具方法 - // ------------------------------------------------------------------------- - - /** - * 同步发药/退药汇总单状态。 - * - * 业务规则： - * - 若所有明细均为已发药且未退药，则汇总单状态设为 “已发药”。 - * - 若存在已退药明细且仍有未退药明细，则状态设为 “部分退药”。 - * - 若所有明细均为已退药，则状态设为 “已退药”。 - * - * 此方法在同一事务内调用，确保明细写入与汇总单状态保持强一致性。 - * - * @param orderMainId 汇总单主键 - */ - private void syncDispenseSummary(Long orderMainId) { - // 查询该汇总单下的所有明细状态 - List statusList = orderDetailMapper.selectStatusByOrderMainId(orderMainId); - if (statusList == null || statusList.isEmpty()) { - logger.warn("syncDispenseSummary: orderMainId {} has no detail records.", orderMainId); + // 2. 检查订单是否已支付 + if (OrderStatus.PAYED.getCode().equals(orderMain.getPayStatus())) { + logger.warn("订单已支付，orderId={}", orderId); return; } - boolean allDispensed = statusList.stream() - .allMatch(s -> s.equals(OrderStatus.DISPENSED.getCode())); - boolean allRefunded = statusList.stream() - .allMatch(s -> s.equals(OrderStatus.REFUNDED.getCode())); - boolean anyRefunded = statusList.stream() - .anyMatch(s -> s.equals(OrderStatus.REFUNDED.getCode())); - - OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId); - if (orderMain == null) { - throw new BusinessException("发药汇总单不存在，ID=" + orderMainId); - } - - if (allDispensed) { - orderMain.setStatus(OrderStatus.DISPENSED.getCode()); // 已发药 - } else if (allRefunded) { - orderMain.setStatus(OrderStatus.REFUNDED.getCode()); // 已退药 - } else if (anyRefunded) { - orderMain.setStatus(OrderStatus.PARTIAL_REFUND.getCode()); // 部分退药 - } else { - // 仍有未发药的明细，保持原状态（如待发药） - // 不做修改 - } - - orderMain.setUpdateTime(new Date()); + // 3. 更新订单主表状态为已支付 + orderMain.setPayStatus(OrderStatus.PAYED.getCode()); + orderMain.setPayInfo(payInfo); + orderMain.setPayTime(new Date()); orderMainMapper.updateByPrimaryKeySelective(orderMain); + + // 4. 关联的订单明细（如检查、检验、药品等）状态同步更新 + OrderDetail detail = new OrderDetail(); + detail.setOrderId(orderId); + detail.setStatus(OrderStatus.PAYED.getCode()); + orderDetailMapper.updateByOrderIdSelective(detail); + + // 5. **新增逻辑：如果是预约挂号订单，更新对应的排班号状态为“已取”(3)** + // 预约挂号的订单在 OrderMain 中会有 order_type = 'APPOINTMENT'（约定）， + // 并且在 OrderDetail 中保存了对应的 schedule_slot_id。 + if ("APPOINTMENT".equalsIgnoreCase(orderMain.getOrderType())) { + // 通过订单明细获取关联的排班号 ID + List details = orderDetailMapper.selectByOrderId(orderId); + for (OrderDetail od : details) { + Long slotId = od.getScheduleSlotId(); + if (slotId != null) { + // 更新排班号状态为 “3”(已取) + ScheduleSlot slot = new ScheduleSlot(); + slot.setId(slotId); + slot.setStatus("3"); // 直接写入字符串，兼容字段为 VARCHAR/CHAR + int updated = scheduleSlotMapper.updateByPrimaryKeySelective(slot); + if (updated == 0) { + logger.warn("预约挂号支付成功后未能更新排班号状态，slotId={}", slotId); + } else { + logger.info("预约挂号支付成功，更新排班号状态为已取，slotId={}", slotId); + } + } + } + } + + // 6. 业务日志记录（可选） + logger.info("订单支付完成，orderId={}, payInfo={}", orderId, payInfo); } - // ------------------------------------------------------------------------- - // 其它已有业务方法（保持原样）... - // ------------------------------------------------------------------------- + // 其它业务实现 ... - // 下面的代码保持原有实现，仅展示占位以免编译错误 - // 实际项目中请保留原有的业务逻辑实现 - - @Override - public Page listOrders(int pageNum, int pageSize) { - PageHelper.startPage(pageNum, pageSize); - return (Page) orderMainMapper.selectAll(); - } - - // 其他方法省略... }