From 1566c319d907bf1fa042d6d8efd5d45007183472 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Wed, 15 Nov 2017 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/CouponMapper.xml | 35 +++++++++++++-------
 .../web/controller/AreaCountController.java        | 10 ++----
 .../operate/web/controller/ReportController.java   | 26 +++------------
 .../operate/web/facade/AreaCountFacade.java        | 35 ++++++++++++--------
 .../operate/web/service/IReportService.java        |  4 +--
 .../web/service/impl/ReportServiceImpl.java        | 37 ++--------------------
 .../lyms/platform/operate/web/utils/MongoUtil.java | 14 ++++++++
 7 files changed, 70 insertions(+), 91 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 2b01566..93817a2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -559,6 +559,9 @@
         <if test="areaId != null and areaId != ''">
             and area_id = #{areaId}
         </if>
+        <if test="streetId != null and streetId != ''">
+            and street_id = #{streetId}
+        </if>
     </select>
 
     <select id="findUnUsed" parameterType="map" resultType="map">
@@ -695,17 +698,27 @@
 
     <select id="findUserSendInfoByUids" resultType="map" parameterType="map">
         select a.create_hospital_id, a.user_id, a.create_date, a.send_hospital, b.name as doctoer_name from (
-        select distinct(a.create_hospital_id), a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, a.create_user_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.create_hospital_id in
-        <foreach collection="hid" open="(" close=")" separator="," item="hid">
-            #{hid}
-        </foreach>
-        and a.user_id in
-        <foreach collection="uids" open="(" close=")" separator="," item="uid">
-            #{uid}
-        </foreach>
+            select distinct(a.create_hospital_id), a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, a.create_user_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.create_hospital_id in
+            <foreach collection="hid" open="(" close=")" separator="," item="hid">
+                #{hid}
+            </foreach>
+            and a.user_id in
+            <foreach collection="uids" open="(" close=")" separator="," item="uid">
+                #{uid}
+            </foreach>
+            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>
         ) a left join users b on a.create_user_id = b.id
 
        <!-- select distinct(a.create_hospital_id), a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, e.name as doctoer_name
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
index 76fcc44..35d7239 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
@@ -24,16 +24,10 @@ public class AreaCountController extends BaseController {
     @Autowired
     private AreaCountFacade areaCountFacade;
 
-    /**
-     * flag  是否返回的是医院
-     * @param name
-     * @param flag
-     * @return
-     */
     @RequestMapping(value = "/area/childs", method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse getAreaChilds(@RequestParam String name, boolean flag) {
-        return areaCountFacade.getAreaChilds(name, flag);
+    public BaseResponse getAreaChilds(@RequestParam String provinceName, String cityName, String areaName) {
+        return areaCountFacade.getAreaChilds(provinceName, cityName, areaName);
     }
 
     /**
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 0ffc67e..24e0359 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
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -32,33 +31,16 @@ public class ReportController extends BaseController {
     private IReportService reportService;
 
     /**
-     * 建档统计（环比）
-     * @param areaType 1=省        2=市       3=区县
-     * @param startDate
-     * @param endDate
-     * @param reportType  1=周      2=月    3=季度   4=半年    5=年
-     * @return
-     */
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(value = "/patient/huanbi", method = RequestMethod.GET)
-    public BaseObjectResponse patientHuanBi(@RequestParam Integer areaType, Date startDate, Date endDate, Integer reportType, HttpServletRequest request) {
-        return reportService.patientHuanBi(areaType,  startDate, endDate, reportType, getUserId(request));
-    }
-
-    /**
-     * 建档统计（占比）
-     * @param areaType 1=省        2=市       3=区县
+     * 建档统计
      * @param ageType  1=全部年龄   2=20岁以下     3=20-30岁    4=30-40岁    5=40岁以上
-     * @param areaId    乡镇ID
      * @param patientType  建档孕周  1=孕早期  2=孕中期   3=孕晚期
      * @return
      */
     @ResponseBody
     @TokenRequired
-    @RequestMapping(value = "/patient/zhanbi", method = RequestMethod.GET)
-    public BaseObjectResponse patientZhanbi(@RequestParam Integer areaType, @RequestParam Integer ageType, Integer areaId, Integer patientType, HttpServletRequest request) {
-        return reportService.patientZhanbi(areaType, ageType,  areaId, patientType, getUserId(request));
+    @RequestMapping(value = "/patients", method = RequestMethod.GET)
+    public BaseObjectResponse patients(String provinceId, String cityId, String aredId, String streetId, Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) {
+        return reportService.patients(provinceId, cityId, aredId, streetId, ageType, patientType, startDate, endDate, getUserId(request));
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index 9c8b950..225f05e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -840,27 +840,36 @@ public class AreaCountFacade {
         ResponseUtil.responseExcel(cnames,results,httpServletResponse);
     }
 
-    public BaseResponse getAreaChilds(String name, boolean flag) {
+    public BaseResponse getAreaChilds(String provinceName, String cityName, String areaName) {
         List<Map<String, Object>> childs = new ArrayList<>();
-        BasicConfig basic = mongoTemplate.findOne(Query.query(Criteria.where("name").is(name)), BasicConfig.class);
-        if(basic != null) {
-            if(flag) {
-                List<Map<String, Object>> hospitals = organizationService.getOrganizationByAreaId(basic.getId());
-                childs.addAll(hospitals);
+        BasicConfig province = mongoTemplate.findOne(Query.query(Criteria.where("name").is(provinceName).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class);
+        if(province != null) {
+            List<BasicConfig> basicConfigs = new ArrayList<>();
+            if(StringUtils.isEmpty(cityName)) {
+                basicConfigs = mongoTemplate.find(Query.query(Criteria.where("parentId").is(province.getId()).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class);
             } else {
-                List<BasicConfig> basicConfigs = mongoTemplate.find(Query.query(Criteria.where("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd").and("parentId").is(basic.getId())), BasicConfig.class);
-                for (BasicConfig basicConfig : basicConfigs) {
-                    Map<String, Object> temp = new HashMap<>();
-                    temp.put("id", basicConfig.getId());
-                    temp.put("name", basicConfig.getName());
-                    childs.add(temp);
+                BasicConfig city = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(province.getId()).and("name").is(cityName).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class);
+                if(city != null) {
+                    if(StringUtils.isEmpty(areaName)) {
+                        basicConfigs = mongoTemplate.find(Query.query(Criteria.where("parentId").is(city.getId())), BasicConfig.class);
+                    } else {
+                        BasicConfig area = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(city.getId()).and("name").is(areaName).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class);
+                        if(area != null) {
+                            basicConfigs = mongoTemplate.find(Query.query(Criteria.where("parentId").is(area.getId()).and("typeId").is("b7ea005c-dfac-4c2a-bdae-25239b3f44fd")), BasicConfig.class);
+                        }
+                    }
                 }
             }
+            for (BasicConfig basicConfig : basicConfigs) {
+                Map<String, Object> temp = new HashMap<>();
+                temp.put("id", basicConfig.getId());
+                temp.put("name", basicConfig.getName());
+                childs.add(temp);
+            }
         }
         return RespBuilder.buildSuccess(childs);
     }
 
-
 }
 
 
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 adb003e..3029d38 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
@@ -98,7 +98,5 @@ public interface IReportService extends IBaseService {
 
     BaseObjectResponse unUsedPeopleInfo(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId);
 
-    BaseObjectResponse patientHuanBi(Integer areaType, Date startDate, Date endDate, Integer reportType, Integer userId);
-
-    BaseObjectResponse patientZhanbi(Integer areaType, Integer ageType, Integer areaId, Integer patientType, Integer userId);
+    BaseObjectResponse patients(String provinceId, String cityId, String aredId, String streetId, Integer ageType, Integer patientType, Date startDate, Date endDate, 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 50fe9c8..a45505c 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
@@ -178,12 +178,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
     }
 
     @Override
-    public BaseObjectResponse patientHuanBi(Integer areaType, Date startDate, Date endDate, Integer reportType, Integer userId) {
-        return null;
-    }
+    public BaseObjectResponse patients(String provinceId, String cityId, String aredId, String streetId, Integer ageType, Integer patientType, Date startDate, Date endDate, Integer userId) {
+        List<String> hospitals = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId);
 
-    @Override
-    public BaseObjectResponse patientZhanbi(Integer areaType, Integer ageType, Integer areaId, Integer patientType, Integer userId) {
         return null;
     }
 
@@ -908,35 +905,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
     }
 
-    /**
-     * 过滤掉全部优惠券所对应的项目都没做的userid
-     * @param userIds
-     */
-    /*private void doFilter(List<String> userIds, String hospitalId) {
-        if(CollectionUtils.isNotEmpty(userIds) && StringUtils.isNotEmpty(hospitalId)) {
-            List<Map<String, Object>> lists = couponMapper.findUserTypeInfo(CollectionUtils.createMap("userIds", userIds, "hospitalId", hospitalId));
-            if(CollectionUtils.isNotEmpty(lists)) {
-                // key = user_id, value = isRemove 默认true
-                Map<String, Boolean> temp = new HashMap<>();
-                for (String userId : userIds) {
-                    temp.put(userId, true);
-                }
-                for (Map<String, Object> map : lists) {
-                    Integer type = (Integer) map.get("type");
-                    String userId = (String) map.get("user_id");
-                    String checkTime = getCheckTime(type, userId, (Date) map.get("create_date"), patientId);
-                    if(!"".equals(checkTime)) { // 找到对应信息
-                        temp.put(userId, false);
-                    }
-                }
-                for (Map.Entry<String, Boolean> entry : temp.entrySet()) {
-                    if(entry.getValue()) {
-                        userIds.remove(entry.getKey());
-                    }
-                }
-            }
-        }
-    }*/
 
 
     @Override
@@ -1499,6 +1467,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             Integer count = userIds.size();
             List<String> ids = CollectionUtils.getPageIds(userIds, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2"));
             Map<String, Object> param2 = new HashMap<>();
+            param2.putAll(param);
             param2.put("hid", param.get("hospitalId"));
             param2.put("uids", ids);
             List<Map<String,Object>> userSendInfo = couponMapper.findUserSendInfoByUids(param2);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
index 778f6f5..93f73e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
@@ -4,8 +4,10 @@ import com.lyms.platform.biz.service.BabyBookbuildingService;
 import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade;
+import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.Patients;
@@ -38,11 +40,23 @@ public class MongoUtil {
     AutoMatchFacade autoMatchFacade;
 
     @Autowired
+    private AccessPermissionFacade accessPermissionFacade;
+
+    @Autowired
     private BabyBookbuildingService babyBookbuildingService;
 
     @Autowired
     private OrganizationGroupsFacade organizationGroupsFacade;
 
+    @Autowired
+    private CouponMapper couponMapper;
+
+    public List<String> getHospitals(Integer userId, String provinceId, String cityId, String areaId, String streetId) {
+        List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
+        List<Map<String, Object>> hospitals= couponMapper.findHospitalInfoByIds2(CollectionUtils.createMap("list", hospitalIds, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "streetId", streetId));
+        return null;
+    }
+
     public List<Map<String, Object>> getListByParentId(String id) {
         List<Map<String, Object>> list = new ArrayList<>();
         if(StringUtils.isNotEmpty(id)) {
-- 
1.8.3.1