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 f20a4a4..60c988d 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 @@ -5494,26 +5494,23 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; + List patientIds = new ArrayList<>(); if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientses = patientsService.queryPatient1(patientsQuery, "created"); - if (!CollectionUtils.isNotEmpty(patientses)) + if (CollectionUtils.isEmpty(patientses)) { return new BaseListResponse().setData(riskList). setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); } - } - - List patientIds = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(patientses)) - { - for (Patients pat : patientses) + else { - patientIds.add(pat.getId()); + for (Patients pat : patientses) + { + patientIds.add(pat.getId()); + } } } - - Query query = new Query(); if (CollectionUtils.isNotEmpty(patientIds)) { query.addCriteria(Criteria.where("patientId").in(patientIds)); @@ -5530,11 +5527,11 @@ public class AntenatalExaminationFacade { query.addCriteria(Criteria.where("status").is(antExManagerQueryRequest.getStatus())); } - if (antExManagerQueryRequest.getLevel() != null) { + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getLevel())) { query.addCriteria(Criteria.where("hLevel").in(antExManagerQueryRequest.getLevel())); } - if (antExManagerQueryRequest.getRiskFactorId() != null) { + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getRiskFactorId())) { query.addCriteria(Criteria.where("hRisk").in(com.lyms.platform.common.utils.StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class))); }