From e18635ffa3d555b625eb23c3e91dde33c6da7815 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Wed, 7 Jun 2017 09:51:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20null=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml  |  8 ++++----
 .../operate/web/service/impl/ReportServiceImpl.java     | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index d84bb74..88261ae 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -246,10 +246,10 @@
             and f.id = #{tempId}
         </if>
         <if test="startDate != null">
-            and b.create_date >= #{startDate}
+            and b.use_date >= #{startDate}
         </if>
         <if test="endDate != null">
-            and b.create_date <![CDATA[ < ]]> #{endDate}
+            and b.use_date <![CDATA[ < ]]> #{endDate}
         </if>
     </select>
 
@@ -266,10 +266,10 @@
             and f.id = #{tempId}
         </if>
         <if test="startDate != null">
-            and b.used_hospital_id >= #{startDate}
+            and b.create_date >= #{startDate}
         </if>
         <if test="endDate != null">
-            and b.used_hospital_id <![CDATA[ < ]]> #{endDate}
+            and b.create_date <![CDATA[ < ]]> #{endDate}
         </if>
     </select>
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index d32cdbd..7643a25 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -486,6 +486,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         reportModel.doMerge();
 
         Map<String, Object> titleMap = parseTitle(couponReport);
+        transNullToZero(couponReport, titleMap);
 
         return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", titleMap, "reportModel", reportModel);
         //        return RespBuilder.buildSuccess(couponReport);
@@ -589,7 +590,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             tempMap.put("area_name", areaName);
 
             /** 没传区县 报表数据就为区域的  */
-            if(param.get("area_id") == null) {
+            if(param.get("areaId") == null) {
                 xAxis.add(areaName);
             } else { /** 传了区县 报表数据就为医院 */
                 xAxis.add((String) hNameMap.get(hid));
@@ -608,6 +609,20 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         param.put("hospitalId", hospitalIds);
     }
 
+    private void transNullToZero(List<Map<String, Object>> couponReport, Map<String, Object> titleMap) {
+        if(org.apache.commons.collections.CollectionUtils.isNotEmpty(couponReport)
+                && org.apache.commons.collections.MapUtils.isNotEmpty(titleMap))
+            for (Map<String, Object> coupon : couponReport) {
+                Set<String> set = titleMap.keySet();
+                for (String s : set) {
+                    if(coupon.get(s) == null) {
+                        coupon.put(s, 0);
+                    }
+                }
+            }
+    }
+
+
     private Map<String,Object> parseTitle(List<Map<String, Object>> couponReport) {
         Map<String, Object> titleMap = new HashMap<>();
         for (Map<String, Object> map : couponReport) {
-- 
1.8.3.1