diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 41b8d92..f20a4a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -5497,6 +5497,11 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientses = patientsService.queryPatient1(patientsQuery, "created"); + if (!CollectionUtils.isNotEmpty(patientses)) + { + return new BaseListResponse().setData(riskList). + setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); + } } List patientIds = new ArrayList<>(); @@ -5507,10 +5512,7 @@ public class AntenatalExaminationFacade { patientIds.add(pat.getId()); } } - else - { - return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); - } + Query query = new Query(); if (CollectionUtils.isNotEmpty(patientIds)) {