From 15fe4e879968f7a1ecfc3455533e2afbf5a933d9 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 12 Dec 2018 09:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 36 ----------------------
 1 file changed, 36 deletions(-)

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 eee0053..4138824 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
@@ -2452,13 +2452,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId")));
             }
         }
-
-/*
-        if(StringUtils.isBlank((String) param.get("hospitalId"))) {
-            param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); *//** 模拟根据登陆人id 查询出来的医院 *//*
-        } else {
-            param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId")));
-        }*/
         doHospitalFilter(param);
 
         List<Map<String, Object>> couponReport = new ArrayList<>();
@@ -2523,33 +2516,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                         }
                     }
                 }
-
-//                for (String hid : hospitalId) {
-//                    param.put("hid", hid);
-//                    Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo2(param);
-//                    Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo2(param);
-//                    Map<String, Object> allusedInfo = couponMapper.findHospitalAllused(param);
-//
-//                    Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param);
-//
-//                    if(MapUtils.isNotEmpty(tempMap)) {
-//                        tempMap.put("allUserdCount",(allusedInfo == null || allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount"));
-//
-//                        /** 方法/使用人数id */
-//                        List<String> sendUserIds = couponMapper.findSendUserIds2(param);
-//                        List<String> usedUserIds = couponMapper.findUsedUserIds2(param);
-//                        tempMap.put("sendUserIds", sendUserIds);
-//                        tempMap.put("usedUserIds", usedUserIds);
-//                        couponReport.add(tempMap);
-//                    }
-//                }
-
-
             }
 
             if(CollectionUtils.isNotEmpty(couponReport)) {
                 param.put("status", 2);
-//                List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
                 List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo2(param); /** 优惠券使用详情 */
                 for (Map<String, Object> m : couponReport) {
                     for (Map<String, Object> info : couponUsedTypeInfo) {
@@ -2560,7 +2530,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
                 }
             }
-
             /** 查询医院所绑定的type和coupon_order */
             List<String> key = couponMapper.findCouponTitleByTemp(param);
             setZeroDataByTemp(key, couponReport);
@@ -2586,7 +2555,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             m.put("value", entry.getKey());
             couponReportMap.add(m);
         }
-//        return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModel);
 
         /** 处理多产程问题 */
         for (Map<String, Object> map : couponReport) {
@@ -2594,9 +2562,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             List<String> sendUserIds2 = new ArrayList<>();
             param.put("hid", map.get("hospitalId"));
             if(CollectionUtils.isNotEmpty(sendUserIds)) {
-//                param.put("userIds", sendUserIds);
                 param.put("hospitalFlag", "create_hospital_id"); /** 医院是用create_hospital_id 还是用 used_hospital_id限制*/
-//                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfoWithSend(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 for (Map<String, Object> m : mulitPatienInfo) {
                     Long count = (Long) m.get("count");
@@ -2614,8 +2580,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             List<String> usedUserIds = (List<String>) map.get("usedUserIds");
             List<String> usedUserIds2 = new ArrayList<>();
             if(CollectionUtils.isNotEmpty(usedUserIds)) {
-//                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", usedUserIds, "startDate", param.get("startDate")));   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
-//                param.put("userIds", usedUserIds);
                 param.put("hospitalFlag", "used_hospital_id");
                 List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 for (Map<String, Object> m : mulitPatienInfo) {
-- 
1.8.3.1