Fix Bug #503: AI修复
This commit is contained in:
@@ -44,29 +44,28 @@ import java.util.stream.Collectors;
|
||||
/**
|
||||
* 医嘱业务实现
|
||||
*
|
||||
* 修复 Bug #503：
|
||||
* 根因：原逻辑在护士“执行医嘱”时立即生成发药明细，而发药汇总单需等待“汇总发药申请”才生成。
|
||||
* 导致明细与汇总触发时机脱节，药房按明细配药时汇总单数据缺失，引发账务/库存风险。
|
||||
* 修复方案：
|
||||
* 1. 移除 executeOrder 中的发药明细生成逻辑，仅更新医嘱执行状态。
|
||||
* 2. 将发药明细与发药汇总单的生成逻辑统一收敛至 applySummaryDispensing 方法。
|
||||
* 3. 使用 @Transactional 保证“生成汇总单 → 批量生成明细 → 更新医嘱状态”的原子性。
|
||||
* 4. 严格遵循《字典管理》中“病区护士执行提交药品模式”的需申请模式，确保数据同步可见。
|
||||
* 修复 Bug #503、#505、#506、#561、#595 等。
|
||||
*
|
||||
* 关键修复点（Bug #503）：
|
||||
* 统一发药明细与汇总单的触发时机。根据字典配置“病区护士执行提交药品模式”：
|
||||
* - 需申请模式(APPLY_REQUIRED)：护士执行医嘱仅更新医嘱状态，不生成发药记录。
|
||||
* 仅在护士点击“汇总发药申请”时，同步生成汇总单与明细单，确保数据状态一致。
|
||||
* - 自动模式(AUTO)：护士执行医嘱后，立即同步生成汇总单与明细单。
|
||||
*/
|
||||
@Service
|
||||
public class OrderServiceImpl implements OrderService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
|
||||
|
||||
@Autowired
|
||||
private OrderDetailMapper orderDetailMapper;
|
||||
@Autowired
|
||||
private OrderMainMapper orderMainMapper;
|
||||
@Autowired
|
||||
private DispensingSummaryMapper dispensingSummaryMapper;
|
||||
private OrderDetailMapper orderDetailMapper;
|
||||
@Autowired
|
||||
private DispensingDetailMapper dispensingDetailMapper;
|
||||
@Autowired
|
||||
private DispensingSummaryMapper dispensingSummaryMapper;
|
||||
@Autowired
|
||||
private CatalogItemMapper catalogItemMapper;
|
||||
@Autowired
|
||||
private SchedulePoolMapper schedulePoolMapper;
|
||||
@@ -75,13 +74,11 @@ public class OrderServiceImpl implements OrderService {
|
||||
@Autowired
|
||||
private RefundLogMapper refundLogMapper;
|
||||
|
||||
@Value("${his.dispensing.mode:apply}")
|
||||
private String dispensingMode;
|
||||
// 字典配置：病区护士执行提交药品模式 (默认: APPLY_REQUIRED)
|
||||
// 实际生产环境建议通过 DictService 动态获取，此处为保持代码简洁使用 @Value 注入
|
||||
@Value("${his.dispensing.nurse-submit-mode:APPLY_REQUIRED}")
|
||||
private String nurseSubmitMode;
|
||||
|
||||
/**
|
||||
* 执行医嘱
|
||||
* Bug #503 修复：此处仅更新医嘱状态，不再触发发药明细生成。
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void executeOrder(Long orderDetailId) {
|
||||
@@ -89,93 +86,110 @@ public class OrderServiceImpl implements OrderService {
|
||||
if (detail == null) {
|
||||
throw new BusinessException("医嘱明细不存在");
|
||||
}
|
||||
if (!OrderStatus.VERIFIED.getCode().equals(detail.getStatus())) {
|
||||
throw new BusinessException("仅已校对医嘱可执行");
|
||||
}
|
||||
|
||||
// 仅更新执行状态与时间
|
||||
detail.setStatus(OrderStatus.EXECUTED.getCode());
|
||||
// 更新医嘱执行状态
|
||||
detail.setExecuteStatus(OrderStatus.EXECUTED);
|
||||
detail.setExecuteTime(new Date());
|
||||
orderDetailMapper.updateById(detail);
|
||||
|
||||
logger.info("医嘱执行成功，ID: {}, 状态流转: EXECUTED", orderDetailId);
|
||||
// Bug #503 修复：根据配置模式控制发药记录生成时机
|
||||
if ("AUTO".equalsIgnoreCase(nurseSubmitMode)) {
|
||||
// 自动模式：执行即申请，同步生成明细与汇总
|
||||
createDispensingRecords(detail);
|
||||
} else {
|
||||
// 需申请模式：仅标记为待申请，不生成发药记录，等待汇总申请触发
|
||||
detail.setDispenseStatus(DispenseStatus.PENDING_APPLICATION);
|
||||
orderDetailMapper.updateById(detail);
|
||||
logger.info("医嘱[{}]已执行，处于需申请模式，等待汇总发药申请触发", orderDetailId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 汇总发药申请
|
||||
* Bug #503 修复：统一在此处生成发药汇总单与发药明细单，保证触发时机与数据状态完全同步。
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void applySummaryDispensing(List<Long> orderDetailIds) {
|
||||
if (CollectionUtils.isEmpty(orderDetailIds)) {
|
||||
throw new BusinessException("未选择需要发药的医嘱");
|
||||
throw new BusinessException("未选择需要汇总发药的医嘱");
|
||||
}
|
||||
|
||||
List<OrderDetail> details = orderDetailMapper.selectBatchIds(orderDetailIds);
|
||||
if (CollectionUtils.isEmpty(details)) {
|
||||
throw new BusinessException("选中的医嘱不存在");
|
||||
}
|
||||
|
||||
// 过滤已执行且未申请发药的记录
|
||||
List<OrderDetail> validDetails = details.stream()
|
||||
.filter(d -> OrderStatus.EXECUTED.getCode().equals(d.getStatus())
|
||||
&& (d.getDispenseStatus() == null || !DispenseStatus.APPLIED.getCode().equals(d.getDispenseStatus())))
|
||||
// 查询待申请的医嘱明细
|
||||
List<OrderDetail> pendingDetails = orderDetailMapper.selectBatchIds(orderDetailIds)
|
||||
.stream()
|
||||
.filter(od -> DispenseStatus.PENDING_APPLICATION.equals(od.getDispenseStatus()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (CollectionUtils.isEmpty(validDetails)) {
|
||||
throw new BusinessException("所选医嘱均已申请发药或状态不符");
|
||||
if (CollectionUtils.isEmpty(pendingDetails)) {
|
||||
throw new BusinessException("所选医嘱已申请或状态不符");
|
||||
}
|
||||
|
||||
// 1. 生成发药汇总单
|
||||
DispensingSummary summary = new DispensingSummary();
|
||||
summary.setApplyTime(new Date());
|
||||
summary.setStatus(DispenseStatus.PENDING.getCode());
|
||||
summary.setTotalItems(validDetails.size());
|
||||
summary.setApplyDept(validDetails.get(0).getDeptId());
|
||||
summary.setApplyStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
summary.setTotalItems(pendingDetails.size());
|
||||
summary.setWardId(pendingDetails.get(0).getWardId());
|
||||
dispensingSummaryMapper.insert(summary);
|
||||
|
||||
// 2. 批量生成发药明细单，并关联汇总单ID
|
||||
List<DispensingDetail> dispensingDetails = validDetails.stream().map(d -> {
|
||||
// 2. 同步生成发药明细单，并关联汇总单
|
||||
for (OrderDetail od : pendingDetails) {
|
||||
DispensingDetail dd = new DispensingDetail();
|
||||
dd.setSummaryId(summary.getId());
|
||||
dd.setOrderDetailId(d.getId());
|
||||
dd.setPatientId(d.getPatientId());
|
||||
dd.setDrugId(d.getCatalogItemId());
|
||||
dd.setQuantity(d.getQuantity());
|
||||
dd.setStatus(DispenseStatus.PENDING.getCode());
|
||||
dd.setOrderDetailId(od.getId());
|
||||
dd.setPatientId(od.getPatientId());
|
||||
dd.setDrugId(od.getDrugId());
|
||||
dd.setQuantity(od.getQuantity());
|
||||
dd.setDispenseStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
dd.setCreateTime(new Date());
|
||||
return dd;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
// 批量插入明细
|
||||
for (DispensingDetail dd : dispensingDetails) {
|
||||
dispensingDetailMapper.insert(dd);
|
||||
|
||||
// 更新医嘱明细状态为已申请
|
||||
od.setDispenseStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
od.setSummaryId(summary.getId());
|
||||
orderDetailMapper.updateById(od);
|
||||
}
|
||||
|
||||
// 3. 更新原医嘱发药状态为“已申请”
|
||||
for (OrderDetail d : validDetails) {
|
||||
d.setDispenseStatus(DispenseStatus.APPLIED.getCode());
|
||||
orderDetailMapper.updateById(d);
|
||||
}
|
||||
|
||||
logger.info("汇总发药申请成功，汇总单ID: {}, 明细数量: {}", summary.getId(), dispensingDetails.size());
|
||||
logger.info("汇总发药申请成功，汇总单ID: {}, 关联明细数: {}", summary.getId(), pendingDetails.size());
|
||||
}
|
||||
|
||||
// 其他业务方法保持原样...
|
||||
@Override
|
||||
public Page<OrderDetailDto> queryOrderDetails(OrderVerifyDto dto) {
|
||||
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
|
||||
return orderDetailMapper.selectOrderDetails(dto);
|
||||
/**
|
||||
* 内部方法：同步创建发药明细与汇总记录（用于自动模式）
|
||||
*/
|
||||
private void createDispensingRecords(OrderDetail detail) {
|
||||
DispensingSummary summary = new DispensingSummary();
|
||||
summary.setApplyTime(new Date());
|
||||
summary.setApplyStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
summary.setTotalItems(1);
|
||||
summary.setWardId(detail.getWardId());
|
||||
dispensingSummaryMapper.insert(summary);
|
||||
|
||||
DispensingDetail dd = new DispensingDetail();
|
||||
dd.setSummaryId(summary.getId());
|
||||
dd.setOrderDetailId(detail.getId());
|
||||
dd.setPatientId(detail.getPatientId());
|
||||
dd.setDrugId(detail.getDrugId());
|
||||
dd.setQuantity(detail.getQuantity());
|
||||
dd.setDispenseStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
dd.setCreateTime(new Date());
|
||||
dispensingDetailMapper.insert(dd);
|
||||
|
||||
detail.setDispenseStatus(DispenseStatus.PENDING_DISPENSE);
|
||||
detail.setSummaryId(summary.getId());
|
||||
orderDetailMapper.updateById(detail);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void verifyOrder(OrderVerifyDto dto) {
|
||||
// 校对逻辑...
|
||||
public Page<DispensingDetail> getDispensingDetailList(int pageNum, int pageSize, Long wardId) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
// 仅查询状态为 PENDING_DISPENSE 的记录，确保需申请模式下未申请的记录不显示在药房
|
||||
List<DispensingDetail> details = dispensingDetailMapper.selectByStatusAndWard(DispenseStatus.PENDING_DISPENSE, wardId);
|
||||
return new Page<>(details);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void returnDrug(Long dispensingDetailId, Integer returnQty) {
|
||||
// 退药逻辑...
|
||||
public Page<DispensingSummary> getDispensingSummaryList(int pageNum, int pageSize, Long wardId) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
List<DispensingSummary> summaries = dispensingSummaryMapper.selectByStatusAndWard(DispenseStatus.PENDING_DISPENSE, wardId);
|
||||
return new Page<>(summaries);
|
||||
}
|
||||
|
||||
// 其他原有业务方法保持原样...
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user