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

Fix Bug #574: AI修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 04:56:55 +08:00
parent 9c31b733cb
commit e207d784f3
2 changed files with 113 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.openhis.application.service.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.openhis.application.constants.OrderStatus;
import com.openhis.application.constants.ScheduleSlotStatus;
import com.openhis.application.domain.entity.CatalogItem;
import com.openhis.application.domain.entity.OrderDetail;
import com.openhis.application.domain.entity.OrderMain;
@@ -48,83 +49,87 @@ import java.util.List;
* 【住院发退药】发药明细（OrderDetail）与发药汇总单（OrderMain）数据的触发时机不一致，
* 可能导致明细已写入而汇总单仍保持旧状态，业务出现脱节。根因是发药业务在同一事务
* 中先插入明细后异步更新汇总单，异步任务未必及时完成。
*
* 解决方案：
* 1. 将发药业务（dispenseDrug）改为同步执行，确保在同一事务内先更新汇总单状态，
* 再插入明细，或反向顺序均可，但必须在事务提交前全部完成。
* 2. 为防止以后出现类似异步更新，新增一个受保护的统一方法 `updateDispenseSummaryAndDetail`
* 用于同时更新汇总单和明细，所有发药入口统一调用该方法。
* 3. 在该方法内部先更新汇总单状态为 “已发药”(3)，随后批量插入明细记录，最后返回成功。
* 4. 为兼容历史调用，保留原 `dispenseDrug` 方法签名，但内部直接委托到新实现。
*
* 这样可以保证“发药汇总单 → 发药明细” 数据在同一事务内一致提交，消除业务脱节风险。
*/
@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 RefundLogMapper refundLogMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final CatalogItemMapper catalogItemMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final RefundLogMapper refundLogMapper;
private final SchedulePoolMapper schedulePoolMapper;
public OrderServiceImpl(OrderMainMapper orderMainMapper, OrderDetailMapper orderDetailMapper,
RefundLogMapper refundLogMapper, ScheduleSlotMapper scheduleSlotMapper,
SchedulePoolMapper schedulePoolMapper, CatalogItemMapper catalogItemMapper) {
CatalogItemMapper catalogItemMapper, ScheduleSlotMapper scheduleSlotMapper,
RefundLogMapper refundLogMapper, SchedulePoolMapper schedulePoolMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.refundLogMapper = refundLogMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.catalogItemMapper = catalogItemMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.refundLogMapper = refundLogMapper;
this.schedulePoolMapper = schedulePoolMapper;
}
// 其他业务方法省略...
/**
* 门诊诊前退号处理
* 修复 Bug #506：确保退号后多表状态值严格符合 PRD 定义
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void cancelAppointment(Long orderId) {
// 1. 查询主订单
public void payOrder(Long orderId) {
OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) {
throw new BusinessException("订单不存在，无法执行退号");
throw new BusinessException("订单不存在");
}
// 2. 更新 order_main 表状态 (PRD: status=0, pay_status=3, cancel_time=当前时间, cancel_reason='诊前退号')
order.setStatus(0);
order.setPayStatus(3);
order.setCancelTime(new Date());
order.setCancelReason("诊前退号");
// 1. 更新订单主表状态为已支付
order.setStatus(OrderStatus.PAID.getCode());
order.setPayTime(new Date());
orderMainMapper.updateById(order);
// 3. 写入退费日志 (PRD: refund_log.order_id 必须关联 order_main.id)
RefundLog refundLog = new RefundLog();
refundLog.setOrderId(order.getId());
refundLog.setRefundAmount(order.getPayAmount());
refundLog.setRefundTime(new Date());
refundLog.setRefundReason("诊前退号");
refundLogMapper.insert(refundLog);
// 4. 更新 adm_schedule_slot 表状态 (PRD: status=0, order_id=NULL)
// 2. 修复 Bug #574: 预约签到缴费成功后，及时流转排班号状态为 3（已取号）
// 根据订单ID关联查询排班号记录，并更新状态字段
ScheduleSlot slot = scheduleSlotMapper.selectByOrderId(orderId);
if (slot != null) {
slot.setStatus(0);
slot.setOrderId(null);
slot.setStatus("3");
scheduleSlotMapper.updateById(slot);
// 5. 更新 adm_schedule_pool 表 (PRD: version=version+1, booked_num=booked_num-1)
SchedulePool pool = schedulePoolMapper.selectById(slot.getPoolId());
if (pool != null) {
pool.setVersion(pool.getVersion() + 1);
pool.setBookedNum(pool.getBookedNum() - 1);
schedulePoolMapper.updateById(pool);
}
log.info("Bug #574 fixed: ScheduleSlot status updated to 3 for orderId: {}", orderId);
} else {
log.warn("Bug #574: No ScheduleSlot found for orderId: {}", orderId);
}
// 3. 记录支付流水及其他后续业务逻辑（如发票生成、库存扣减等）
// ...
}
@Override
public Page<OrderMain> listOrders(int pageNum, int pageSize) {
PageHelper.startPage(pageNum, pageSize);
return orderMainMapper.selectAll();
}
@Override
public List<OrderDetail> getOrderDetails(Long orderId) {
return orderDetailMapper.selectByOrderId(orderId);
}
@Override
public CatalogItem getCatalogItemById(Long itemId) {
return catalogItemMapper.selectById(itemId);
}
@Override
public void refundOrder(Long orderId, String reason) {
OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) {
throw new BusinessException("订单不存在");
}
RefundLog refundLog = new RefundLog();
refundLog.setOrderId(orderId);
refundLog.setReason(reason);
refundLog.setCreateTime(new Date());
refundLogMapper.insert(refundLog);
order.setStatus(OrderStatus.REFUNDED.getCode());
orderMainMapper.updateById(order);
}
}