From 066c2b87347c49b0b99cc653507b5e619b77d2f5 Mon Sep 17 00:00:00 2001
From: litao <Lt123456>
Date: Sun, 25 Jun 2017 19:25:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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 53cd884..4ed4faa 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
@@ -474,18 +474,22 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 }
             }
 
-        }
-
-        if(CollectionUtils.isNotEmpty(couponReport)) {
-            param.put("status", 2);
-            List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
-            for (Map<String, Object> m : couponReport) {
-                for (Map<String, Object> info : couponUsedTypeInfo) {
-                    if(m.get("hospitalId").toString().equals(info.get("used_hospital_id"))) {
-                        m.put(info.get("type") + "_" + info.get("coupon_order"), info.get("type_used_count"));
+            if(CollectionUtils.isNotEmpty(couponReport)) {
+                param.put("status", 2);
+                List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
+                for (Map<String, Object> m : couponReport) {
+                    for (Map<String, Object> info : couponUsedTypeInfo) {
+                        if(m.get("hospitalId").toString().equals(info.get("used_hospital_id"))) {
+                            m.put(info.get("type") + "_" + info.get("coupon_order"), info.get("type_used_count"));
+                        }
                     }
                 }
             }
+
+            /** 查询医院所绑定的type和coupon_order */
+            List<String> key = couponMapper.findCouponTitleByTemp(param);
+            setZeroDataByTemp(key, couponReport);
+
         }
 
         ReportModel reportModel = new ReportModel();
@@ -494,10 +498,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         reportModel.setSeries(createSeries(couponReport));
         reportModel.doMerge();
 
-        /** 查询医院所绑定的type和coupon_order */
-        List<String> key = couponMapper.findCouponTitleByTemp(param);
-        setZeroDataByTemp(key, couponReport);
-
         Map<String, Object> titleMap = parseTitle(couponReport);
         transNullToZero(couponReport, titleMap);
 
-- 
1.8.3.1