From 6972f917d888217f1d8d0ca10cbbf5a86c66f73b Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Thu, 8 Jun 2017 14:12:07 +0800
Subject: [PATCH] bug

---
 .../main/resources/mainOrm/master/CouponMapper.xml |  5 +++-
 .../operate/web/controller/ReportController.java   |  2 +-
 .../web/service/impl/ReportServiceImpl.java        | 30 +++++++++++++++-------
 3 files changed, 26 insertions(+), 11 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 9c18ed2..5a656ca 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -300,7 +300,7 @@
     </select>
 
     <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
+        select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_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
@@ -311,6 +311,9 @@
         <foreach collection="couponType" open="(" close=")" separator="," item="type">
             #{type}
         </foreach>
+        <if test="coupon_order != null">
+            and b.coupon_order = #{coupon_order}
+        </if>
         <if test="startDate != null">
             and a.use_date >= #{startDate}
         </if>
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 1c861b5..ddfca62 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
@@ -237,7 +237,7 @@ public class ReportController extends BaseController {
                                      Integer page, Integer limit) {
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
                 "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type,
-                "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);
+                "tempId", tempId, "couponType",couponType, "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 0e7eba4..f0bb339 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
@@ -675,6 +675,20 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         }
         Integer type = (Integer) param.get("type");
 
+        String coupon = (String) param.get("couponType"); /** 选中单个优惠券类型查询时 前端传的是 type_order 目前传入这种的只有使用统计 */
+        if(StringUtils.isNotEmpty(coupon)) {
+            if(coupon.contains("_")) {
+                String[] split = (coupon + "").split("_"); /** type_order */
+                List<String> couponType = CollectionUtils.asList(split[0]);
+                String order = split[1];
+                param.put("couponType", couponType);
+                param.put("coupon_order", order);
+                type = 4;
+            } else {
+                param.put("couponType", CollectionUtils.asList(coupon));
+            }
+        }
+
         Assert.notNull(type, "type must not be null!");
 
         if(type == 4) { /** 使用详情统计 */
@@ -694,7 +708,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                     couponInfo.put("use_date", DateUtil.getyyyy_MM_dd(useDate));
                     /** 设置产检日期、姓名、产检孕周、产检第次、产检机构、产检医生、联系电话 */
                     setUsedInfo((Integer) couponInfo.get("type"), (String) couponInfo.get("used_id"),
-                                (String) couponInfo.get("sequence_id"), useDate, couponInfo
+                                (String) couponInfo.get("sequence_id"), useDate, (String) couponInfo.get("operator_use_id"), couponInfo
                         );
                 }
             }
@@ -713,6 +727,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
             PageResult pageResult = new PageResult(count, (Integer) param.get("currentPage") ,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
             return RespBuilder.buildSuccess(pageResult);
+        } else if(type == 999) { /** 先占位置 */
+
         }
         return RespBuilder.buildSuccess();
     }
@@ -742,28 +758,27 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
      * 7=儿童建档	lyms_baby
      * 8=儿童保健	lyms_babycheck
      */
-    private void setUsedInfo(Integer type, String usedId, String sequence_id, Date useDate, Map<String, Object> map) {
+    private void setUsedInfo(Integer type, String usedId, String sequence_id, Date useDate, String operatorUserId, Map<String, Object> map) {
         Date checkDate = null; /** 产检日期 */
         String username = null; /** 姓名 */
         String week = null;  /** 产检孕周 = 产检时间 - 末次月经 */
         Integer number = null;  /** 产检第次 */
         String operatorOrgName = null; /** 产检机构 */
-        String doctorName = null; /** 产检医生 */
         String phone = null; /** 联系电话 */
+        String doctorName = couponMapper.findUserName(operatorUserId); /** 使用医生 */
         if(type == 1) {
             Patients patients = mongoTemplate.findById(usedId, Patients.class);
             if(patients != null) {
                 checkDate = patients.getCreated();
                 username = patients.getUsername();
                 week  = DateUtil.getWeekDesc(patients.getLastMenses(), checkDate);
-                List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.ASC, "created")), Patients.class);
+              /*  List<Patients> patientsList = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.ASC, "created")), Patients.class);
                 for(int i = 0; i < patientsList.size(); i++) {
                     if(patientsList.get(i).getId().equals(patients.getId())) {
 //                        number = ++i;
                     }
-                }
+                }*/
                 operatorOrgName = couponMapper.findHospitalNameById(patients.getHospitalId());
-                doctorName = couponMapper.findUserName(patients.getLastCheckEmployeeId());
                 phone = patients.getPhone();
             }
         } else if(type == 2) {
@@ -774,10 +789,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 week = DateUtil.getWeekDesc(antexc.getLastMenses(), antexc.getCheckTime());
                 number = findNumberByList("checkTime", "pid", antexc.getPid(), antexc, AntExChuModel.class);
                 operatorOrgName = couponMapper.findHospitalNameById(antexc.getHospitalId());
-                doctorName = couponMapper.findUserName(antexc.getProdDoctor());
                 phone = findPhoneByPid(antexc.getPid());
             } else {
-//                AntenatalExaminationModel antenatal = mongoTemplate.findOne(Query.query(Criteria.where("barCode").is(sequence_id)), AntenatalExaminationModel.class);
                 AntenatalExaminationModel antenatal = mongoTemplate.findById(usedId, AntenatalExaminationModel.class);
                 if(antenatal != null) {
                     checkDate = antenatal.getCheckDate();
@@ -791,7 +804,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                             }
                         }
                     }
-                    doctorName = couponMapper.findUserName(antenatal.getCheckDoctor());
                     operatorOrgName = couponMapper.findHospitalNameById(antenatal.getHospitalId());
                     phone = findPhoneByPid(antenatal.getPid());
                 }
-- 
1.8.3.1