From 149b0faab8ef4185c6c2e1cb788e9507b991e6c1 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 26 Jun 2017 12:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BD=BF=E7=94=A8/=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE=E4=BA=BA=E6=95=B0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml        |  4 ++--
 .../platform/operate/web/service/impl/ReportServiceImpl.java  | 11 +++++------
 2 files changed, 7 insertions(+), 8 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 43cfbd7..83b3e82 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -239,7 +239,7 @@
         group by b.coupon_order, b.type, a.used_hospital_id
     </select>
 
-    <select id="findUsedUserIds" parameterType="map" resultType="lists">
+    <select id="findUsedUserIds" parameterType="map" resultType="string">
         select distinct(b.user_id)
         from organization a, coupon_info b, coupon_template c, coupon_type d
         where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
@@ -273,7 +273,7 @@
         </if>
     </select>
 
-    <select id="findSendUserIds" parameterType="map" resultType="list">
+    <select id="findSendUserIds" parameterType="map" resultType="string">
         select distinct(b.user_id)
         from organization a, coupon_info b, coupon_template c, coupon_type d
         where a.id = b.create_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
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 36d0e1c..fe5deac 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
@@ -468,14 +468,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                     Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo(param);
 
                     Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param);
-                    /** 方法/使用人数id */
-                    List<String> sendUserIds = couponMapper.findSendUserIds(param);
-                    List<String> usedUserIds = couponMapper.findUsedUserIds(param);
-                    tempMap.put("sendUserIds", sendUserIds);
-                    tempMap.put("usedUserIds", usedUserIds);
-
 
                     if(MapUtils.isNotEmpty(tempMap)) {
+                        /** 方法/使用人数id */
+                        List<String> sendUserIds = couponMapper.findSendUserIds(param);
+                        List<String> usedUserIds = couponMapper.findUsedUserIds(param);
+                        tempMap.put("sendUserIds", sendUserIds);
+                        tempMap.put("usedUserIds", usedUserIds);
                         couponReport.add(tempMap);
                     }
                 }
-- 
1.8.3.1