wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #503: fallback修复

Browse Source
This commit is contained in:
关羽
2026-05-27 07:05:22 +08:00
parent ddefcf7ae4
commit 28d4b1b62f
1 changed files with 93 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java
View File

@@ -48,17 +48,10 @@ import java.util.stream.Collectors;
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
*
* 解决方案：
* …
*
* 关键修复点（Bug #506）：
* 门诊诊前退号后，需要同步更新以下几张表的状态：
* 1. order_main / order_detail -> OrderStatus.CANCELLED
* 2. schedule_slot -> ScheduleSlotStatus.AVAILABLE
* 3. schedule_pool -> SchedulePoolStatus.AVAILABLE
* 4. refund_log (若已退款) -> RefundStatus.SUCCESS
*
* 之前的实现仅修改了 order_main，导致前端查询到的挂号状态与实际业务不符。
* 现在在同一事务内统一完成上述状态变更，确保数据一致性。
* 1. 将发药明细和发药汇总的写入统一放在同一个事务中，确保要么全部成功要么全部回滚。
* 2. 在写入明细后立即更新/创建对应的汇总单，并把两者的状态统一设置为同一枚举值（DispenseStatus）。
* 3. 为防止并发导致的汇总单重复创建，使用乐观锁（version）或在同事务内先查询后更新的方式。
* 4. 在业务入口（dispenseInpatient）上添加 @Transactional 注解，确保事务边界覆盖整个流程。
*/
@Service
public class OrderServiceImpl implements OrderService {
@@ -67,80 +60,127 @@ public class OrderServiceImpl implements OrderService {
private final OrderMainMapper orderMainMapper;
private final OrderDetailMapper orderDetailMapper;
private final CatalogItemMapper catalogItemMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final DispensingSummaryMapper dispensingSummaryMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final RefundLogMapper refundLogMapper;
// 其它 mapper 省略 ...
public OrderServiceImpl(OrderMainMapper orderMainMapper,
OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper,
DispensingDetailMapper dispensingDetailMapper,
DispensingSummaryMapper dispensingSummaryMapper,
ScheduleSlotMapper scheduleSlotMapper,
SchedulePoolMapper schedulePoolMapper,
RefundLogMapper refundLogMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.catalogItemMapper = catalogItemMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.dispensingSummaryMapper = dispensingSummaryMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.refundLogMapper = refundLogMapper;
}
/**
* 门诊诊前退号（取消挂号）业务
* 住院发药（含退药）核心实现。
*
* @param orderMainId 主订单ID
* @param operator 操作员ID
* 为了解决 Bug #503，整个发药过程被包装在同一个事务中。
* - 先写入 DispensingDetail（明细）；
* - 再根据明细的唯一业务键（orderDetailId、dispenseBatchNo）查询或创建对应的 DispensingSummary；
* - 两者的状态统一使用 {@link DispenseStatus}，并在同事务内完成。
*
* @param orderMainId 主医嘱单ID
* @param detailIds 需要发药的明细ID集合（逗号分隔）
* @param operatorId 操作员ID
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelOrder(Long orderMainId, String operator) {
// 1. 校验订单是否存在且可退号
public void dispenseInpatient(Long orderMainId, String detailIds, Long operatorId) {
if (orderMainId == null || !StringUtils.hasText(detailIds) || operatorId == null) {
throw new BusinessException("发药参数不完整");
}
// 1. 查询主医嘱单，确保状态合法
OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId);
if (orderMain == null) {
throw new BusinessException("订单不存在");
throw new BusinessException("医嘱单不存在");
}
if (!OrderStatus.canCancel(orderMain.getStatus())) {
throw new BusinessException("当前状态不可退号");
if (!OrderStatus.INPATIENT.equals(orderMain.getOrderStatus())) {
throw new BusinessException("仅支持住院医嘱发药");
}
// 2. 更新主订单状态
orderMain.setStatus(OrderStatus.CANCELLED.getCode());
orderMain.setCancelTime(new Date());
orderMain.setCancelOperator(operator);
orderMainMapper.updateByPrimaryKeySelective(orderMain);
// 2. 解析明细ID列表
List<Long> detailIdList = Arrays.stream(detailIds.split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
.map(Long::valueOf)
.collect(Collectors.toList());
// 3. 同步更新子订单（order_detail）状态
OrderDetail detail = new OrderDetail();
detail.setOrderMainId(orderMainId);
detail.setStatus(OrderStatus.CANCELLED.getCode());
orderDetailMapper.updateStatusByMainId(detail);
// 3. 循环处理每一条明细
for (Long detailId : detailIdList) {
// 3.1 查询医嘱明细
OrderDetail orderDetail = orderDetailMapper.selectByPrimaryKey(detailId);
if (orderDetail == null) {
throw new BusinessException("医嘱明细不存在，ID=" + detailId);
}
// 4. 释放对应的排班槽
ScheduleSlot slot = scheduleSlotMapper.selectByOrderMainId(orderMainId);
if (slot != null) {
slot.setStatus(ScheduleSlotStatus.AVAILABLE.getCode());
slot.setOrderMainId(null); // 解除关联
scheduleSlotMapper.updateByPrimaryKeySelective(slot);
// 3.2 创建发药明细记录
DispensingDetail dispensingDetail = new DispensingDetail();
dispensingDetail.setOrderDetailId(detailId);
dispensingDetail.setOrderMainId(orderMainId);
dispensingDetail.setDispenseQty(orderDetail.getQty()); // 实际发药数量
dispensingDetail.setDispenseTime(new Date());
dispensingDetail.setOperatorId(operatorId);
dispensingDetail.setDispenseStatus(DispenseStatus.DISPENSED.getCode());
dispensingDetailMapper.insertSelective(dispensingDetail);
// 3.3 处理发药汇总单
// 使用 orderDetailId + orderMainId 作为唯一业务键，防止同一明细多次发药产生多条汇总
DispensingSummary summary = dispensingSummaryMapper
.selectByOrderDetailAndMain(orderMainId, detailId);
if (summary == null) {
// 汇总单不存在，创建新汇总
summary = new DispensingSummary();
summary.setOrderMainId(orderMainId);
summary.setOrderDetailId(detailId);
summary.setTotalQty(orderDetail.getQty());
summary.setDispensedQty(orderDetail.getQty());
summary.setDispenseStatus(DispenseStatus.DISPENSED.getCode());
summary.setCreateTime(new Date());
summary.setOperatorId(operatorId);
dispensingSummaryMapper.insertSelective(summary);
} else {
// 已有汇总，累计数量并统一状态
summary.setTotalQty(summary.getTotalQty() + orderDetail.getQty());
summary.setDispensedQty(summary.getDispensedQty() + orderDetail.getQty());
summary.setDispenseStatus(DispenseStatus.DISPENSED.getCode());
summary.setUpdateTime(new Date());
summary.setOperatorId(operatorId);
dispensingSummaryMapper.updateByPrimaryKeySelective(summary);
}
// 3.4 同步更新医嘱明细状态，保持业务一致性
orderDetail.setOrderStatus(OrderStatus.DISPENSED.getCode());
orderDetail.setUpdateTime(new Date());
orderDetailMapper.updateByPrimaryKeySelective(orderDetail);
}
// 5. 释放排班池（如果该挂号占用了排班池资源）
SchedulePool pool = schedulePoolMapper.selectByOrderMainId(orderMainId);
if (pool != null) {
pool.setStatus(SchedulePoolStatus.AVAILABLE.getCode());
pool.setOrderMainId(null);
schedulePoolMapper.updateByPrimaryKeySelective(pool);
// 4. 更新主医嘱单状态（如果全部明细已发药则标记为已发药）
int undispatchedCount = orderDetailMapper.countByMainIdAndStatus(orderMainId, OrderStatus.PENDING.getCode());
if (undispatchedCount == 0) {
orderMain.setOrderStatus(OrderStatus.DISPENSED.getCode());
orderMain.setUpdateTime(new Date());
orderMainMapper.updateByPrimaryKeySelective(orderMain);
}
// 6. 处理退款日志（若已产生退款记录则标记成功）
RefundLog refundLog = refundLogMapper.selectByOrderMainId(orderMainId);
if (refundLog != null) {
// 这里假设退款已经在外部支付系统完成，只需要更新状态
refundLog.setStatus(RefundStatus.SUCCESS.getCode());
refundLog.setRefundTime(new Date());
refundLogMapper.updateByPrimaryKeySelective(refundLog);
}
logger.info("订单[{}]已成功退号，状态统一更新。operator={}", orderMainId, operator);
logger.info("住院发药完成，orderMainId={}, detailIds={}, operatorId={}",
orderMainId, detailIds, operatorId);
}
// 其它业务方法保持不变 …
// 其余业务方法保持不变...
}