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

@@ -2012,7 +2012,7 @@ public class StatisticsESService {
        String renewIndex =index;//续签index..
        String date = year + "-06-30";
        try{
            if (level == 5) {
            if (level == 4) {
                //团队的转签
                if(StringUtils.isNoneBlank(lowCode)){
                    //服务类型维度
@@ -2020,7 +2020,7 @@ public class StatisticsESService {
                }else{
                    switchIndex = "35";
                }
            } else if (level == 4) {
            } else if (level == 3) {
                //社区的转签
                if(StringUtils.isNoneBlank(lowCode)){
                    //服务类型维度
@@ -2037,20 +2037,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(date,area,level,renewIndex,"2",lowCode);
                renewSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(timeKey,area,level,renewIndex,"2",lowCode);
                //转签量
                switchSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(date,area,level,switchIndex,"2",lowCode);
                switchSaveModel = elasticsearchUtil.findOneDateQuotaLevel1(timeKey,area,level,switchIndex,"2",lowCode);
            }else{
                //续签量
                renewSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,renewIndex,"2");
                renewSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(timeKey,area,level,renewIndex,"2");
                //转签量
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,switchIndex,"2");
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(timeKey,area,level,switchIndex,"2");
            }
            int renewNum = renewSaveModel.getResult2().intValue();
            int switchNum = switchSaveModel.getResult2().intValue();
@@ -2277,7 +2277,7 @@ public class StatisticsESService {
     */
    public JSONArray getLevelTwoLowLevelTotalSignAndRenew(String area, int level, String index, int sort, String lowLevel, String year, String lowCode) throws Exception {
        String lastDate = year + "-10-19";
        String lastDate = year + "-06-30";
        //String timeKey = elasticsearchUtil.getQuotaTime();
        String low_level = String.valueOf(StringUtils.isEmpty(lowLevel) ? (level - 1) : lowLevel);