From 80dc3b55853f5eea1c40acc99d87e06c4118bd9b Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Sat, 11 May 2019 18:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=8A=A5=E4=BA=A7=E7=AD=9B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/query/SieveQuery.java  |  6 +++---
 .../platform/operate/web/facade/annualReportFacade.java    | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
index 2521ddb..db5601d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
@@ -419,9 +419,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != applyTimeStart) {
             if (null != c1) {
-                c1 = c1.and("applyTime").gte(applyTimeStart);
+                c1 = c1.and("applyDate").gte(applyTimeStart);
             } else {
-                c1 = Criteria.where("applyTime").gte(applyTimeStart);
+                c1 = Criteria.where("applyDate").gte(applyTimeStart);
             }
         }
 
@@ -429,7 +429,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
             if (c1 != null) {
                 c1 = c1.lte(applyTimeEnd);
             } else {
-                c1 = Criteria.where("applyTime").lte(applyTimeEnd);
+                c1 = Criteria.where("applyDate").lte(applyTimeEnd);
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
index fdc6430..bf5a5da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
@@ -600,15 +600,14 @@ public class annualReportFacade {
                 sieveQuery.setHospitalIds(entry.getValue());
                 sieveQuery.setStatuses(sieveList);
                 int sieveCount = sieveService.queryListCount(sieveQuery);
-                System.out.println("========>" + entry.getKey() + "=======>" + sieveCount);
                 map.put("sieveCount", String.valueOf(sieveCount));
                 map.put("sievePervent", this.division(sieveCount, antexMap.size()));
                 //高危人数
                 SieveQuery sieveGwQuery = new SieveQuery();
                 sieveGwQuery.setYn(1);
                 if (StringUtils.isNotEmpty(time)) {
-                    sieveGwQuery.setCreatedStart(DateUtil.getSNDate(time)[0]);
-                    sieveGwQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]);
+                    sieveGwQuery.setApplyTimeStart(DateUtil.getSNDate(time)[0]);
+                    sieveGwQuery.setApplyTimeEnd(DateUtil.getSNDate(time)[1]);
                 }
                 sieveGwQuery.setHospitalIds(entry.getValue());
                 sieveGwQuery.setStatuses(sieveGWList);
@@ -621,8 +620,8 @@ public class annualReportFacade {
                 SieveQuery diacrisisQuery = new SieveQuery();
                 diacrisisQuery.setYn(1);
                 if (StringUtils.isNotEmpty(time)) {
-                    diacrisisQuery.setCreatedStart(DateUtil.getSNDate(time)[0]);
-                    diacrisisQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]);
+                    diacrisisQuery.setApplyTimeStart(DateUtil.getSNDate(time)[0]);
+                    diacrisisQuery.setApplyTimeStart(DateUtil.getSNDate(time)[1]);
                 }
                 diacrisisQuery.setHospitalIds(entry.getValue());
                 diacrisisQuery.setStatus(4);
@@ -634,8 +633,8 @@ public class annualReportFacade {
                 SieveQuery diacrisis = new SieveQuery();
                 diacrisis.setYn(1);
                 if (StringUtils.isNotEmpty(time)) {
-                    diacrisis.setCreatedStart(DateUtil.getSNDate(time)[0]);
-                    diacrisis.setCreatedEnd(DateUtil.getSNDate(time)[1]);
+                    diacrisis.setApplyTimeStart(DateUtil.getSNDate(time)[0]);
+                    diacrisis.setApplyTimeStart(DateUtil.getSNDate(time)[1]);
                 }
                 diacrisis.setHospitalIds(entry.getValue());
                 diacrisis.setStatus(4);
@@ -820,7 +819,6 @@ public class annualReportFacade {
                 //巨大儿数
                 map.put("bigBoyCount", String.valueOf(bigBoyCount));
                 map.put("bigBoyPervent", this.division(bigBoyCount, huoChanCount));
-
                 int zcBabyCount = 0;
                 PatientsQuery patientsQuery1 = new PatientsQuery();
                 patientsQuery1.setYn(YnEnums.YES.getId());
-- 
1.8.3.1