fix(#613): 修复编译错误 — updateCancelledStatusBatch 误用 backReason 参数 + 所有调用方补齐 4 参
根因: - Bug #613 修复时 updateCancelledStatusBatch 复制了 backReason 逻辑但该方法没有该参数 - IServiceRequestService.updateDraftStatus 接口增加了 backReason 参数,但 5 个调用方未更新 - 旧 pipeline(未重启)的 mvn compile 质量门禁未生效 修复: - MedicationRequestServiceImpl: 移除 updateCancelledStatusBatch 中的 backReason 引用 - ServiceRequestServiceImpl: 补齐 updateDraftStatus 的 backReason 参数 - 5 个调用方补齐第 4 个参数 (null) - 旧 pipeline 已修复(二进制 + systemd 重启)
This commit is contained in:
@@ -2325,7 +2325,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
|||||||
log.info("BugFix: signOffAdvice - 签退所有请求,状态改为待签发, requestIdList={}", requestIdList);
|
log.info("BugFix: signOffAdvice - 签退所有请求,状态改为待签发, requestIdList={}", requestIdList);
|
||||||
|
|
||||||
// 尝试签退药品请求(只有存在的才会更新)
|
// 尝试签退药品请求(只有存在的才会更新)
|
||||||
iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null);
|
iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null, null);
|
||||||
// 尝试签退耗材请求(只有存在的才会更新)
|
// 尝试签退耗材请求(只有存在的才会更新)
|
||||||
iDeviceRequestService.updateDraftStatusBatch(requestIdList);
|
iDeviceRequestService.updateDraftStatusBatch(requestIdList);
|
||||||
// 尝试签退诊疗请求(只有存在的才会更新)
|
// 尝试签退诊疗请求(只有存在的才会更新)
|
||||||
|
|||||||
@@ -416,12 +416,12 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
|||||||
if (!serviceRequestList.isEmpty()) {
|
if (!serviceRequestList.isEmpty()) {
|
||||||
// 更新服务请求状态待发送
|
// 更新服务请求状态待发送
|
||||||
serviceRequestService.updateDraftStatus(
|
serviceRequestService.updateDraftStatus(
|
||||||
serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
|
serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null);
|
||||||
}
|
}
|
||||||
if (!medRequestList.isEmpty()) {
|
if (!medRequestList.isEmpty()) {
|
||||||
// 更新药品请求状态待发送
|
// 更新药品请求状态待发送
|
||||||
medicationRequestService.updateDraftStatusBatch(
|
medicationRequestService.updateDraftStatusBatch(
|
||||||
medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate);
|
medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null);
|
||||||
}
|
}
|
||||||
return R.ok(null, "退回成功");
|
return R.ok(null, "退回成功");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
|
|||||||
}
|
}
|
||||||
boolean result = serviceRequestService.updateCancelledStatus(serviceReqId, now, practitionerId, orgId);
|
boolean result = serviceRequestService.updateCancelledStatus(serviceReqId, now, practitionerId, orgId);
|
||||||
// 更新主服务请求状态为待执行
|
// 更新主服务请求状态为待执行
|
||||||
serviceRequestService.updateDraftStatus(List.of(serviceRequest.getBasedOnId()), null, null);
|
serviceRequestService.updateDraftStatus(List.of(serviceRequest.getBasedOnId()), null, null, null);
|
||||||
if (result) {
|
if (result) {
|
||||||
// 判断是否全部取消执行
|
// 判断是否全部取消执行
|
||||||
boolean exists = serviceRequestMapper.exists(new LambdaQueryWrapper<ServiceRequest>()
|
boolean exists = serviceRequestMapper.exists(new LambdaQueryWrapper<ServiceRequest>()
|
||||||
|
|||||||
@@ -1059,7 +1059,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
|
|||||||
}
|
}
|
||||||
if (!medicineRequestIds.isEmpty()) {
|
if (!medicineRequestIds.isEmpty()) {
|
||||||
// 根据请求id更新请求状态
|
// 根据请求id更新请求状态
|
||||||
iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null);
|
iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null, null);
|
||||||
}
|
}
|
||||||
if (!activityRequestIds.isEmpty()) {
|
if (!activityRequestIds.isEmpty()) {
|
||||||
// 根据请求id更新请求状态
|
// 根据请求id更新请求状态
|
||||||
|
|||||||
@@ -78,9 +78,6 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
|
|||||||
if (checkDate != null) {
|
if (checkDate != null) {
|
||||||
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
||||||
}
|
}
|
||||||
if (backReason != null) {
|
|
||||||
updateWrapper.set(MedicationRequest::getBackReason, backReason);
|
|
||||||
}
|
|
||||||
baseMapper.update(null, updateWrapper);
|
baseMapper.update(null, updateWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
|
|||||||
* @param checkDate 校对时间
|
* @param checkDate 校对时间
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate) {
|
public void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate, String backReason) {
|
||||||
baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue())
|
baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue())
|
||||||
.setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()),
|
.setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()),
|
||||||
new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serviceRequestIdList)
|
new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serviceRequestIdList)
|
||||||
|
|||||||
Reference in New Issue
Block a user