From 4d4e0e39b0e5056d649b8573cc1b3ccd9a1f0ae5 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 5 Jun 2017 16:30:16 +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

---
 .../permission/dao/master/CouponMapper.java        |   1 +
 .../main/resources/mainOrm/master/CouponMapper.xml | 121 +++++++++++++++------
 .../operate/web/controller/ReportController.java   |   5 +-
 .../web/service/impl/ReportServiceImpl.java        |  54 +++++++--
 4 files changed, 135 insertions(+), 46 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 96b0c41..76b0125 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
@@ -64,4 +64,5 @@ public interface CouponMapper {
     List<Map<String,Object>> findCouponInfo(Map<String, Object> param);
 
     int findCouponInfoCount(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 830ed33..06fa6ae 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -135,39 +135,87 @@
     </select>
 
     <select id="findReport" parameterType="map" resultType="map">
-        select a.people_send_count, a.coupon_send_count, a.create_hospital_id, b.user_used_count, b.coupon_used_count, c.province_id, c.city_id, c.area_id, c.name
-        from (
-        select count(distinct(a.user_id)) as people_send_count, count(1) as coupon_send_count, a.create_hospital_id
-        from coupon_info a, coupon_template b, coupon_type c, organization d, hospital_coupon_template_group e
-        where a.create_hospital_id = d.id and a.create_hospital_id in
-        <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
-            #{hid}
-        </foreach>
-        and a.coupon_template_id = b.id and b.type_id = c.id and c.type in
-        <foreach collection="couponType" open="(" close=")" separator="," item="type">
-            #{type}
-        </foreach>
-        <if test="startDate != null">
-            and a.create_date >= #{startDate}
-        </if>
-        <if test="endDate != null">
-            and a.create_date <![CDATA[ <= ]]> #{endDate}
-        </if>
-        <if test="provinceId != null and provinceId != ''">
-            and d.province_id = #{provinceId}
-        </if>
-        <if test="cityId != null and cityId != '' ">
-            and d.city_id = #{cityId}
-        </if>
-        <if test="areaId != null and areaId != ''">
-            and d.area_id = #{areaId}
-        </if>
-        <if test="tempId != null and tempId != ''">
-            and e.coupon_template_group_id = #{tempId}
-        </if>
-        and a.create_hospital_id = e.hospital_id
-        group by a.create_hospital_id
-        ) a, (
+        select a.people_send_count, a.coupon_send_count, a.create_hospital_id, a.user_used_count, a.coupon_used_count, a.used_hospital_id, b.province_id, b.city_id, b.area_id, b.name from(
+            select a.people_send_count, a.coupon_send_count, a.create_hospital_id, b.user_used_count, b.coupon_used_count, b.used_hospital_id
+            from (
+            select count(distinct(a.user_id)) as people_send_count, count(1) as coupon_send_count, a.create_hospital_id
+            from coupon_info a, coupon_template b, coupon_type c, organization d, hospital_coupon_template_group e
+            where a.create_hospital_id = d.id and a.create_hospital_id in
+            <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+                #{hid}
+            </foreach>
+            and a.coupon_template_id = b.id and b.type_id = c.id and c.type in
+            <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                #{type}
+            </foreach>
+            <if test="startDate != null">
+                and a.create_date >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test="provinceId != null and provinceId != ''">
+                and d.province_id = #{provinceId}
+            </if>
+            <if test="cityId != null and cityId != '' ">
+                and d.city_id = #{cityId}
+            </if>
+            <if test="areaId != null and areaId != ''">
+                and d.area_id = #{areaId}
+            </if>
+            <if test="tempId != null and tempId != ''">
+                and e.coupon_template_group_id = #{tempId}
+            </if>
+            and a.create_hospital_id = e.hospital_id
+            group by a.create_hospital_id
+            ) a left join (
+            select count(distinct(a.user_id)) as user_used_count, count(1) as coupon_used_count, a.used_hospital_id
+            from coupon_info a, coupon_template b, coupon_type c
+            where a.used_hospital_id in
+            <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+                #{hid}
+            </foreach>
+            and a.status = 2 and a.coupon_template_id = b.id and b.type_id = c.id and c.type in
+            <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                #{type}
+            </foreach>
+            group by a.used_hospital_id
+            ) b
+            on a.create_hospital_id = b.used_hospital_id
+            union
+            select a.people_send_count, a.coupon_send_count, a.create_hospital_id, b.user_used_count, b.coupon_used_count, b.used_hospital_id
+            from (
+            select count(distinct(a.user_id)) as people_send_count, count(1) as coupon_send_count, a.create_hospital_id
+            from coupon_info a, coupon_template b, coupon_type c, organization d, hospital_coupon_template_group e
+            where a.create_hospital_id = d.id and a.create_hospital_id in
+            <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+                #{hid}
+            </foreach>
+            and a.coupon_template_id = b.id and b.type_id = c.id and c.type in
+            <foreach collection="couponType" open="(" close=")" separator="," item="type">
+                #{type}
+            </foreach>
+            <if test="startDate != null">
+                and a.create_date >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and a.create_date <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test="provinceId != null and provinceId != ''">
+                and d.province_id = #{provinceId}
+            </if>
+            <if test="cityId != null and cityId != '' ">
+                and d.city_id = #{cityId}
+            </if>
+            <if test="areaId != null and areaId != ''">
+                and d.area_id = #{areaId}
+            </if>
+            <if test="tempId != null and tempId != ''">
+                and e.coupon_template_group_id = #{tempId}
+            </if>
+            and a.create_hospital_id = e.hospital_id
+            group by a.create_hospital_id
+            ) a right join (
             select count(distinct(a.user_id)) as user_used_count, count(1) as coupon_used_count, a.used_hospital_id
             from coupon_info a, coupon_template b, coupon_type c
             where a.used_hospital_id in
@@ -179,8 +227,10 @@
                 #{type}
             </foreach>
             group by a.used_hospital_id
-        ) b, organization c
-        where a.create_hospital_id = b.used_hospital_id and a.create_hospital_id = c.id
+            ) b
+            on a.create_hospital_id = b.used_hospital_id
+        )a, organization b
+        where a.create_hospital_id = b.id or a.used_hospital_id = b.id
     </select>
 
     <select id="findUsedInfo" parameterType="map" resultType="map">
@@ -208,6 +258,7 @@
         <foreach collection="hospitalIds" open="(" close=")" separator="," item="hid">
             #{hid}
         </foreach>
+        group by a.coupon_template_group_id,b.name
     </select>
     
     <select id="findHospitalName" parameterType="map" resultType="map">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
index 2a64a6b..b59d205 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
@@ -210,12 +210,11 @@ public class ReportController extends BaseController {
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
                             "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId",
                             areaId, "tempId", tempId, "couponType", couponType);
-        /*Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request),"hospitalId", "1000000094","tempId", tempId, "couponType", "1,2,3,4,5,6,7,8");*/
         return reportService.coupon(param);
     }
 
     /**
-     * 优惠券相关统计详情
+     * 优惠券使用统计详情
      * @param request
      * @param startDate     开始时间
      * @param endDate       结束时间
@@ -237,8 +236,6 @@ public class ReportController extends BaseController {
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
                 "endDate", endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type,
                 "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);
-       /* Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request),  "hospitalId", CollectionUtils.asList("216"),  "type", type,
-                "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit);*/
         return reportService.couponInfo(param);
     }
 
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 ab046fd..07c6fea 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
@@ -445,8 +445,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         param.put("status", 2);
         param.put("couponType", CollectionUtils.asList((String) param.get("couponType")));
 
