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

Merge branch 'zhaoyun' of http://192.168.110.253:3000/wangyizhe/his into zhaoyun

Browse Source 
# Conflicts:
#	openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
This commit is contained in:
赵云
2026-05-22 12:17:13 +08:00
parent d9913d2182 adf475c5eb
commit ba40d0087f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
View File

@@ -632,26 +632,24 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
return R.fail("未找到关联的诊疗医嘱");
}
List<Long> serviceRequestIds = serviceRequests.stream()
// 筛选出ACTIVE状态的ServiceRequest，与SQL的EXISTS逻辑一致
List<Long> activeServiceRequestIds = serviceRequests.stream()
.filter(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum()))
.map(ServiceRequest::getId).collect(Collectors.toList());
// 校验：标本已采集则不可撤回
if (hasCollectedSpecimen(serviceRequestIds)) {
return R.fail("标本已采集，无法撤回");
if (activeServiceRequestIds.isEmpty()) {
return R.fail("只有已签发且未采证的申请单可撤回");
}
// 校验：任一ServiceRequest为ACTIVE(status=2)即可撤回，与SQL的EXISTS逻辑一致
boolean hasActive = serviceRequests.stream()
.anyMatch(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum()));
if (!hasActive) {
return R.fail("只有已签发且未采证的申请单可撤回");
// 校验：仅检查ACTIVE状态医嘱的标本采集情况，与SQL的computed_status逻辑一致
if (hasCollectedSpecimen(activeServiceRequestIds)) {
return R.fail("标本已采集，无法撤回");
}
// 将所有已签发的 ServiceRequest 状态改回待签发，与申请单展示状态同步
boolean updated = iServiceRequestService.update(
new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue()),
new LambdaUpdateWrapper<ServiceRequest>()
.in(ServiceRequest::getId, serviceRequestIds)
.in(ServiceRequest::getId, activeServiceRequestIds)
.eq(ServiceRequest::getStatusEnum, RequestStatus.ACTIVE.getValue()));
if (!updated) {
return R.fail("撤回失败，医嘱状态已变更，请刷新后重试");