From a77d1f0a38c18a364d734f3f4d2069ca1cc8b334 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Thu, 20 Jun 2019 14:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 31 +++++++++++++---------
 1 file changed, 19 insertions(+), 12 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..e599bc7 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
@@ -1844,9 +1844,14 @@ public class MatDeliverFacade {
         //   年龄段
         if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(startAge) &&
                 com.lyms.platform.common.utils.StringUtils.isNotEmpty(endAge)) {
-            long startTime = System.currentTimeMillis() - Integer.parseInt(startAge) * 356 * 24 * 60 * 60 * 1000;
-            long endTime = System.currentTimeMillis() - Integer.parseInt(endAge) * 356 * 24 * 60 * 60 * 1000;
-            List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(new Date(startTime)).and("birth").lte(new Date(endTime))), PersonModel.class);
+            Calendar c = Calendar.getInstance();
+            c.setTime(new Date());
+            c.add(Calendar.YEAR, -Integer.parseInt(startAge));
+            Date startDate = c.getTime();
+            c.setTime(new Date());
+            c.add(Calendar.YEAR, - Integer.parseInt(endAge));
+            Date endDate = c.getTime();
+            List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lte(startDate)), PersonModel.class);
             for (PersonModel model : personModels) {
                 pids.add(model.getId());
             }
@@ -1913,16 +1918,18 @@ public class MatDeliverFacade {
 
         //  高危等级
         String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel();
-        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);
+        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);
+            }
+            matDeliverQuery.setParentIdList(patientIds);
         }
-        matDeliverQuery.setParentIdList(patientIds);
 
 
         if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页
-- 
1.8.3.1