diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index 55297b543..ffb4806c5 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -1183,6 +1183,18 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { .set(ServiceRequest::getStatusEnum, RequestStatus.PENDING_STOP.getValue()) .set(ServiceRequest::getUpdateBy, stopUserName)); } + // 耗材(adviceType=2) + List deviceList = paramList.stream() + .filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList()); + List deviceRequestIds + = deviceList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList()); + if (!deviceRequestIds.isEmpty()) { + iDeviceRequestService.update(new LambdaUpdateWrapper() + .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 { } -} +} \ No newline at end of file