es代码更改

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

@@ -1933,7 +1933,7 @@ public class StatisticsESService {
        String switchIndex = "";//转签index
        String signIndex ="1";//签约index
        String renewIndex =index;//续签index
        String date = year + "-10-19";
        String date = year + "-06-30";
        try{
            if (level == 5) {
                //团队的转签
@@ -1973,7 +1973,7 @@ public class StatisticsESService {
                //续签量
                renewSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,renewIndex,"2");
                //转签量
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,renewIndex,"2");
                switchSaveModel=elasticsearchUtil.findOneDateQuotaLevel0(date,area,level,switchIndex,"2");
            }
            int renewNum = renewSaveModel.getResult2().intValue();
            int switchNum = switchSaveModel.getResult2().intValue();

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

@@ -1476,9 +1476,9 @@ public class EsStatisticsController extends BaseController {
            @RequestParam(required = false) String lowCode) {
        try {
            //year没传默认是今年
            if (org.springframework.util.StringUtils.isEmpty(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) {