From 110be563bfa49e0308c238c3465df50a96692fea Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Fri, 9 Jun 2017 15:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/CouponMapper.xml |  8 +++-
 .../operate/web/controller/ReportController.java   | 14 +++----
 .../web/service/impl/ReportServiceImpl.java        | 46 +++++-----------------
 .../lyms/platform/operate/web/utils/PageUtil.java  |  7 ++++
 4 files changed, 27 insertions(+), 48 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 c5d8268..d6c5d60 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -320,7 +320,9 @@
         <if test="endDate != null">
             and a.use_date <![CDATA[ < ]]> #{endDate}
         </if>
-        limit #{currentPage},#{pageSize}
+        <if test="currentPage != null and pageSize != null">
+            limit #{currentPage},#{pageSize}
+        </if>
     </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
@@ -443,7 +445,9 @@
         <if test="endDate != null">
             and a.create_date <![CDATA[ < ]]> #{endDate}
         </if>
-        limit #{currentPage},#{pageSize}
+        <if test="currentPage != null and pageSize != null">
+            limit #{currentPage},#{pageSize}
+        </if>
     </select>
 
     <select id="findUserSendInfoCount" parameterType="map" resultType="integer">
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 ddfca62..4715257 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
@@ -245,7 +245,7 @@ public class ReportController extends BaseController {
      * @param request
      * @param startDate
      * @param endDate
-     * @param type          1 = 孕期优惠券使用统计详情导出， 2 = 产后优惠券使用统计详情导出， 3 = 儿童优惠券使用统计详情导出
+     * @param exportType          1 = 孕期优惠券使用统计详情导出， 2 = 产后优惠券使用统计详情导出， 3 = 儿童优惠券使用统计详情导出
      * @param response
      * @param provinceId
      * @param cityId
@@ -253,18 +253,14 @@ public class ReportController extends BaseController {
      * @param hospitalId
      * @param tempId
      * @param couponType
-     * @param page
-     * @param limit
      */
     @ResponseBody
-//    @TokenRequired
     @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET)
-    public void couponInfoExport(HttpServletRequest request, Date startDate, Date endDate, Integer type, HttpServletResponse response,
-                                     String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType,
-                                     Integer page, Integer limit) {
+    public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type,
+                                 String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer exportType) {
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
-                "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type,
-                "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);
+                "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type,
+                "tempId", tempId, "couponType",couponType, "exportType", exportType);
         reportService.exportCouponInfo(param, response);
     }
 
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 c1dc00d..776109e 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
@@ -756,10 +756,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             if(patients != null) {
                 map.put("phone", patients.getPhone());
 
-                String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId());
+                String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId()) + findName(patients.getStreetRegisterId()) + findName(patients.getAddressRegister());
                 map.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */
 
-                String householdAddress = findName(patients.getProvinceId()) + findName(patients.getCityId()) + findName(patients.getAreaId()) + findName(patients.getStreetId()) + findName(patients.getAddress());
+                String householdAddress = findName(patients.getProvinceId()) + findName(patients.getCityId()) + findName(patients.getAreaId()) + findName(patients.getStreetId()) + patients.getAddress();
                 map.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */
             }
         }
@@ -771,10 +771,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             map.put("phone", patients.getPhone());
             map.put("username", patients.getUsername());
 
-            String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId());
+            String residenceAddress = findName(patients.getProvinceRegisterId()) + findName(patients.getCityRegisterId()) + findName(patients.getAreaRegisterId()) + findName(patients.getStreetRegisterId()) + findName(patients.getAddressRegister());
             map.put("residenceAddress", residenceAddress.replace("null", "")); /** 居住地 */
 
-            String householdAddress = findName(patients.getProvinceId()) + findName(patients.getCityId()) + findName(patients.getAreaId()) + findName(patients.getStreetId()) + findName(patients.getAddress());
+            String householdAddress = findName(patients.getProvinceId()) + findName(patients.getCityId()) + findName(patients.getAreaId()) + findName(patients.getStreetId()) + patients.getAddress();
             map.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */
         }
     }
@@ -795,8 +795,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         String username = null; /** 姓名 */
         String week = null;  /** 产检孕周 = 产检时间 - 末次月经 */
         Integer number = null;  /** 产检第次 */
-        String operatorOrgName = null; /** 产检机构 */
         String phone = null; /** 联系电话 */
+        if(map.get("used_hospital_id") != null) {
+            String operatorOrgName = couponMapper.findHospitalNameById(map.get("used_hospital_id").toString()); /** 使用机构 */
+            map.put("operatorOrgName", operatorOrgName);
+        }
         String doctorName = couponMapper.findUserName(operatorUserId); /** 使用医生 */
         if(type == 1 || type == 3) {
             Patients patients = mongoTemplate.findById(usedId, Patients.class);
@@ -804,7 +807,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 checkDate = patients.getCreated();
                 username = patients.getUsername();
                 week  = DateUtil.getWeekDesc(patients.getLastMenses(), checkDate);
-                operatorOrgName = couponMapper.findHospitalNameById(patients.getHospitalId());
                 phone = patients.getPhone();
             }
         } else if(type == 2) {
@@ -817,7 +819,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 username = findUserNameByPid(antexc.getPid());
                 week = DateUtil.getWeekDesc(antexc.getLastMenses(), antexc.getCheckTime());
 //                number = findNumberByList("checkTime", "pid", antexc.getPid(), antexc, AntExChuModel.class);
-                operatorOrgName = couponMapper.findHospitalNameById(antexc.getHospitalId());
                 phone = findPhoneByPid(antexc.getPid());
 
                 id = antexc.getId();/** 处理排序 */
@@ -854,7 +855,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                             sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCheckTime()));
                         }
                     }
