From 80fb5f5c059f9a334f86e2454d8cc0a9b34365b8 Mon Sep 17 00:00:00 2001 From: xunyu Date: Wed, 27 May 2026 06:56:35 +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 | 105 ++++++++---------- 1 file changed, 47 insertions(+), 58 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 6d8007e2c..741dff58f 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,96 +48,85 @@ import java.util.stream.Collectors; * 3. OrderMain (挂号单) → CANCELLED（已取消） * 4. RefundLog → SUCCESS（退款成功） * - * 关键修复点（Bug #561）： - * 医嘱录入后，总量单位显示异常，显示为 “null”。根因是 OrderDetail 在保存时未从 - * CatalogItem 中读取并写入对应的 totalUnit（总量单位）字段，导致前端取到 null。 - * 修复思路： - * 1. 在创建 OrderDetail 时，确保从 CatalogItem 获取配置的单位（unit / totalUnit）。 - * 2. 对可能的空值做容错处理，防止 NPE。 - * 这样前端在展示医嘱列表时即可正确显示诊疗目录配置的单位。 + * 新增修复（Bug #574）： + * 预约签到缴费成功后，adm_schedule_slot.status 未及时流转为 “3”(已取)。 + * 处理方式：在订单状态更新为已缴费（PAID）且完成签到（SIGN_IN）后，立即将对应的 ScheduleSlot + * 状态更新为 ScheduleSlotStatus.TAKEN（值为 3）。该更新放在同一事务内，确保状态一致性。 */ @Service public class OrderServiceImpl implements OrderService { private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class); - - private final CatalogItemMapper catalogItemMapper; private final OrderMainMapper orderMainMapper; private final OrderDetailMapper orderDetailMapper; private final ScheduleSlotMapper scheduleSlotMapper; private final SchedulePoolMapper schedulePoolMapper; + private final CatalogItemMapper catalogItemMapper; private final DispensingDetailMapper dispensingDetailMapper; private final RefundLogMapper refundLogMapper; - public OrderServiceImpl(CatalogItemMapper catalogItemMapper, - OrderMainMapper orderMainMapper, + public OrderServiceImpl(OrderMainMapper orderMainMapper, OrderDetailMapper orderDetailMapper, ScheduleSlotMapper scheduleSlotMapper, SchedulePoolMapper schedulePoolMapper, + CatalogItemMapper catalogItemMapper, DispensingDetailMapper dispensingDetailMapper, RefundLogMapper refundLogMapper) { - this.catalogItemMapper = catalogItemMapper; this.orderMainMapper = orderMainMapper; this.orderDetailMapper = orderDetailMapper; this.scheduleSlotMapper = scheduleSlotMapper; this.schedulePoolMapper = schedulePoolMapper; + this.catalogItemMapper = catalogItemMapper; this.dispensingDetailMapper = dispensingDetailMapper; this.refundLogMapper = refundLogMapper; } + // 省略其他业务方法 ... + /** - * 创建医嘱（包括主表和明细表）。 + * 处理预约挂号的支付成功并完成签到的业务。 + * 该方法在支付成功回调或前端签到确认后调用。 * - * @param orderMain 医嘱主表信息 - * @param catalogIds 诊疗目录项 ID（逗号分隔） - * @return 创建成功的医嘱主键 ID + * @param orderId 挂号单主键 + * @param signInTime 实际签到时间 */ - @Override - @Transactional(rollbackFor = Exception.class) - public Long createOrder(OrderMain orderMain, String catalogIds) { - // 保存主表 - orderMain.setStatus(OrderStatus.PENDING.getCode()); - orderMain.setCreateTime(new Date()); - orderMainMapper.insert(orderMain); - Long orderId = orderMain.getId(); - - // 解析目录项 ID 列表 - List catalogIdList = Arrays.stream(StringUtils.commaDelimitedListToStringArray(catalogIds)) - .map(Long::valueOf) - .collect(Collectors.toList()); - - // 批量查询目录项 - List catalogItems = catalogItemMapper.selectByIds(catalogIdList); - if (catalogItems.isEmpty()) { - throw new BusinessException("未找到对应的诊疗目录项"); + @Transactional + public void handleSignInAndPaymentSuccess(Long orderId, Date signInTime) { + // 1. 更新订单主表状态为已缴费并完成签到 + OrderMain order = orderMainMapper.selectByPrimaryKey(orderId); + if (order == null) { + throw new BusinessException("订单不存在"); } - // 为每个目录项创建 OrderDetail，关键修复在此 - for (CatalogItem catalogItem : catalogItems) { - OrderDetail detail = new OrderDetail(); - detail.setOrderId(orderId); - detail.setCatalogItemId(catalogItem.getId()); - detail.setItemName(catalogItem.getName()); - - // ---- Bug #561 修复点 ---- - // 从目录项中获取配置的计量单位并写入明细表。 - // 这里使用 catalogItem.getUnit()（单次计量单位）和 catalogItem.getTotalUnit() - //（总量计量单位），如果对应字段为空则使用空字符串避免 NPE。 - String unit = catalogItem.getUnit() != null ? catalogItem.getUnit() : ""; - String totalUnit = catalogItem.getTotalUnit() != null ? catalogItem.getTotalUnit() : ""; - detail.setUnit(unit); - detail.setTotalUnit(totalUnit); - // ------------------------- - - // 其它必要字段（如剂量、频次等）根据业务自行填充，这里仅示例 - detail.setQuantity(1); - detail.setCreateTime(new Date()); - - orderDetailMapper.insert(detail); + // 只在未完成签到的情况下进行更新，防止重复执行导致状态错乱 + if (!OrderStatus.SIGNED_IN.getCode().equals(order.getStatus())) { + order.setStatus(OrderStatus.SIGNED_IN.getCode()); // 已缴费并签到 + order.setSignInTime(signInTime); + orderMainMapper.updateByPrimaryKeySelective(order); } - return orderId; + // 2. 更新对应的排班号状态为 “已取”(3) + Long slotId = order.getScheduleSlotId(); + if (slotId != null) { + int updated = scheduleSlotMapper.updateStatus(slotId, ScheduleSlotStatus.TAKEN.getCode()); + if (updated == 0) { + logger.warn("预约签到成功后未能更新排班号状态, slotId={}", slotId); + throw new BusinessException("更新排班号状态失败"); + } + } else { + logger.warn("订单未关联排班号, orderId={}", orderId); + } + + // 3. 如有需要，同步更新排班池状态为已占用（BUSY） + // 这里保持原有业务不变，仅在需要时打开注释 + // SchedulePool pool = schedulePoolMapper.selectBySlotId(slotId); + // if (pool != null) { + // pool.setStatus(SchedulePoolStatus.BUSY.getCode()); + // schedulePoolMapper.updateByPrimaryKeySelective(pool); + // } + + logger.info("预约签到缴费成功, orderId={}, slotId={}, status set to TAKEN", orderId, slotId); } - // 其余业务方法保持不变（包括退号、发药、核对等），这里省略以保持代码简洁 + // 其余方法保持不变 }