From 7d0400b8af1950f81c66a3d58649a6b2d66b158d Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Fri, 21 Jun 2019 11:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 56617e3..1117c1f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1913,16 +1913,19 @@ public class MatDeliverFacade { // 高危等级 String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel(); - List patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is("1")), Patients.class); - List patientIds = new ArrayList<>(); - for (Patients patient : patientGaoweis) { - patientIds.add(patient.getId()); - } - List parentIdList1 = matDeliverQuery.getParentIdList(); - if (CollectionUtils.isNotEmpty(parentIdList1)) { - patientIds.addAll(parentIdList1); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highRiskLevel)) { + + List patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is(1)), Patients.class); + List patientIds = new ArrayList<>(); + for (Patients patient : patientGaoweis) { + patientIds.add(patient.getId()); + } + List parentIdList1 = matDeliverQuery.getParentIdList(); + if (CollectionUtils.isNotEmpty(parentIdList1)) { + patientIds.addAll(parentIdList1); + } + matDeliverQuery.setParentIdList(patientIds); } - matDeliverQuery.setParentIdList(patientIds); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 -- 1.8.3.1