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

This reverts commit a77d1f0a
---
 .../operate/web/facade/MatDeliverFacade.java       | 31 +++++++++-------------
 1 file changed, 12 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 e599bc7..56617e3 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,14 +1844,9 @@ public class MatDeliverFacade {
         //   年龄段
         if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(startAge) &&
                 com.lyms.platform.common.utils.StringUtils.isNotEmpty(endAge)) {
-            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);
+            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);
             for (PersonModel model : personModels) {
                 pids.add(model.getId());
             }
@@ -1918,18 +1913,16 @@ public class MatDeliverFacade {
 
         //  高危等级
         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);
-            }
-            matDeliverQuery.setParentIdList(patientIds);
+        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);
 
 
         if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页
-- 
1.8.3.1