From d187cd9b8298167161679a8ae0cb6a8330269f57 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Wed, 7 Jun 2017 14:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/CouponMapper.java        |  2 ++
 .../main/resources/mainOrm/master/CouponMapper.xml | 30 ++++++++++++++++++++--
 .../web/service/impl/ReportServiceImpl.java        | 19 ++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
index b546916..4e7d701 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
@@ -74,4 +74,6 @@ public interface CouponMapper {
     List<Map<String, Object>> findHospitalNames(List<String> ids);
 
     Map<String,Object> findHospitalSendInfo(Map<String, Object> param);
+
+    List<Map<String,Object>> couponInfo(Map<String, Object> param);
 }
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 a55090f..8bc7496 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -230,6 +230,12 @@
             </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>
 
@@ -293,7 +299,27 @@
         select phone from users where id = #{id}
     </select>
 
-    <select id="findCouponInfo" parameterType="map" resultType="map">
+    <select id="couponInfo" parameterType="map" resultType="map">
+        select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_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.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="startDate != null">
+            and a.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and a.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        limit #{currentPage},#{pageSize}
+    </select>
+   <!-- <select id="findCouponInfo" parameterType="map" resultType="map">
         select c.type, a.sequence_id, d.name, e.name as send_hospital, a.use_date, a.used_id, b.coupon_order
         from coupon_info a, coupon_template b, coupon_type c, users d, organization e, hospital_coupon_template_group f
         where a.coupon_template_id = b.id and b.type_id = c.id and a.user_id = d.id and a.status=2 and a.create_hospital_id = e.id
@@ -315,7 +341,7 @@
             and f.coupon_template_group_id = #{tempId}
         </if>
         limit #{currentPage},#{pageSize}
-    </select>
+    </select>-->
 
     <select id="findCouponInfoCount" parameterType="map" resultType="integer">
         select count(1) from (
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 35b382c..57b7c33 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,6 +110,7 @@ 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>");
@@ -689,7 +690,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         if(param.get("hospitalId") == null) {
             return RespBuilder.buildSuccess(new PageResult(0, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", new ArrayList<>())));
         }
-        List<Map<String, Object>> couponInfos = couponMapper.findCouponInfo(param);
+        List<Map<String, Object>> couponInfos = couponMapper.couponInfo(param);
         if(CollectionUtils.isNotEmpty(couponInfos)) {
             for (Map<String, Object> couponInfo : couponInfos) {
                 String desc = (String) couponReportMap.get(couponInfo.get("type") + "_" + couponInfo.get("coupon_order"));
@@ -701,8 +702,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                             .replace("</div>", "");
                     couponInfo.put("type_desc", s);
                 }
-
+                couponInfo.put("use_date", DateUtil.getYmd((Date) couponInfo.get("use_date")));
                 setUsedInfo(couponInfo);
+                /** 设置产检日期、姓名、产检孕周、产检第次、产检机构、产检医生、联系电话 */
+                setUsedInfo((String) couponInfo.get("type"),
+                            (String) couponInfo.get("used_id"),
+                            (String) couponInfo.get("sequence_id")
+                    );
             }
         }
         int count = couponMapper.findCouponInfoCount(param);
@@ -710,6 +716,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         return RespBuilder.buildSuccess(pageResult);
     }
 
+    private void setUsedInfo(String type, String used_id, String sequence_id) {
+        Date checkDate = null;
+        String name = null;
+        Integer number = null;
+        if("1".equals(type)) {
+            Patients one = mongoTemplate.findOne(Query.query(Criteria.where("1").is("1")), Patients.class);
+        }
+    }
+
     @Override
     public void exportCouponInfo(Map<String, Object> param, HttpServletResponse response) {
         BaseObjectResponse resp = couponInfo(param);
-- 
1.8.3.1