diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index ee0f18de..a9c91436 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -640,7 +640,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer return R.fail("标本已采集,无法撤回"); } - // 校验:有已签发(status=2)的医嘱可撤回(与SQL的EXISTS逻辑一致,允许多项申请单中部分为待签发) + // 校验:任一ServiceRequest为ACTIVE(status=2)即可撤回,与SQL的EXISTS逻辑一致 boolean hasActive = serviceRequests.stream() .anyMatch(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum())); if (!hasActive) {