diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 225d47c8c..fb16f5140 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -2325,7 +2325,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp log.info("BugFix: signOffAdvice - 签退所有请求,状态改为待签发, requestIdList={}", requestIdList); // 尝试签退药品请求(只有存在的才会更新) - iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null); + iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null, null); // 尝试签退耗材请求(只有存在的才会更新) iDeviceRequestService.updateDraftStatusBatch(requestIdList); // 尝试签退诊疗请求(只有存在的才会更新) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index a86c601a5..6af610f4e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -416,12 +416,12 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { if (!serviceRequestList.isEmpty()) { // 更新服务请求状态待发送 serviceRequestService.updateDraftStatus( - serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate); + serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null); } if (!medRequestList.isEmpty()) { // 更新药品请求状态待发送 medicationRequestService.updateDraftStatusBatch( - medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate); + medRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, null); } return R.ok(null, "退回成功"); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java index e12a5bd29..8d06a4c0b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java @@ -256,7 +256,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS } 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) { // 判断是否全部取消执行 boolean exists = serviceRequestMapper.exists(new LambdaQueryWrapper() diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index f82249eee..0d7d40e8f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -1059,7 +1059,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } if (!medicineRequestIds.isEmpty()) { // 根据请求id更新请求状态 - iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null); + iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null, null); } if (!activityRequestIds.isEmpty()) { // 根据请求id更新请求状态 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java index 2194e1623..88e3320be 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java @@ -78,9 +78,6 @@ public class MedicationRequestServiceImpl extends ServiceImpl serviceRequestIdList, Long practitionerId, Date checkDate) { + public void updateDraftStatus(List serviceRequestIdList, Long practitionerId, Date checkDate, String backReason) { baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue()) .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()), new LambdaUpdateWrapper().in(ServiceRequest::getId, serviceRequestIdList)