From df8683037e8860c2a59b263436cff38c7bea936a Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Thu, 25 Jul 2019 16:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E7=AD=89=E7=BA=A7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 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 1d00cb9..3263289 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
@@ -1796,6 +1796,7 @@ public class MatDeliverFacade {
                 || StringUtils.isNotEmpty(matdeliverFollowRequest.getCityId())//居住地市
                 || StringUtils.isNotEmpty(matdeliverFollowRequest.getAreaId())//居住区
                 || StringUtils.isNotEmpty(matdeliverFollowRequest.getStreetId())//居住街道
+                || StringUtils.isNotEmpty(matdeliverFollowRequest.getHighRiskLevel()) // 高危等级
         ) {
             PatientsQuery patientsQuery = new PatientsQuery();
             patientsQuery.setQueryNo(matdeliverFollowRequest.getQueryNo());
@@ -1824,6 +1825,10 @@ public class MatDeliverFacade {
             //patientsQuery.setFmHospitalQueryList(hospitalList);
             //patientsQuery.setTownOrgId(hospitalId);
 
+            String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel();
+            if (StringUtils.isNotEmpty(highRiskLevel)) {
+                patientsQuery.setrLevel(highRiskLevel);
+            }
             List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
             if (CollectionUtils.isEmpty(patientsList)) {
                 // 没有查到，直接抛出
@@ -1908,25 +1913,6 @@ public class MatDeliverFacade {
             matDeliverQuery.setParentIdList(idList);
         }
 
-        //  高危等级
-        String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel();
-        if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highRiskLevel)) {
-
-            List<Patients> patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is(1)), Patients.class);
-            List<String> patientIds = new ArrayList<>();
-            for (Patients patient : patientGaoweis) {
-                patientIds.add(patient.getId());
-            }
-            List<String> parentIdList1 = matDeliverQuery.getParentIdList();
-            if (CollectionUtils.isNotEmpty(parentIdList1)) {
-                patientIds.addAll(parentIdList1);
-                parentIdList1.retainAll(parentIdList1);
-            } else {
-                parentIdList1 = patientIds;
-            }
-            matDeliverQuery.setParentIdList(parentIdList1);
-        }
-
 
         Criteria criteria = matDeliverQuery.convertToQuery().getCriteria();
         criteria.and("visitResult").exists(true).in(1, 2);
-- 
1.8.3.1