From 63f07d5676ad7d3adcf7c0b2a38d63a76c66d1c3 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Wed, 7 Jun 2017 13:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E=E5=A6=87=E5=B9=BCLis?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml              | 6 ------
 .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java   | 1 -
 2 files changed, 7 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 a783fef..a55090f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -230,12 +230,6 @@
             </foreach>
         ) b
         where a.used_hospital_id = b.hospital_id and a.coupon_template_id = b.id and a.status = 2
-        <if test="startDate != null">
-            and a.use_date >= #{startDate}
-        </if>
-        <if test="endDate != null">
-            and a.use_date <![CDATA[ < ]]> #{endDate}
-        </if>
         group by b.coupon_order, b.type, a.used_hospital_id
     </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 699b40f..35b382c 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
@@ -110,7 +110,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         /** 产后 */
         couponReportMap.put("3_1", "<div class='ag-double-line'>产后建档券<div>使用人次</div></div>");
         couponReportMap.put("4_1", "<div class='ag-double-line'>分娩券<div>使用人次</div></div>");
-        couponReportMap.put("5_1", "<div class='ag-double-line'>出院小结券<div>使用人次</div></div>");
         couponReportMap.put("6_1", "<div class='ag-double-line'>42天访视券<div>使用人次</div></div>");
         couponReportMap.put("6_2", "<div class='ag-double-line'>产后复查券(一)<div>使用人次</div></div>");
         couponReportMap.put("6_3", "<div class='ag-double-line'>产后复查券(二)<div>使用人次</div></div>");
-- 
1.8.3.1