From 4fc24125c563d06121049f3f3a68e97a0a2894b9 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 24 Oct 2017 09:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=8A=82=E7=82=B9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AreaCountFacade.java        | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index ee94546..26d4cbe 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -414,8 +414,10 @@ public class AreaCountFacade {
 
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setNeed("true");
+        patientsQuery.setPage(page);
+        patientsQuery.setLimit(limit);
         List<Map<String,Object>> list = getCheckPointList( time,  hospitalId,
-                 provinceId,  cityId,  areaId,  page,  limit,  userId,patientsQuery);
+                 provinceId,  cityId,  areaId,    userId,patientsQuery);
 
         return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(patientsQuery.getPageInfo());
     }
@@ -424,7 +426,7 @@ public class AreaCountFacade {
 
     private List getCheckPointList(String time, String hospitalId,
                                    String provinceId, String cityId,
-                                   String areaId, Integer page, Integer limit,
+                                   String areaId,
                                    Integer userId,PatientsQuery patientsQuery)
     {
         List<String> hospitalIds = new ArrayList<>();
@@ -462,8 +464,7 @@ public class AreaCountFacade {
         patientsQuery.setExtEnable(false);
 
 
-        patientsQuery.setPage(page);
-        patientsQuery.setLimit(limit);
+
 
         List<Map<String,Object>> list = new ArrayList<>();
         //建档人数
@@ -524,9 +525,8 @@ public class AreaCountFacade {
                                                Integer userId, HttpServletResponse httpServletResponse) {
 
         PatientsQuery patientsQuery = new PatientsQuery();
-        patientsQuery.setNeed("true");
         List<Map<String,Object>> list = getCheckPointList( time,  hospitalId,
-                provinceId,  cityId,  areaId,  null,  null,  userId,patientsQuery);
+                provinceId,  cityId,  areaId,   userId,patientsQuery);
 
         List<Map<String,Object>> results = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list))
@@ -578,9 +578,12 @@ public class AreaCountFacade {
                                        Integer page, Integer limit, Integer userId, Integer nodeName)
     {
         AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
+        antExRecordQuery.setPage(page);
+        antExRecordQuery.setLimit(limit);
+        antExRecordQuery.setNeed("true");
         List<Map> results = getCheckDetailData( nodeType,  time,  hospitalId,
              provinceId,  cityId,  areaId,
-             page,  limit,  userId,  nodeName, "true",antExRecordQuery);
+              userId,  nodeName, antExRecordQuery);
 
         return new BaseListResponse().setData(results).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(antExRecordQuery.getPageInfo());
     }
@@ -588,7 +591,7 @@ public class AreaCountFacade {
 
     public List<Map> getCheckDetailData(Integer nodeType, String time, String hospitalId,
                                         String provinceId, String cityId, String areaId,
-                                        Integer page, Integer limit, Integer userId, Integer nodeName,String needPage,  AntExRecordQuery antExRecordQuery)
+                                        Integer userId, Integer nodeName,  AntExRecordQuery antExRecordQuery)
     {
 
         List<String> hospitalIds = new ArrayList<>();
@@ -615,9 +618,7 @@ public class AreaCountFacade {
         antExRecordQuery.setBuildTimeStart(startTime);
         antExRecordQuery.setBuildTimeEnd(endTime);
         antExRecordQuery.setHospitalList(hospitalIds);
-        antExRecordQuery.setPage(page);
-        antExRecordQuery.setLimit(limit);
-        antExRecordQuery.setNeed(needPage);
+
         if (nodeType != null && nodeType == 1)
         {
             antExRecordQuery.setIsFirst(nodeType);
@@ -805,7 +806,7 @@ public class AreaCountFacade {
         AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
         List<Map> ticketList = getCheckDetailData( nodeType,  time,  hospitalId,
                     provinceId,  cityId,  areaId,
-                    null,  null,  userId,  nodeName, null,antExRecordQuery);
+                      userId,  nodeName,antExRecordQuery);
 
         List<Map<String,Object>> results = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(ticketList))
-- 
1.8.3.1