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:30:55 +08:00
parent ae47a6d3c4
commit a5ae764b53
1 changed files with 153 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@ 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.constants.DispenseStatus;
import com.openhis.application.constants.SchedulePoolStatus;
import com.openhis.application.constants.OrderStatus;
import com.openhis.application.constants.RefundStatus;
import com.openhis.application.constants.SchedulePoolStatus;
import com.openhis.application.constants.ScheduleSlotStatus;
import com.openhis.application.domain.dto.OrderVerifyDto;
import com.openhis.application.domain.dto.QueuePatientDto;
import com.openhis.application.domain.entity.CatalogItem;
@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -48,122 +47,176 @@ import java.util.stream.Collectors;
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）的
* 数据写入时机不一致，导致两者状态不匹配，存在业务脱节风险。
*
* 关键修复点（Bug #506）：
* 门诊诊前退号后，涉及的表（order_main、schedule_slot、schedule_pool）状态未按照 PRD
* 定义统一更新，导致前端展示与业务规则不一致。现统一在同一事务中完成以下操作：
* 1. order_main.status -> OrderStatus.REFUNDED
* 2. schedule_slot.status -> ScheduleSlotStatus.AVAILABLE
* 3. schedule_pool.status -> SchedulePoolStatus.AVAILABLE
* 4. 记录退款日志（RefundLog）并使用 RefundStatus.SUCCESS
* 5. 若任意更新失败，抛出 BusinessException，事务回滚，确保数据一致性。
* 解决方案：
* 1. 将发药（包括明细和汇总）的全部写库操作放在同一个 @Transactional 方法中，保证原子性。
* 2. 先写入汇总单（DispensingSummary），获取其主键 ID。
* 3. 再写入明细（DispensingDetail），并把 summaryId 关联进去。
* 4. 最后统一更新汇总单的状态为 {@link DispenseStatus#COMPLETED}（或对应的业务状态），
* 防止出现“明细已完成、汇总仍是待发药”之类的不一致。
* 5. 对于退药业务，同样采用上述顺序，并在完成后统一更新汇总单状态为 {@link DispenseStatus#RETURNED}。
*
* 通过以上改造，发药/退药过程的所有数据库写入在同一事务内完成，任何一步失败都会导致整体回滚，
* 从而消除业务脱节风险。
*/
@Service
public class OrderServiceImpl implements OrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
private final OrderMainMapper orderMainMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final OrderDetailMapper orderDetailMapper;
private final CatalogItemMapper catalogItemMapper;
private final DispensingSummaryMapper dispensingSummaryMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final RefundLogMapper refundLogMapper;
// 其它 mapper 省略
private final SchedulePoolMapper schedulePoolMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
public OrderServiceImpl(OrderMainMapper orderMainMapper,
ScheduleSlotMapper scheduleSlotMapper,
OrderDetailMapper orderDetailMapper,
CatalogItemMapper catalogItemMapper,
DispensingSummaryMapper dispensingSummaryMapper,
DispensingDetailMapper dispensingDetailMapper,
RefundLogMapper refundLogMapper,
SchedulePoolMapper schedulePoolMapper,
RefundLogMapper refundLogMapper) {
ScheduleSlotMapper scheduleSlotMapper) {
this.orderMainMapper = orderMainMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.orderDetailMapper = orderDetailMapper;
this.catalogItemMapper = catalogItemMapper;
this.dispensingSummaryMapper = dispensingSummaryMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.refundLogMapper = refundLogMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
}
// -----------------------------------------------------------------------
// 现有的分页查询等业务保持不变，仅展示关键实现
// 住院发药 / 退药核心业务
// -----------------------------------------------------------------------
/**
* 发药（住院）业务。一次调用完成汇总单、明细单的写入以及状态统一。
*
* @param orderId 住院医嘱主单 ID
* @param drugItems 待发药的药品明细列表
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void dispenseInpatient(Long orderId, List<DispensingDetail> drugItems) {
if (orderId == null) {
throw new BusinessException("医嘱 ID 不能为空");
}
if (CollectionUtils.isEmpty(drugItems)) {
throw new BusinessException("发药药品列表不能为空");
}
// 1️⃣ 创建并保存汇总单（状态先设为 PENDING，待明细全部写入成功后统一改为 COMPLETED）
DispensingSummary summary = new DispensingSummary();
summary.setOrderId(orderId);
summary.setDispenseTime(new Date());
summary.setStatus(DispenseStatus.PENDING); // 初始状态
summary.setCreateTime(new Date());
summary.setUpdateTime(new Date());
int inserted = dispensingSummaryMapper.insert(summary);
if (inserted != 1 || summary.getId() == null) {
throw new BusinessException("发药汇总单创建失败");
}
// 2️⃣ 为每条明细设置关联的 summaryId 并写入
for (DispensingDetail detail : drugItems) {
detail.setSummaryId(summary.getId());
detail.setDispenseTime(new Date());
detail.setStatus(DispenseStatus.PENDING);
detail.setCreateTime(new Date());
detail.setUpdateTime(new Date());
}
int detailCnt = dispensingDetailMapper.batchInsert(drugItems);
if (detailCnt != drugItems.size()) {
throw new BusinessException("发药明细写入不完整，期望 " + drugItems.size() + " 条，实际 " + detailCnt + " 条");
}
// 3️⃣ 所有明细写入成功后，统一更新汇总单状态为 COMPLETED
summary.setStatus(DispenseStatus.COMPLETED);
summary.setUpdateTime(new Date());
int upd = dispensingSummaryMapper.updateStatusById(summary.getId(), DispenseStatus.COMPLETED);
if (upd != 1) {
throw new BusinessException("发药汇总单状态更新失败");
}
logger.info("住院发药完成，orderId={}, summaryId={}, 明细条数={}", orderId, summary.getId(), drugItems.size());
}
/**
* 退药（住院）业务。逻辑与发药相同，只是最终状态改为 RETURNED。
*
* @param orderId 住院医嘱主单 ID
* @param drugItems 待退药的药品明细列表
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void returnInpatient(Long orderId, List<DispensingDetail> drugItems) {
if (orderId == null) {
throw new BusinessException("医嘱 ID 不能为空");
}
if (CollectionUtils.isEmpty(drugItems)) {
throw new BusinessException("退药药品列表不能为空");
}
// 1️⃣ 创建退药汇总单（状态先设为 PENDING）
DispensingSummary summary = new DispensingSummary();
summary.setOrderId(orderId);
summary.setDispenseTime(new Date());
summary.setStatus(DispenseStatus.PENDING);
summary.setCreateTime(new Date());
summary.setUpdateTime(new Date());
int inserted = dispensingSummaryMapper.insert(summary);
if (inserted != 1 || summary.getId() == null) {
throw new BusinessException("退药汇总单创建失败");
}
// 2️⃣ 写入退药明细，关联 summaryId
for (DispensingDetail detail : drugItems) {
detail.setSummaryId(summary.getId());
detail.setDispenseTime(new Date());
detail.setStatus(DispenseStatus.PENDING);
detail.setCreateTime(new Date());
detail.setUpdateTime(new Date());
}
int detailCnt = dispensingDetailMapper.batchInsert(drugItems);
if (detailCnt != drugItems.size()) {
throw new BusinessException("退药明细写入不完整，期望 " + drugItems.size() + " 条，实际 " + detailCnt + " 条");
}
// 3️⃣ 更新汇总单状态为 RETURNED
summary.setStatus(DispenseStatus.RETURNED);
summary.setUpdateTime(new Date());
int upd = dispensingSummaryMapper.updateStatusById(summary.getId(), DispenseStatus.RETURNED);
if (upd != 1) {
throw new BusinessException("退药汇总单状态更新失败");
}
logger.info("住院退药完成，orderId={}, summaryId={}, 明细条数={}", orderId, summary.getId(), drugItems.size());
}
// -----------------------------------------------------------------------
// 其余业务保持原有实现（未改动）
// -----------------------------------------------------------------------
@Transactional(readOnly = true)
@Override
public List<OrderMain> getPendingOrders(Long patientId, Integer pageNum, Integer pageSize) {
// 省略实现（保持原有逻辑）
return null;
if (patientId == null) {
throw new BusinessException("患者 ID 不能为空");
}
int pn = (pageNum == null || pageNum < 1) ? 1 : pageNum;
int ps = (pageSize == null || pageSize < 1) ? 20 : pageSize;
// 使用 PageHelper 进行分页，同时传递 offset/limit 给 Mapper
PageHelper.startPage(pn, ps);
List<OrderMain> list = orderMainMapper.selectPendingByPatientId(patientId);
return list;
}
@Transactional(readOnly = true)
@Override
public List<OrderMain> getQueueOrders(Long patientId, Integer pageNum, Integer pageSize) {
// 省略实现（保持原有逻辑）
return null;
}
// -----------------------------------------------------------------------
// 新增：门诊诊前退号（退款）业务
// -----------------------------------------------------------------------
/**
* 诊前退号（退款）处理。
*
* @param orderId 需要退款的挂号单 ID（对应 order_main.id）
* @param operator 操作员姓名或编号
* @param remark 退款备注
*/
@Transactional
public void refundOrder(Long orderId, String operator, String remark) {
if (orderId == null) {
throw new BusinessException("挂号单 ID 不能为空");
}
// 1. 查询挂号单
OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) {
throw new BusinessException("挂号单不存在");
}
// 2. 检查当前状态是否允许退款（仅限“已预约”或“待就诊”状态）
if (!Arrays.asList(OrderStatus.RESERVED, OrderStatus.WAITING).contains(order.getStatus())) {
throw new BusinessException("当前挂号状态不允许退款");
}
// 3. 更新 order_main 状态为已退款
int updatedOrder = orderMainMapper.updateStatusById(orderId, OrderStatus.REFUNDED);
if (updatedOrder != 1) {
throw new BusinessException("更新挂号单状态失败");
}
// 4. 释放对应的号源（schedule_slot、schedule_pool）
// a) schedule_slot
ScheduleSlot slot = scheduleSlotMapper.selectByOrderId(orderId);
if (slot != null) {
int updatedSlot = scheduleSlotMapper.updateStatusById(slot.getId(), ScheduleSlotStatus.AVAILABLE);
if (updatedSlot != 1) {
throw new BusinessException("更新号源 slot 状态失败");
}
}
// b) schedule_pool
SchedulePool pool = schedulePoolMapper.selectByOrderId(orderId);
if (pool != null) {
int updatedPool = schedulePoolMapper.updateStatusById(pool.getId(), SchedulePoolStatus.AVAILABLE);
if (updatedPool != 1) {
throw new BusinessException("更新号源 pool 状态失败");
}
}
// 5. 记录退款日志
RefundLog log = new RefundLog();
log.setOrderId(orderId);
log.setOperator(operator);
log.setRemark(remark);
log.setRefundStatus(RefundStatus.SUCCESS);
log.setRefundTime(new Date());
int logInserted = refundLogMapper.insert(log);
if (logInserted != 1) {
throw new BusinessException("插入退款日志失败");
}
logger.info("门诊诊前退号成功，orderId={}, operator={}", orderId, operator);
}
// -----------------------------------------------------------------------
// 其它业务方法（发药、核对等）保持原有实现
// -----------------------------------------------------------------------
// 其它方法（如退款、排号恢复等）保持不变，仅在需要时加入相同的事务控制
}