From d872ec2c4979a9b438fdc182a231aa06dd8db974 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 16 Nov 2017 10:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/CouponMapper.xml | 41 +++++++++++-----------
 .../web/service/impl/ReportServiceImpl.java        |  6 ++++
 2 files changed, 27 insertions(+), 20 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 d282224..56b93d3 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -396,26 +396,27 @@
 
     <select id="findCouponInfoCount" parameterType="map" resultType="integer">
         select count(1) from (
-        select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id
-        from coupon_info a, coupon_template b, coupon_type c, organization d
-        where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.status = 2
-        and a.used_hospital_id in
-        <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
-            #{hid}
-        </foreach>
-        and c.type in
-        <foreach collection="couponType" open="(" close=")" separator="," item="type">
-            #{type}
-        </foreach>
-        <if test="coupon_order != null">
-            and b.coupon_order = #{coupon_order}
-        </if>
-        <if test="startDate != null">
-            and a.use_date >= #{startDate}
-        </if>
-        <if test="endDate != null">
-            and a.use_date <![CDATA[ < ]]> #{endDate}
-        </if>
+            select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id
+            from coupon_info a, coupon_template b, coupon_type c, organization d
+            where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id
+            and a.status = 2
+            and a.used_hospital_id in
+            <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+                #{hid}
+            </foreach>
+            and c.type in
+            <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                #{type}
+            </foreach>
+            <if test="coupon_order != null">
+                and b.coupon_order = #{coupon_order}
+            </if>
+            <if test="startDate != null">
+                and a.create_date >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date <![CDATA[ < ]]> #{endDate}
+            </if>
         ) a
     </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 a45505c..9d71800 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
@@ -177,6 +177,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         couponDescMap.put(8, "儿童保健券");
     }
 
+    /**
+     * 建档统计
+     * @param ageType  1=全部年龄   2=20岁以下     3=20-30岁    4=30-40岁    5=40岁以上
+     * @param patientType  建档孕周  1=孕早期  2=孕中期   3=孕晚期
+     * @return
+     */
     @Override
     public BaseObjectResponse patients(String provinceId, String cityId, String aredId, String streetId, Integer ageType, Integer patientType, Date startDate, Date endDate, Integer userId) {
         List<String> hospitals = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId);
-- 
1.8.3.1