wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#782): guanyu (文件合入)

Browse Source
This commit is contained in:
关羽
2026-06-19 05:38:56 +08:00
committed by 华佗
parent 1d55523d69
commit 4c384a03fd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
View File

@@ -1183,6 +1183,18 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
.set(ServiceRequest::getStatusEnum, RequestStatus.PENDING_STOP.getValue())
.set(ServiceRequest::getUpdateBy, stopUserName));
}
// 耗材（adviceType=2）
List<AdviceBatchOpParam> deviceList = paramList.stream()
.filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
List<Long> deviceRequestIds
= deviceList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
if (!deviceRequestIds.isEmpty()) {
iDeviceRequestService.update(new LambdaUpdateWrapper<DeviceRequest>()
.in(DeviceRequest::getId, deviceRequestIds)
.set(DeviceRequest::getUseEndTime, stopTime)
.set(DeviceRequest::getStatusEnum, RequestStatus.PENDING_STOP.getValue())
.set(DeviceRequest::getUpdateBy, stopUserName));
}
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"医嘱停止"}));
}
@@ -1298,4 +1310,4 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
}
}
}