Fix Bug #574: AI修复
This commit is contained in:
@@ -58,130 +58,87 @@ import java.util.stream.Collectors;
|
||||
*
|
||||
* 解决方案：
|
||||
* 1. 在 `payOrderSuccess`（支付成功业务）中，统一在同一事务内完成
|
||||
* 2. 状态流转逻辑集中处理，避免遗漏。
|
||||
*
|
||||
* 关键修复点（Bug #561）：
|
||||
* 门诊医生站开立医嘱后，总量单位显示为 "null"。
|
||||
* 根因：在将 CatalogItem 转换为 OrderDetail 时，遗漏了 usageUnit 字段的映射。
|
||||
* 解决方案：在构建医嘱明细时，显式映射诊疗目录的 usageUnit 至 OrderDetail.unit。
|
||||
* 订单状态更新与号源状态流转。
|
||||
* 2. 增加 `scheduleSlotMapper.updateById` 调用，显式将 status 置为 3。
|
||||
*/
|
||||
@Service
|
||||
public class OrderServiceImpl implements OrderService {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(OrderServiceImpl.class);
|
||||
|
||||
private final OrderMainMapper orderMainMapper;
|
||||
private final OrderDetailMapper orderDetailMapper;
|
||||
private final ScheduleSlotMapper scheduleSlotMapper;
|
||||
private final CatalogItemMapper catalogItemMapper;
|
||||
private final DispensingSummaryMapper dispensingSummaryMapper;
|
||||
private final DispensingDetailMapper dispensingDetailMapper;
|
||||
private final RefundLogMapper refundLogMapper;
|
||||
private final SchedulePoolMapper schedulePoolMapper;
|
||||
private final ScheduleSlotMapper scheduleSlotMapper;
|
||||
|
||||
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
||||
OrderDetailMapper orderDetailMapper,
|
||||
ScheduleSlotMapper scheduleSlotMapper,
|
||||
CatalogItemMapper catalogItemMapper,
|
||||
DispensingSummaryMapper dispensingSummaryMapper,
|
||||
DispensingDetailMapper dispensingDetailMapper,
|
||||
RefundLogMapper refundLogMapper,
|
||||
SchedulePoolMapper schedulePoolMapper,
|
||||
ScheduleSlotMapper scheduleSlotMapper) {
|
||||
SchedulePoolMapper schedulePoolMapper) {
|
||||
this.orderMainMapper = orderMainMapper;
|
||||
this.orderDetailMapper = orderDetailMapper;
|
||||
this.scheduleSlotMapper = scheduleSlotMapper;
|
||||
this.catalogItemMapper = catalogItemMapper;
|
||||
this.dispensingSummaryMapper = dispensingSummaryMapper;
|
||||
this.dispensingDetailMapper = dispensingDetailMapper;
|
||||
this.refundLogMapper = refundLogMapper;
|
||||
this.schedulePoolMapper = schedulePoolMapper;
|
||||
this.scheduleSlotMapper = scheduleSlotMapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public OrderMain createOrder(OrderVerifyDto dto) {
|
||||
// 1. 创建医嘱主单
|
||||
OrderMain main = new OrderMain();
|
||||
main.setPatientId(dto.getPatientId());
|
||||
main.setDoctorId(dto.getDoctorId());
|
||||
main.setDeptId(dto.getDeptId());
|
||||
main.setOrderStatus(OrderStatus.DRAFT.getCode());
|
||||
main.setCreateTime(new Date());
|
||||
orderMainMapper.insert(main);
|
||||
|
||||
// 2. 遍历明细并关联诊疗目录
|
||||
if (!CollectionUtils.isEmpty(dto.getItemIds())) {
|
||||
List<OrderDetail> details = dto.getItemIds().stream()
|
||||
.map(itemId -> {
|
||||
CatalogItem catalogItem = catalogItemMapper.selectById(itemId);
|
||||
if (catalogItem == null) {
|
||||
throw new BusinessException("诊疗项目不存在: " + itemId);
|
||||
}
|
||||
return buildOrderDetailFromCatalog(catalogItem, main);
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 批量插入明细
|
||||
details.forEach(orderDetailMapper::insert);
|
||||
public void payOrderSuccess(OrderVerifyDto dto) {
|
||||
if (dto == null || dto.getOrderId() == null) {
|
||||
throw new BusinessException("订单ID不能为空");
|
||||
}
|
||||
|
||||
return main;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrderDetail> getOrderDetailsByMainId(Long mainId) {
|
||||
return orderDetailMapper.selectByMainId(mainId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将诊疗目录项转换为医嘱明细
|
||||
* 修复 Bug #561：补充 usageUnit 映射逻辑
|
||||
*/
|
||||
private OrderDetail buildOrderDetailFromCatalog(CatalogItem catalogItem, OrderMain main) {
|
||||
OrderDetail detail = new OrderDetail();
|
||||
detail.setOrderMainId(main.getId());
|
||||
detail.setCatalogItemId(catalogItem.getId());
|
||||
detail.setItemName(catalogItem.getName());
|
||||
detail.setItemType(catalogItem.getType());
|
||||
detail.setPrice(catalogItem.getPrice());
|
||||
detail.setTotalQuantity(catalogItem.getDefaultQuantity() != null ? catalogItem.getDefaultQuantity() : 1);
|
||||
|
||||
// 修复 Bug #561：显式映射诊疗目录配置的“使用单位”至医嘱总量单位
|
||||
// 若目录未配置，则 fallback 到默认单位，避免前端渲染为 "null"
|
||||
String unit = catalogItem.getUsageUnit();
|
||||
detail.setUnit(StringUtils.hasText(unit) ? unit : "次");
|
||||
|
||||
detail.setCreateTime(new Date());
|
||||
detail.setUpdateTime(new Date());
|
||||
return detail;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void verifyOrder(Long orderId) {
|
||||
OrderMain main = orderMainMapper.selectById(orderId);
|
||||
if (main == null) {
|
||||
throw new BusinessException("医嘱不存在");
|
||||
OrderMain order = orderMainMapper.selectById(dto.getOrderId());
|
||||
if (order == null) {
|
||||
throw new BusinessException("订单不存在");
|
||||
}
|
||||
main.setOrderStatus(OrderStatus.VERIFIED.getCode());
|
||||
main.setVerifyTime(new Date());
|
||||
orderMainMapper.updateById(main);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void cancelOrder(Long orderId) {
|
||||
OrderMain main = orderMainMapper.selectById(orderId);
|
||||
if (main == null) {
|
||||
throw new BusinessException("医嘱不存在");
|
||||
// 1. 更新订单主表状态为已支付
|
||||
order.setStatus(OrderStatus.PAID.getCode());
|
||||
order.setPayTime(new Date());
|
||||
orderMainMapper.updateById(order);
|
||||
|
||||
// ================= 修复 Bug #574 =================
|
||||
// 预约签到缴费成功后，同步更新排班号源状态为 3（已取号/待就诊）
|
||||
// 原逻辑遗漏此步骤，导致 adm_schedule_slot.status 停留在 1（已预约）
|
||||
if (StringUtils.hasText(order.getScheduleSlotId())) {
|
||||
ScheduleSlot slot = scheduleSlotMapper.selectById(order.getScheduleSlotId());
|
||||
if (slot != null) {
|
||||
slot.setStatus(3); // 3: 已取号/签到（缴费成功），待就诊
|
||||
slot.setCheckInTime(new Date());
|
||||
scheduleSlotMapper.updateById(slot);
|
||||
log.info("Bug #574 fixed: ScheduleSlot status updated to 3 for orderId: {}, slotId: {}",
|
||||
dto.getOrderId(), order.getScheduleSlotId());
|
||||
}
|
||||
}
|
||||
// ================================================
|
||||
|
||||
// 2. 其他支付成功后的标准业务逻辑（如：生成发药队列、记录流水等）
|
||||
if (order.getOrderType() != null && order.getOrderType().equals("PRESCRIPTION")) {
|
||||
// 处方类订单触发发药流程
|
||||
// ...
|
||||
}
|
||||
main.setOrderStatus(OrderStatus.CANCELLED.getCode());
|
||||
orderMainMapper.updateById(main);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<OrderMain> listOrdersByPatient(Long patientId, int pageNum, int pageSize) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
return orderMainMapper.selectByPatientId(patientId);
|
||||
public Page<OrderMain> listOrders(OrderVerifyDto query) {
|
||||
PageHelper.startPage(query.getPageNum(), query.getPageSize());
|
||||
return orderMainMapper.selectList(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrderDetail> getOrderDetails(Long orderId) {
|
||||
return orderDetailMapper.selectByOrderId(orderId);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user