Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -1932,7 +1932,7 @@ public class StatisticsESService {
        JSONObject jo = new JSONObject();
        String switchIndex = "";//转签index
        String signIndex ="1";//签约index
        String renewIndex =index;//续签index
        String renewIndex =index;//续签index..
        String date = year + "-06-30";
        try{
            if (level == 5) {
@@ -1960,20 +1960,20 @@ public class StatisticsESService {
                    switchIndex = "35";
                }
            }
            String timeKey = elasticsearchUtil.getQuotaTime();
            //String timeKey = elasticsearchUtil.getQuotaTime();
            SaveModel renewSaveModel = new SaveModel();
            SaveModel switchSaveModel = new SaveModel();
            SaveModel signSaveModel = new SaveModel();
            if (StringUtils.isNotBlank(lowCode)){
                //续签量
                renewSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(timeKey,area,level,renewIndex,"2",lowCode);
                renewSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(date,area,level,renewIndex,"2",lowCode);
                //转签量
                switchSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(timeKey,area,level,switchIndex,"2",lowCode);
                switchSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(date,area,level,switchIndex,"2",lowCode);
            }else{
                //续签量
                renewSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(timeKey,area,level,renewIndex,"2");
                renewSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,renewIndex,"2");
                //转签量
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(timeKey,area,level,renewIndex,"2");
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,switchIndex,"2");
            }
            int renewNum = renewSaveModel.getResult2().intValue();
            int switchNum = switchSaveModel.getResult2().intValue();
@@ -2989,7 +2989,8 @@ public class StatisticsESService {
     * @param lowlevel 等级 1 省 2 市 3 区县 4 机构 5团队
     * @param area
     * @param disease
     * @param type 0.总量，1.进行中，2.已完成，3.居民取消，4.审核不通过，5.其他原因取消
     * @param type  1.总量，2.已完成，3.居民取消，4.审核不通过，5.进行中，6.其他原因取消
     *               0.总量，1.进行中，2.已完成，3.居民取消，4.审核不通过，5.其他原因取消
     * @return
     */
    public List<Map<String,Object>> getPrescriptionTotalLowLevel(int level,String lowlevel,String area,String disease,String type)throws Exception{
@@ -2999,18 +3000,26 @@ public class StatisticsESService {
        List<Map<String, Object>> rs = new ArrayList<>();
        //一级维度
        if (StringUtils.isEmpty(disease)){
            //类型 0.总量，1.已完成，2.居民取消，3.审核不通过，4.进行中，5.其他原因取消
            if("0".equals(type)){
            //类型 1.总量，2.已完成，3.居民取消，4.审核不通过，5.进行中，6.其他原因取消
            if("1".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel0(quotaDate,area,level,index,"2",lowlevel);
            }else {
            }else if("2".equals(type) || "3".equals(type) || "4".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate,area,level,index,"2",lowlevel,type);
            }else if("5".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate,area,level,index,"2",lowlevel,"1");
            }else if("6".equals(type)) {
                saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate, area, level, index, "2", lowlevel, "5");
            }
        }else{
            //类型0.总量，1.进行中，2.已完成，3.居民取消，4.审核不通过，5.其他原因取消
            if("0".equals(type)){
            //类型 1.总量，2.已完成，3.居民取消，4.审核不通过，5.进行中，6.其他原因取消
            if("1".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate,area,level,index,"2",lowlevel,disease);
            }else {
            }else if("2".equals(type) || "3".equals(type) || "4".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate,area,level,index,"2",lowlevel,disease,type);
            }else if ("5".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate,area,level,index,"2",lowlevel,disease,"1");
            }else if ("6".equals(type)){
                saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate,area,level,index,"2",lowlevel,disease,"5");
            }
        }
        if ("5".equals(lowlevel)){
@@ -3081,10 +3090,12 @@ public class StatisticsESService {
        Map<Integer, Map<String, Object>> leaders = getAllTeamLeaders();
        if (rs != null && rs.size() > 0) {
            for (SaveModel saveModel : rs) {
                Integer id = Integer.valueOf(saveModel.getTeam());
                String name = getTeamLeaderNameByTeamCode(leaders, id);
                if (org.apache.commons.lang3.StringUtils.isNotBlank(name)) {
                    saveModel.setTeamName(name);
                if (saveModel.getTeam()!=null){
                    Integer id = Integer.valueOf(saveModel.getTeam());
                    String name = getTeamLeaderNameByTeamCode(leaders, id);
                    if (org.apache.commons.lang3.StringUtils.isNotBlank(name)) {
                        saveModel.setTeamName(name);
                    }
                }
            }
        }
@@ -3217,10 +3228,12 @@ public class StatisticsESService {
            Iterator iterator = resultList.iterator();
            while (iterator.hasNext()){
                SaveModel saveModel = (SaveModel)iterator.next();
                String monthKey = (String)m.get("month");
                String monthKeyEs = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
                if(monthKey.equals(monthKeyEs)){
                    m.put("count",saveModel.getResult2());
                if(saveModel.getQuotaDate()!=null){
                    String monthKey = (String)m.get("month");
                    String monthKeyEs = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
                    if(monthKey.equals(monthKeyEs)){
                        m.put("count",saveModel.getResult2());
                    }
                }
            }
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/EsStatisticsController.java

@@ -1459,7 +1459,7 @@ public class EsStatisticsController extends BaseController {
     * 获取转签率和续签率
     * 前端:续签进展
     * <p>
     * //@param index 42,43,44 （52，53，54 服务类型维度）
     * @param index 42,43,44 （52，53，54 服务类型维度）
     * @param level 等级  4 市  3区  2社区 1团队
     * @param area  市 默认是厦门市 350200  区 就是区的code  社区就是社区的code 团队就是团队的code.
     * @param year  年份 非比传
@@ -1475,7 +1475,10 @@ public class EsStatisticsController extends BaseController {
            @RequestParam(required = false) String year,
            @RequestParam(required = false) String lowCode) {
        try {
            //year没传默认是今年
            /*if (org.springframework.util.StringUtils.isEmpty(year)) {
                year = Constant.getNowYear();
            }*/
            //return write(200, "查询成功", "data", statisticsService.getRenewPercentAndChangePercent(index,level, code, year,lowCode));
            return write(200,"查询成功！","data",statisticsESService.getRenewPercentAndChangePercent(index,elasticsearchUtil.changeLevel(level),area,year,lowCode));
        } catch (Exception e) {
@@ -1714,7 +1717,7 @@ public class EsStatisticsController extends BaseController {
                                               @ApiParam(name="lowlevel", value="第二级别") @RequestParam(required = true)int lowlevel,
                                               @ApiParam(name="area", value="界别编码") @RequestParam(required = true)String area,
                                               @ApiParam(name="disease", value="疾病") @RequestParam(required = false)String disease,
                                               @ApiParam(name="type", value="类型0.总量，1.进行中，2.已完成，3.居民取消，4.审核不通过，5.其他原因取消") @RequestParam(required = true)String type){
                                               @ApiParam(name="type", value="类型1.总量，2.已完成，3.居民取消，4.审核不通过，5.进行中，6.其他原因取消") @RequestParam(required = true)String type){
        try{
            return write(200, "查询成功", "data", statisticsESService.getPrescriptionTotalLowLevel(elasticsearchUtil.changeLevel(level),String.valueOf(elasticsearchUtil.changeLevel(lowlevel)),area,disease,type));
        } catch (Exception e) {