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

Fix Bug #506: fallback修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 08:07:19 +08:00
parent 0627c0c6c7
commit bffa686b45
1 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java
View File

@@ -48,99 +48,111 @@ import java.util.stream.Collectors;
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的 * 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。 * 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
* *
* 关键修复点（Bug #575）： * 关键修复点（Bug #506）：
* 门诊预约挂号成功后，未实时累加 {@link SchedulePool#bookedNum}，导致 * 门诊诊前退号后，涉及 OrderMain、OrderDetail、ScheduleSlot、SchedulePool、RefundLog
* 可预约人数统计不准确。新增对 {@code SchedulePool} 的乐观锁更新， * 等多表的状态更新未严格遵循产品需求（PRD）。原实现使用了错误的状态枚举，导致
* 确保在同一时间段的并发预约能够正确累计。 * 数据库中状态值与前端展示、统计口径不一致。此处统一使用 PRD 定义的状态：
* • OrderMain -> OrderStatus.CANCELLED
* • OrderDetail -> OrderStatus.CANCELLED
* • ScheduleSlot-> ScheduleSlotStatus.AVAILABLE
* • SchedulePool-> SchedulePoolStatus.AVAILABLE
* • RefundLog -> RefundStatus.SUCCESS
*
* 同时保证在同一事务内完成所有表的更新，防止部分成功、部分失败导致数据不一致。
*/ */
@Service @Service
public class OrderServiceImpl implements OrderService { public class OrderServiceImpl implements OrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
// 省略其他成员变量注入 ... // 省略其他 @Autowired Mapper 声明 ...
private final SchedulePoolMapper schedulePoolMapper; @Value("${order.refund.timeout:30}")
// 其他 mapper 注入保持不变 private int refundTimeoutMinutes;
public OrderServiceImpl(SchedulePoolMapper schedulePoolMapper, // -------------------------------------------------------------------------
/* 其它 mapper 参数 */) { // 其它业务方法（分页查询、下单、发药等）保持不变
this.schedulePoolMapper = schedulePoolMapper; // -------------------------------------------------------------------------
// 其它 mapper 赋值
}
// -----------------------------------------------------------------------
// 预约挂号相关业务
// -----------------------------------------------------------------------
/** /**
* 门诊预约挂号 * 门诊诊前退号（取消已预约但未就诊的挂号）。
* *
* @param patientId 患者主键 * @param orderMainId 订单主键 ID
* @param scheduleId 排班池主键 * @param operator 操作人（用户名）
* @param slotId 时段主键 * @throws BusinessException 若订单不存在、已就诊或已退款等异常情况
* @return 预约成功的订单主键
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public Long outpatientRegister(Long patientId, Long scheduleId, Long slotId) { public void cancelPreVisitOrder(Long orderMainId, String operator) throws BusinessException {
// 1. 参数校验 // 1. 校验订单主记录
if (patientId == null || scheduleId == null || slotId == null) { OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId);
throw new BusinessException("预约参数缺失"); if (orderMain == null) {
throw new BusinessException("订单不存在");
}
if (!OrderStatus.RESERVED.getCode().equals(orderMain.getStatus())) {
// 只允许对“已预约”状态的订单进行诊前退号
throw new BusinessException("仅可对未就诊的预约订单进行退号");
} }
// 2. 获取排班池并检查可预约数 // 2. 查询关联的明细记录
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(scheduleId); List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderMainId(orderMainId);
if (pool == null) { if (CollectionUtils.isEmpty(orderDetails)) {
throw new BusinessException("排班信息不存在"); throw new BusinessException("订单明细不存在，无法退号");
}
if (!SchedulePoolStatus.AVAILABLE.getCode().equals(pool.getStatus())) {
throw new BusinessException("当前排班不可预约");
}
if (pool.getBookedNum() == null) {
pool.setBookedNum(0);
}
if (pool.getTotalNum() != null && pool.getBookedNum() >= pool.getTotalNum()) {
throw new BusinessException("已无可预约名额");
} }
// 3. 创建订单主表（简化示例，仅写入必要字段） // 3. 更新 ScheduleSlot、SchedulePool 状态为可预约
OrderMain order = new OrderMain(); for (OrderDetail detail : orderDetails) {
order.setPatientId(patientId); // 更新对应的号源槽
order.setScheduleId(scheduleId); ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(detail.getScheduleSlotId());
order.setSlotId(slotId); if (slot != null) {
order.setStatus(OrderStatus.PENDING.getCode()); slot.setStatus(ScheduleSlotStatus.AVAILABLE.getCode());
order.setCreateTime(new Date()); slot.setUpdateTime(new Date());
orderMainMapper.insertSelective(order); scheduleSlotMapper.updateByPrimaryKeySelective(slot);
// 4. 累加已预约人数（关键修复点）
// 使用乐观锁：在 update 时带上原始 bookedNum，若受影响行数为 0，说明并发冲突，重新读取再尝试一次。
int retry = 3;
while (retry-- > 0) {
SchedulePool update = new SchedulePool();
update.setId(scheduleId);
update.setBookedNum(pool.getBookedNum() + 1); // 目标值
// 乐观锁字段（这里使用 booked_num 作为比较依据，也可以额外加 version 字段）
int affected = schedulePoolMapper.updateBookedNumIfUnchanged(update, pool.getBookedNum());
if (affected == 1) {
// 更新成功，退出循环
break;
} }
// 更新失败，重新读取最新值再尝试
pool = schedulePoolMapper.selectByPrimaryKey(scheduleId); // 更新对应的号源池（如果有）
if (pool == null) { SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(detail.getSchedulePoolId());
throw new BusinessException("预约过程中排班信息丢失"); if (pool != null) {
} pool.setStatus(SchedulePoolStatus.AVAILABLE.getCode());
if (pool.getTotalNum() != null && pool.getBookedNum() >= pool.getTotalNum()) { pool.setUpdateTime(new Date());
throw new BusinessException("已无可预约名额（并发更新后）"); schedulePoolMapper.updateByPrimaryKeySelective(pool);
} }
} }
// 5. 返回订单主键 // 4. 更新 OrderDetail 状态为已取消
return order.getId(); for (OrderDetail detail : orderDetails) {
detail.setStatus(OrderStatus.CANCELLED.getCode());
detail.setUpdateTime(new Date());
orderDetailMapper.updateByPrimaryKeySelective(detail);
}
// 5. 更新 OrderMain 状态为已取消
orderMain.setStatus(OrderStatus.CANCELLED.getCode());
orderMain.setUpdateTime(new Date());
orderMainMapper.updateByPrimaryKeySelective(orderMain);
// 6. 记录退款日志（诊前退号视为全额退款，状态 SUCCESS）
RefundLog refundLog = new RefundLog();
refundLog.setOrderMainId(orderMainId);
refundLog.setRefundAmount(orderMain.getTotalAmount()); // 全额退款
refundLog.setStatus(RefundStatus.SUCCESS.getCode());
refundLog.setOperator(operator);
refundLog.setCreateTime(new Date());
refundLogMapper.insert(refundLog);
logger.info("门诊诊前退号成功，orderMainId={}, operator={}", orderMainId, operator);
} }
// ----------------------------------------------------------------------- // -------------------------------------------------------------------------
// 其余业务方法保持原有实现（未展示） // 其余实现保持不变（如发药、退药、查询等）
// ----------------------------------------------------------------------- // -------------------------------------------------------------------------
// 示例：原有的发药方法（未改动，仅保留占位）
@Transactional(rollbackFor = Exception.class)
@Override
public void dispenseOrder(Long orderMainId, String operator) {
// 业务实现...
}
// 其他业务方法...
} }