From 3a4016dcd5c0553e000b858953bf69679466403a Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 15:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AreaCountFacade.java        | 55 +++++++++++++---------
 1 file changed, 33 insertions(+), 22 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 2e2a7ff..9c51e12 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
@@ -1505,6 +1505,10 @@ public class AreaCountFacade {
         healthChargeQuery.setCreatedStart(startTime);
         healthChargeQuery.setCreatedEnd(endTime);
         healthChargeQuery.setYn(YnEnums.YES.getId());
+        healthChargeQuery.setLimit(query.getLimit());
+        healthChargeQuery.setOffset(query.getOffset());
+        healthChargeQuery.setPage(query.getPage());
+        healthChargeQuery.setLastPage(query.getLastPage());
         if (StringUtils.isNotEmpty(reportNameType)) {
             healthChargeQuery.setHealthType(Integer.parseInt(reportNameType));
         }
@@ -1653,26 +1657,16 @@ public class AreaCountFacade {
         }
 
         List<String> hospitalIds = getHospitalIds(query);
-
         HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
-        //   1体重 2 血糖 3 血压 4妊高症 5-儿童
-        String reportNameType = query.getReportNameType();
-        if (StringUtils.isEmpty(reportNameType)){
-            List<Integer> list = new ArrayList<>();
-            list.add(1);
-            list.add(2);
-            list.add(3);
-            list.add(5);
-            healthChargeQuery.setRemianType(list);
-        }
+        setHealthType(query, healthChargeQuery);
         healthChargeQuery.setNeed("true");
         List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery);
+
         LinkedList<Map<String, Object>> linkedList = new LinkedList<>();
         if (CollectionUtils.isNotEmpty(healthChargeModels)){
             for (HealthChargeModel model : healthChargeModels){
                 HashMap<String, Object> map = getStringObjectHashMap(model, false);
                 linkedList.add(map);
-
             }
         }
 
@@ -1682,6 +1676,31 @@ public class AreaCountFacade {
         return baseListResponse;
     }
 
+    /**
+     * 设置healthChargeQuery 对象中healthType值
+     *
+     * @param query
+     * @param healthChargeQuery
+     */
+    private void setHealthType(HealthManagerListRequest query, HealthChargeQuery healthChargeQuery) {
+        //   1体重 2 血糖 3 血压 4妊高症 5-儿童
+        String reportNameType = query.getReportNameType();
+        if (StringUtils.isEmpty(reportNameType)) {
+            List<Integer> list = new ArrayList<>();
+            list.add(1);
+            list.add(2);
+            list.add(3);
+            list.add(5);
+            healthChargeQuery.setRemianType(list);
+        }
+    }
+
+    /**
+     * 获取医院ids
+     *
+     * @param query
+     * @return
+     */
     private List<String> getHospitalIds(HealthManagerListRequest query) {
         String hospitalId = query.getHospitalId();
         String provinceId = query.getProvinceId();
@@ -1699,7 +1718,7 @@ public class AreaCountFacade {
     }
 
     /**
-     * 挑选需要的数据
+     * 挑选需要的数据/healthManagerDetail/list
      *
      * @param model
      * @return
@@ -1799,15 +1818,7 @@ public class AreaCountFacade {
 
         HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
         //   1体重 2 血糖 3 血压 4妊高症 5-儿童
-        String reportNameType = query.getReportNameType();
-        if (StringUtils.isEmpty(reportNameType)){
-            List<Integer> list = new ArrayList<>();
-            list.add(1);
-            list.add(2);
-            list.add(3);
-            list.add(5);
-            healthChargeQuery.setRemianType(list);
-        }
+        setHealthType(query, healthChargeQuery);
         List<HealthChargeModel> healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery);
         LinkedList<Map<String, Object>> linkedList = new LinkedList<>();
 
-- 
1.8.3.1