From 0e332336942c8b6b6d3fd15eb351a23f4386165c Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 27 Oct 2017 10:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/ReportController.java    |  9 ++++++++-
 .../lyms/platform/operate/web/service/IReportService.java    |  2 ++
 .../platform/operate/web/service/impl/ReportServiceImpl.java | 12 +++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

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 b94625b..1915fbb 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
@@ -33,13 +33,20 @@ public class ReportController extends BaseController {
     /**
      * 未发放优惠券统计
      */
-    @RequestMapping(value = "/coupon/unSend", method = RequestMethod.POST)
+    @RequestMapping(value = "/coupon/unSend", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
     public BaseObjectResponse unSend(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, HttpServletRequest request) {
         return reportService.unSend(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request));
     }
 
+    @RequestMapping(value = "/coupon/unSend/info", method = RequestMethod.POST)
+    @ResponseBody
+    @TokenRequired
+    public BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, HttpServletRequest request) {
+        return reportService.unSendInfo(startDate, endDate, provinceId, cityId, areaId, hospitalId, page, limit, getUserId(request));
+    }
+
 
     /**
      * 产检次数分布统计(已废弃 采用 getCheckNumber)
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
index 89bafb0..94597e6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
@@ -85,4 +85,6 @@ public interface IReportService extends IBaseService {
     void checkNumberInfoExport(Integer childBirth, Date startDate, Date endDate, Integer startWeek, Integer endWeek, Integer number, Integer id, HttpServletResponse resp);
 
     BaseObjectResponse unSend(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId);
+
+    BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId);
 }
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 2c14874..83d9bf0 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
@@ -543,7 +543,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
 
             for (Map.Entry<String, Integer> entry : hospitalPatientCount.entrySet()) {
-//                Map<String, Object> tempMap = couponMapper.findHospitalInfoById(entry.getKey());
                 Map<String, Object> tempMap = new HashMap<>();
                 tempMap.put("id", entry.getValue());
                 tempMap.put("areaId", getValByKey(datas, entry.getKey(), "area_id"));
@@ -553,6 +552,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 tempMap.put("provinceId", getValByKey(datas, entry.getKey(), "province_id"));
                 tempMap.put("provinceName", findName(tempMap.get("provinceId")));
                 tempMap.put("count", entry.getValue());
+                tempMap.put("hospitalId", entry.getKey());
+                tempMap.put("hospitalName", couponMapper.findHospitalNameById(entry.getKey()));
                 restList.add(tempMap);
             }
         }
@@ -560,6 +561,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
     }
 
     @Override
+    public BaseObjectResponse unSendInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) {
+        return null;
+    }
+
+    private List<Patients> getPatients(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer userId) {
+        return null;
+    }
+
+    @Override
     public BaseObjectResponse coupon(Map<String ,Object> param) {
         if(StringUtils.isBlank((String) param.get("hospitalId"))) {
             param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */
-- 
1.8.3.1