From eb8bec94cb16fd9db1445a4c006282c2663dfadc Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Fri, 31 May 2019 21:37:25 +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

---
 .../com/lyms/platform/query/HealthChargeQuery.java |  8 ++---
 .../operate/web/facade/AreaCountFacade.java        | 39 +++++++++++++---------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java
index 9aece30..41cd8c6 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java
@@ -66,13 +66,13 @@ public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuer
 
     private List<String> hospitalIds;
 
-    private String remianType;
+    private List<Integer> remianType;
 
-    public String getRemianType() {
+    public List<Integer> getRemianType() {
         return remianType;
     }
 
-    public void setRemianType(String remianType) {
+    public void setRemianType(List<Integer> remianType) {
         this.remianType = remianType;
     }
 
@@ -134,7 +134,7 @@ public class HealthChargeQuery extends BaseQuery implements IConvertToNativeQuer
             condition = condition.and("chargeRecordId", chargeRecordId, MongoOper.IS);
         }
         if (null != remianType) {
-            condition = condition.and("healthType", remianType, MongoOper.NE);
+            condition = condition.and("healthType", remianType, MongoOper.IN);
         }
 
         if (null != healthType) {
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 176d693..2e2a7ff 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
@@ -1657,17 +1657,20 @@ public class AreaCountFacade {
         HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
         //   1体重 2 血糖 3 血压 4妊高症 5-儿童
         String reportNameType = query.getReportNameType();
-        if (!"1".equals(reportNameType) &&
-                (!"2".equals(reportNameType)) &&
-                (!"3".equals(reportNameType)) &&
-                (!"5".equals(reportNameType))){
-            healthChargeQuery.setRemianType("4");
-        }
+        if (StringUtils.isEmpty(reportNameType)){
+            List<Integer> list = new ArrayList<>();
+            list.add(1);
+            list.add(2);
+            list.add(3);
+            list.add(5);
+            healthChargeQuery.setRemianType(list);
+        }
+        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);
+                HashMap<String, Object> map = getStringObjectHashMap(model, false);
                 linkedList.add(map);
 
             }
@@ -1701,7 +1704,7 @@ public class AreaCountFacade {
      * @param model
      * @return
      */
-    private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model) {
+    private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model, boolean isExport) {
         Date createDate = model.getCreated();
         String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = "";
         //  类型 1-体重 2-。。。
@@ -1756,7 +1759,11 @@ public class AreaCountFacade {
             }
         }
         HashMap<String, Object> map = new HashMap<>(16);
-        map.put("createDate", createDate);
+        if (isExport){
+            map.put("createDate", DateUtil.getyyyy_MM_dd(createDate));
+        }else {
+            map.put("createDate",createDate);
+        }
         map.put("patientName", name);
         map.put("healthType", healthTypeName);
         map.put("type", typeName);
@@ -1793,18 +1800,20 @@ public class AreaCountFacade {
         HealthChargeQuery healthChargeQuery = getHealthChargeQuery(query, startTime, endTime, hospitalIds);
         //   1体重 2 血糖 3 血压 4妊高症 5-儿童
         String reportNameType = query.getReportNameType();
-        if (!"1".equals(reportNameType) &&
-                (!"2".equals(reportNameType)) &&
-                (!"3".equals(reportNameType)) &&
-                (!"5".equals(reportNameType))){
-            healthChargeQuery.setRemianType("4");
+        if (StringUtils.isEmpty(reportNameType)){
+            List<Integer> list = new ArrayList<>();
+            list.add(1);
+            list.add(2);
+            list.add(3);
+            list.add(5);
+            healthChargeQuery.setRemianType(list);
         }
         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);
+                HashMap<String, Object> map = getStringObjectHashMap(model, true);
                 linkedList.add(map);
 
             }
-- 
1.8.3.1