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

Fix Bug #506: fallback修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 08:17:52 +08:00
parent 72c381258f
commit f366986bb6
1 changed files with 105 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,94 +49,134 @@ import java.util.stream.Collectors;
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
*
* 解决思路：
* 1. 将“生成汇总单 → 生成明细 → 更新状态”整个过程放在同一个事务中，确保原子性。
* 2. 在生成汇总单后立即返回其主键 ID，供后续明细使用，避免因先插入明细再插入汇总导致的外键不一致。
* 3. 在插入明细后统一更新汇总单的状态（如已发药、已退药），而不是在明细插入后各自去修改汇总单。
* 4. 为防止并发导致的状态漂移，使用乐观锁（version）或在更新时加上状态校验，这里采用“状态 + ID”双重条件更新。
* 关键修复点（Bug #506）：
* 门诊诊前退号后，涉及 OrderMain、OrderDetail、ScheduleSlot、SchedulePool、RefundLog
* 等多表的状态更新未统一使用 PRD 定义的枚举值，导致前端展示与业务规则不一致。
* 现在统一使用以下枚举：
* - OrderMain.status -> OrderStatus.CANCELLED
* - OrderDetail.status -> OrderStatus.CANCELLED
* - ScheduleSlot.status -> ScheduleSlotStatus.AVAILABLE
* - SchedulePool.status -> SchedulePoolStatus.AVAILABLE
* - RefundLog.refundStatus -> RefundStatus.SUCCESS
*
* 以上改动保证了发药明细与发药汇总单在同一事务内完成，状态始终保持同步，从而消除业务脱节风险。
* 同时保证所有状态更新在同一事务内完成，防止部分成功、部分失败的脏数据。
*/
@Service
public class OrderServiceImpl implements OrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
// 省略其它成员变量注入 ...
// 省略其它 @Autowired/Mapper 注入 ...
@Autowired
private OrderMainMapper orderMainMapper;
@Autowired
private OrderDetailMapper orderDetailMapper;
@Autowired
private ScheduleSlotMapper scheduleSlotMapper;
@Autowired
private SchedulePoolMapper schedulePoolMapper;
@Autowired
private RefundLogMapper refundLogMapper;
// -------------------------------------------------------------------------
// 退号（门诊诊前）业务
// -------------------------------------------------------------------------
/**
* 住院发药（包括发药和退药）核心实现。
* 诊前退号
*
* @param orderId 医嘱主键
* @param isRefund 是否退药，true 表示退药
* @param orderMainId 主订单ID
* @param operator 操作人姓名
* @return true if success
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void dispenseInpatient(Long orderId, boolean isRefund) {
// 1. 获取医嘱主表及明细
OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderId);
@Override
public boolean cancelOrderPreVisit(Long orderMainId, String operator) {
// 1. 校验主订单是否存在且可退
OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId);
if (orderMain == null) {
throw new BusinessException("医嘱不存在");
throw new BusinessException("订单不存在");
}
if (!OrderStatus.NEW.name().equals(orderMain.getStatus())) {
// 只有新建（未支付/未挂号）状态才允许诊前退号
throw new BusinessException("仅未挂号状态的订单可进行诊前退号");
}
List<OrderDetail> details = orderDetailMapper.selectByOrderId(orderId);
if (CollectionUtils.isEmpty(details)) {
throw new BusinessException("医嘱明细为空");
// 2. 更新主订单状态
orderMain.setStatus(OrderStatus.CANCELLED.name());
orderMain.setCancelTime(new Date());
orderMain.setCancelOperator(operator);
orderMainMapper.updateByPrimaryKeySelective(orderMain);
// 3. 更新子订单（OrderDetail）状态
List<OrderDetail> details = orderDetailMapper.selectByOrderMainId(orderMainId);
if (!CollectionUtils.isEmpty(details)) {
for (OrderDetail detail : details) {
detail.setStatus(OrderStatus.CANCELLED.name());
detail.setCancelTime(new Date());
detail.setCancelOperator(operator);
orderDetailMapper.updateByPrimaryKeySelective(detail);
}
}
// 2. 生成发药汇总单（一次性生成，确保先有汇总单再有明细）
DispensingSummary summary = new DispensingSummary();
summary.setOrderId(orderId);
summary.setPatientId(orderMain.getPatientId());
summary.setDispenseTime(new Date());
summary.setStatus(isRefund ? DispenseStatus.REFUND_PENDING.getCode()
: DispenseStatus.DISPENSE_PENDING.getCode());
// 这里使用 insertSelective 并获取自增主键
dispensingSummaryMapper.insertSelective(summary);
Long summaryId = summary.getId(); // 关键：获取刚插入的汇总单 ID
// 3. 生成发药明细并关联到汇总单
// 4. 释放对应的号源（ScheduleSlot & SchedulePool）
// 这里假设每个 OrderDetail 对应唯一的 scheduleSlotId
for (OrderDetail detail : details) {
DispensingDetail detailRecord = new DispensingDetail();
detailRecord.setSummaryId(summaryId);
detailRecord.setOrderDetailId(detail.getId());
detailRecord.setDrugId(detail.getDrugId());
detailRecord.setDosage(detail.getDosage());
detailRecord.setUnit(detail.getUnit());
detailRecord.setStatus(isRefund ? DispenseStatus.REFUND_PENDING.getCode()
: DispenseStatus.DISPENSE_PENDING.getCode());
dispensingDetailMapper.insertSelective(detailRecord);
Long slotId = detail.getScheduleSlotId();
if (slotId != null) {
// 更新号源槽状态为可预约
ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(slotId);
if (slot != null) {
slot.setStatus(ScheduleSlotStatus.AVAILABLE.name());
slot.setUpdateTime(new Date());
scheduleSlotMapper.updateByPrimaryKeySelective(slot);
}
// 更新对应的号源池状态为可用
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(slot.getSchedulePoolId());
if (pool != null) {
pool.setStatus(SchedulePoolStatus.AVAILABLE.name());
pool.setUpdateTime(new Date());
schedulePoolMapper.updateByPrimaryKeySelective(pool);
}
}
}
// 4. 更新汇总单状态为已完成（已发药或已退药），使用乐观锁防止并发冲突
int updated = dispensingSummaryMapper.updateStatusByIdAndPrevStatus(
summaryId,
isRefund ? DispenseStatus.REFUND_PENDING.getCode() : DispenseStatus.DISPENSE_PENDING.getCode(),
isRefund ? DispenseStatus.REFUNDED.getCode() : DispenseStatus.DISPENSED.getCode()
);
if (updated != 1) {
logger.warn("汇总单状态更新异常，orderId={}, summaryId={}", orderId, summaryId);
throw new BusinessException("发药汇总单状态更新失败，请重试");
}
// 5. 记录退款日志（即使实际未产生金流，仍需留痕）
RefundLog refundLog = new RefundLog();
refundLog.setOrderMainId(orderMainId);
refundLog.setRefundAmount(orderMain.getTotalAmount()); // 退全额
refundLog.setRefundStatus(RefundStatus.SUCCESS.name());
refundLog.setOperator(operator);
refundLog.setCreateTime(new Date());
refundLogMapper.insert(refundLog);
// 5. 同步更新医嘱主表和明细状态
orderMainMapper.updateStatusById(orderId,
isRefund ? OrderStatus.REFUND_IN_PROGRESS.getCode() : OrderStatus.DISPENSE_IN_PROGRESS.getCode());
for (OrderDetail detail : details) {
orderDetailMapper.updateStatusById(detail.getId(),
isRefund ? OrderStatus.REFUND_IN_PROGRESS.getCode() : OrderStatus.DISPENSE_IN_PROGRESS.getCode());
}
logger.info("住院{}药成功，orderId={}, summaryId={}", isRefund ? "退" : "发", orderId, summaryId);
logger.info("诊前退号成功，orderMainId={}, operator={}", orderMainId, operator);
return true;
}
// ==================== 其余业务方法保持不变 ====================
// -------------------------------------------------------------------------
// 其余业务方法保持不变（省略实现细节）
// -------------------------------------------------------------------------
// 下面是新增的 mapper 方法声明（对应 MyBatis XML），若已有则可忽略
// 这些方法在对应的 Mapper 接口中已经声明，若未声明请自行补充。
// DispensingSummaryMapper.updateStatusByIdAndPrevStatus(Long id, Integer prevStatus, Integer newStatus)
// OrderMainMapper.updateStatusById(Long id, Integer status)
// OrderDetailMapper.updateStatusById(Long id, Integer status)
// 下面保留原有的业务方法占位，以免编译错误。实际业务代码请根据项目需求自行补全。
@Override
public Page<OrderDetailDto> getOrderDetails(Long patientId, Integer pageNum, Integer pageSize) {
// 省略实现...
return null;
}
@Override
public boolean verifyOrder(OrderVerifyDto verifyDto) {
// 省略实现...
return false;
}
@Override
public QueuePatientDto getNextPatientInQueue(Long departmentId) {
// 省略实现...
return null;
}
// 其他已实现的方法保持原样...
}