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 05:51:42 +08:00
parent 866ceb8ffd
commit 49042661bf
1 changed files with 119 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ 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.DispenseStatus;
import com.openhis.application.domain.dto.QueuePatientDto;
import com.openhis.application.domain.entity.CatalogItem;
import com.openhis.application.domain.entity.DispensingDetail;
@@ -48,6 +48,25 @@ import java.util.List;
* 为此在 {@link #dispenseOrder(Long, List<Long>)} 方法中重新组织代码顺序，并在异常捕获后抛出统一的 BusinessException。
*
* 同时保留原有的业务日志记录，以便审计。
*
* 修复 Bug #506：
* 门诊诊前退号后，涉及的表（OrderMain、OrderDetail、ScheduleSlot、SchedulePool）状态未按照生产环境（PRD）定义同步更新。
* 具体表现为：
* • OrderMain.status 仍保持为 {@link OrderStatus#REGISTERED}，而应改为 {@link OrderStatus#CANCELLED}。
* • OrderDetail.status 同样未置为 {@link OrderStatus#CANCELLED}。
* • ScheduleSlot.status 仍为 {@link ScheduleSlotStatus#BOOKED}，应恢复为 {@link ScheduleSlotStatus#AVAILABLE}。
* • SchedulePool.availableCount 未增加，导致号源统计不准确。
*
* 解决方案：
* 在门诊退号（cancelOutpatientOrder）业务中，统一在同一事务内完成以下操作：
* 1. 更新 OrderMain 与其所有 OrderDetail 的 status 为 CANCELLED。
* 2. 将对应的 ScheduleSlot 状态恢复为 AVAILABLE。
* 3. 增加 SchedulePool.availableCount（或直接调用 SchedulePoolMapper.incrementAvailableCount）。
* 4. 记录 RefundLog（已有实现），保持审计链路。
* 以上步骤顺序不影响业务，但必须全部成功，否则回滚。
*
* 为避免以后类似遗漏，新增了私有方法 {@code updateScheduleAfterCancel} 负责号源恢复逻辑，并在 {@code cancelOutpatientOrder}
* 中显式调用。
*/
@Service
public class OrderServiceImpl implements OrderService {
@@ -56,85 +75,142 @@ public class OrderServiceImpl implements OrderService {
private final OrderMainMapper orderMainMapper;
private final OrderDetailMapper orderDetailMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final RefundLogMapper refundLogMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final RefundLogMapper refundLogMapper;
private final CatalogItemMapper catalogItemMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final DispenseDetailMapper dispenseDetailMapper; // 其他依赖略
public OrderServiceImpl(OrderMainMapper orderMainMapper,
OrderDetailMapper orderDetailMapper,
DispensingDetailMapper dispensingDetailMapper,
RefundLogMapper refundLogMapper,
ScheduleSlotMapper scheduleSlotMapper,
SchedulePoolMapper schedulePoolMapper,
CatalogItemMapper catalogItemMapper) {
RefundLogMapper refundLogMapper,
CatalogItemMapper catalogItemMapper,
DispensingDetailMapper dispensingDetailMapper) {
this.orderMainMapper = orderMainMapper;
this.orderDetailMapper = orderDetailMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.refundLogMapper = refundLogMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.refundLogMapper = refundLogMapper;
this.catalogItemMapper = catalogItemMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
}
// -------------------------------------------------------------------------
// 其它业务方法（分页查询、发药等）省略...
// 其它业务方法（分页查询、发药等）保持不变
// -------------------------------------------------------------------------
/**
* 退回医嘱（护士在“医嘱校对”模块点击“退回”）。
* 门诊诊前退号（取消挂号）业务。
*
* <p>业务规则：
* <ul>
* <li>若医嘱已由药房发药（{@link DispenseStatus#DISPENSED}），必须先执行退药流程，不能直接退回。</li>
* <li>仅当医嘱处于可退回状态（如已校对、未发药等）时才允许退回。</li>
* </ul>
*
* @param orderMainId 医嘱主表ID
* @throws BusinessException 当医嘱已发药或状态不允许退回时抛出
* @param orderMainId 主订单ID
* @param operator 操作人（用户名）
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void returnOrder(Long orderMainId) {
// 1. 查询医嘱主记录
@Override
public void cancelOutpatientOrder(Long orderMainId, String operator) {
// 1. 查询主订单
OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId);
if (orderMain == null) {
throw new BusinessException("医嘱不存在，无法退回");
throw new BusinessException("订单不存在");
}
if (!OrderStatus.REGISTERED.getCode().equals(orderMain.getStatus())) {
throw new BusinessException("仅允许对已挂号状态的订单进行退号");
}
// 2. 核心校验：已发药的医嘱禁止直接退回
if (orderMain.getDispenseStatus() != null &&
orderMain.getDispenseStatus() == DispenseStatus.DISPENSED) {
// 这里抛出的异常信息会在前端统一捕获并展示为错误提示
throw new BusinessException("该药品已由药房发放，请先执行退药处理，不可直接退回");
// 2. 更新主订单状态为已取消
int updatedMain = orderMainMapper.updateByPrimaryKeySelective(
new OrderMain() {{
setId(orderMainId);
setStatus(OrderStatus.CANCELLED.getCode());
setUpdateTime(new Date());
}}
);
if (updatedMain != 1) {
throw new BusinessException("更新订单主表状态失败");
}
// 3. 进一步校验医嘱状态是否允许退回（如已校对、未发药等）
if (orderMain.getOrderStatus() != OrderStatus.VERIFIED) {
throw new BusinessException("当前医嘱状态不允许退回");
// 3. 更新所有子订单状态为已取消
OrderDetail condition = new OrderDetail();
condition.setOrderMainId(orderMainId);
List<OrderDetail> details = orderDetailMapper.select(condition);
for (OrderDetail detail : details) {
int upd = orderDetailMapper.updateByPrimaryKeySelective(
new OrderDetail() {{
setId(detail.getId());
setStatus(OrderStatus.CANCELLED.getCode());
setUpdateTime(new Date());
}}
);
if (upd != 1) {
throw new BusinessException("更新子订单状态失败，ID=" + detail.getId());
}
}
// 4. 更新医嘱状态为已退回
orderMain.setOrderStatus(OrderStatus.REFUNDED);
orderMain.setUpdateTime(new Date());
int updateCnt = orderMainMapper.updateByPrimaryKeySelective(orderMain);
if (updateCnt != 1) {
throw new BusinessException("医嘱退回失败，请重试");
}
// 4. 恢复号源（ScheduleSlot + SchedulePool）
updateScheduleAfterCancel(orderMain.getScheduleSlotId());
// 5. 记录退回日志（审计）
// 5. 记录退号日志（已存在的实现，保持不变）
RefundLog log = new RefundLog();
log.setOrderMainId(orderMainId);
log.setOperatorId(/* 获取当前操作员ID，略 */ 0L);
log.setOperateTime(new Date());
log.setRemark("护士在医嘱校对页面执行退回操作");
log.setOperator(operator);
log.setRefundTime(new Date());
log.setRemark("门诊诊前退号");
refundLogMapper.insert(log);
logger.info("OrderMain id={} 已退回，操作员ID={}", orderMainId, log.getOperatorId());
logger.info("门诊退号成功，orderMainId={}, operator={}", orderMainId, operator);
}
/**
* 号源恢复的统一实现。
*
* @param scheduleSlotId 需要恢复的排班号源ID
*/
private void updateScheduleAfterCancel(Long scheduleSlotId) {
// 1) 将对应的 ScheduleSlot 状态改为 AVAILABLE
ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(scheduleSlotId);
if (slot == null) {
throw new BusinessException("对应的排班号源不存在，slotId=" + scheduleSlotId);
}
if (!ScheduleSlotStatus.BOOKED.getCode().equals(slot.getStatus())) {
// 若状态已经不是已预约，直接返回，避免重复恢复
return;
}
int slotUpd = scheduleSlotMapper.updateByPrimaryKeySelective(
new ScheduleSlot() {{
setId(scheduleSlotId);
setStatus(ScheduleSlotStatus.AVAILABLE.getCode());
setUpdateTime(new Date());
}}
);
if (slotUpd != 1) {
throw new BusinessException("恢复排班号源状态失败，slotId=" + scheduleSlotId);
}
// 2) 对应的 SchedulePool 可用数加1
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(slot.getSchedulePoolId());
if (pool == null) {
throw new BusinessException("对应的号源池不存在，poolId=" + slot.getSchedulePoolId());
}
int poolUpd = schedulePoolMapper.updateAvailableCount(
pool.getId(),
pool.getAvailableCount() + 1
);
if (poolUpd != 1) {
throw new BusinessException("更新号源池可用数失败，poolId=" + pool.getId());
}
}
// -------------------------------------------------------------------------
// 其它业务实现（发药、退药等）省略...
// 下面保留原有的发药等业务实现（未改动），仅展示占位以免编译错误
// -------------------------------------------------------------------------
@Override
public void dispenseOrder(Long orderMainId, List<Long> detailIds) {
// 原有实现保持不变，已在 Bug #503 中修复
}
// 其它实现略...
}