-
         List<Map<String, Object>> couponReport = couponMapper.findReport(param); /** 优惠券统计详情（发放人数、发放券数、使用人数、使用券数） */
+
         List<Map<String, Object>> usedInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
         List<String> xAxis = new ArrayList<>();
 
@@ -471,9 +471,25 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         reportModel.setData(Arrays.asList("发放券数", "使用券数"));
         reportModel.setSeries(createSeries(couponReport));
 
-        return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModel);
+        Map<String, Object> titleMap = parseTitle(couponReport);
+        
+        return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", titleMap, "reportModel", reportModel);
+    }
+
+    private Map<String,Object> parseTitle(List<Map<String, Object>> couponReport) {
+        Map<String, Object> titleMap = new HashMap<>();
+        for (Map<String, Object> map : couponReport) {
+            Set<String> set = map.keySet();
+            for (String s : set) {
+                if(couponReportMap.containsKey(s)) {
+                    titleMap.put(s, couponReportMap.get(s));
+                }
+            }
+        }
+        return titleMap;
     }
 
+
     private List<Series> createSeries(List<Map<String, Object>> couponReport) {
         List<Series> seriesList = new ArrayList<>();
         for (Map<String, Object> coupon : couponReport) {
@@ -496,8 +512,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
     @Override
     public BaseObjectResponse couponInit(Map<String, Object> param) {
-        List<String> hospitalIds = Arrays.asList("216", "245"); /** 模拟根据登陆人id 查询出来的医院 */
-        param.put("hospitalIds", hospitalIds);
+        if(StringUtils.isBlank((String) param.get("hospitalId"))) {
+            param.put("hospitalIds", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */
+        } else {
+            param.put("hospitalIds", CollectionUtils.asList((String) param.get("hospitalId")));
+        }
+
         return RespBuilder.buildSuccess("coupons", EnumUtil.toJson(CouponEnums.class, "code", "name"),
                 "hTemp", couponMapper.findHospitals(param));
     }
@@ -520,7 +540,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 couponInfo.put("type_desc", s);
             }
 
-            setAntexInfo(couponInfo);
+            setUsedInfo(couponInfo);
         }
         int count = couponMapper.findCouponInfoCount(param);
         PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos));
@@ -610,9 +630,29 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         ResponseUtil.responseExcel(cnames, results, response);
     }
 
-    private void setAntexInfo(Map<String, Object> map) {
+    private void setUsedInfo(Map<String, Object> map) {
         String sequenceId = (String) map.get("sequence_id");
-        if(StringUtils.isEmpty(sequenceId)) return;
+        Integer type = (Integer) map.get("type");
+        if(StringUtils.isEmpty(sequenceId) || type == null) return;
+
+        /**
+         * type
+             1=孕妇建档	lyms_patient
+             2=孕妇产检	lyms_antexc（初诊），lyms_antex（复诊）
+             3=产妇建档
+             4=产妇分娩	lyms_matdeliver
+             5=产妇出院小结	lyms_discharge_abstract_mother
+             6=产妇产后复查	lyms_postreview
+             7=儿童建档	lyms_baby
+             8=儿童保健	lyms_babycheck
+         */
+        if(type == 1) {
+            Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("").is(sequenceId)), Patients.class);
+            if(patients != null) {
+                map.put("checkDate", patients.getCreated()); /** 产检日期 */
+            }
+        }
+
         AntExChuModel antexc = mongoTemplate.findOne(Query.query(Criteria.where("barCode").is(sequenceId)), AntExChuModel.class);
         if(antexc != null) {
             map.put("checkDate", antexc.getCheckTime()); /** 产检日期 */
-- 
1.8.3.1