-                    operatorOrgName = couponMapper.findHospitalNameById(antenatal.getHospitalId());
                     phone = findPhoneByPid(antenatal.getPid());
                 }
             }
@@ -876,7 +876,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 /** 使用时间 - 分娩时间 */
                 week = DateUtil.getWeekDesc(findLastMensesByPatientId(maternalDeliverModel.getParentId()), useDate);
                 username = findUserNameByPid(maternalDeliverModel.getPid());
-                operatorOrgName = couponMapper.findHospitalNameById(maternalDeliverModel.getHospitalId());
                 Patients patients = mongoTemplate.findById(maternalDeliverModel.getParentId(), Patients.class);
                 if(patients != null) {
                   phone = patients.getPhone();
@@ -889,7 +888,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 if(patients != null) {
                     username = patients.getUsername();
                     phone = patients.getPhone();
-                    operatorOrgName = couponMapper.findHospitalNameById(patients.getHospitalId());
                     week = "产后" +  DateUtil.getDays(patients.getFmDate(), useDate) + "天";
                 }
             }
@@ -898,7 +896,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             if(postReviewModel != null) {
                 username = findUserNameByPid(postReviewModel.getPid());
                 phone = findPhoneByPid(postReviewModel.getPid());
-                operatorOrgName = couponMapper.findHospitalNameById(postReviewModel.getHospitalId());
                 Patients patients = mongoTemplate.findById(postReviewModel.getParentId(), Patients.class);
                 if(patients != null) {
                     week = "产后" +  DateUtil.getDays(patients.getFmDate(), useDate) + "天";
@@ -909,13 +906,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             if(babyModel != null) {
                 username = findUserNameByPid(babyModel.getPid());
                 phone = findPhoneByPid(babyModel.getPid());
-                operatorOrgName = couponMapper.findHospitalNameById(babyModel.getHospitalId());
                 week = DateUtil.getMonthDesc(babyModel.getBirth(), useDate);
             }
         } else if(type == 8) {
             BabyCheckModel babyCheckModel = mongoTemplate.findById(usedId, BabyCheckModel.class);
             if(babyCheckModel != null) {
-                operatorOrgName = couponMapper.findHospitalNameById(babyCheckModel.getHospitalId());
                 BabyModel babyModel = mongoTemplate.findById(babyCheckModel.getBuildId(), BabyModel.class);
                 if(babyModel != null) {
                     week = DateUtil.getMonthDesc(babyModel.getBirth(), useDate);
@@ -929,7 +924,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         map.put("username", username);
         map.put("week", week);
         map.put("number", number);
-        map.put("operatorOrgName", operatorOrgName);
         map.put("doctorName", doctorName);
         map.put("phone", phone);
     }
@@ -972,29 +966,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         }
     }
 
-    public static void main(String[] args) {
-        SortTempModel temp = new SortTempModel();
-        temp.setId("123");
-        temp.setDate(DateUtil.parseYMD("2016-04-05"));
-
-        SortTempModel temp2 = new SortTempModel();
-        temp2.setId("456");
-        temp2.setDate(DateUtil.parseYMD("2016-05-05"));
-
-        List<SortTempModel> sortTempModels = new ArrayList<>();
-        sortTempModels.add(temp2);
-        sortTempModels.add(temp);
-        System.out.println(sortTempModels);
-        Collections.sort(sortTempModels, new Comparator<SortTempModel>() {
-            @Override
-            public int compare(SortTempModel o1, SortTempModel o2) {
-                return o1.getDate().after(o2.getDate()) ? 1 : -1;
-            }
-
-        });
-        System.out.println(sortTempModels);
-    }
-
     private String findUserNameByPid(String pid) {
         if(StringUtils.isNotEmpty(pid)) {
             PersonModel personModel = mongoTemplate.findById(pid, PersonModel.class);
@@ -1052,6 +1023,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         Map<String,Object> map = (Map<String, Object>) pageResult.getGrid();
         List<Map<String, Object>> couponInfos = (List<Map<String, Object>>) map.get("couponInfos");
 
+        Integer exportType = (Integer) param.get("exportType");
         Integer type = (Integer) param.get("type");
         if(type == 1) { /** 孕期 */
             exportPregnancy(couponInfos, response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java
index 6e53d0d..6eda9b8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java
@@ -24,6 +24,13 @@ public class PageUtil {
     //日志调测器
     private static final Logger logger = LoggerFactory.getLogger(PageUtil.class);
     public static void setPageInfo(Map<String,Object> map) {
+//        Integer pageSize = map.get("pageSize") == null ? 15 : Integer.parseInt(map.get("pageSize").toString());
+//        Integer currentPage = map.get("currentPage") == null ? 1 : Integer.parseInt(map.get("currentPage").toString());
+
+        if(map.get("currentPage") == null || map.get("pageSize") == null) { /** 为了详情导出 不做分页 */
+            return;
+        }
+
         Integer pageSize = map.get("pageSize") == null ? 15 : Integer.parseInt(map.get("pageSize").toString());
         Integer currentPage = map.get("currentPage") == null ? 1 : Integer.parseInt(map.get("currentPage").toString());
         if(pageSize < 1) {
-- 
1.8.3.1