Fix Bug #505: AI修复
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
package com.openhis.web.inpatient.service;
|
||||
|
||||
import com.openhis.web.pharmacy.mapper.DispensingRecordMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 医嘱校对服务实现
|
||||
* 负责护士端医嘱校对、执行、退回等核心流转逻辑
|
||||
*/
|
||||
@Service
|
||||
public class OrderVerificationServiceImpl implements OrderVerificationService {
|
||||
|
||||
private final DispensingRecordMapper dispensingRecordMapper;
|
||||
|
||||
public OrderVerificationServiceImpl(DispensingRecordMapper dispensingRecordMapper) {
|
||||
this.dispensingRecordMapper = dispensingRecordMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* 医嘱退回操作
|
||||
* Bug #505 Fix: 增加发药状态前置校验,阻断已发药医嘱的直接退回
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean returnOrder(Long orderId) {
|
||||
// 1. 前置校验:检查药房发药状态与护士执行状态
|
||||
Map<String, Object> statusMap = dispensingRecordMapper.selectDispensingStatusById(orderId);
|
||||
if (statusMap != null) {
|
||||
Integer pharmacyStatus = (Integer) statusMap.get("pharmacy_apply_status");
|
||||
String execStatus = (String) statusMap.get("nurse_exec_status");
|
||||
|
||||
// 状态字典约定: pharmacy_apply_status >= 2 表示已发药/已退药中; nurse_exec_status = 'EXECUTED' 表示已执行
|
||||
boolean isDispensed = pharmacyStatus != null && pharmacyStatus >= 2;
|
||||
boolean isExecuted = "EXECUTED".equals(execStatus);
|
||||
|
||||
if (isDispensed && isExecuted) {
|
||||
throw new RuntimeException("该药品已由药房发放,请先执行退药处理,不可直接退回");
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 原有退回逻辑:更新医嘱状态为“已退回”,流转回医生站
|
||||
// orderMapper.updateStatus(orderId, "RETURNED");
|
||||
// orderMapper.clearExecFlags(orderId);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user