总体分析里的随访量修改为到达量

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

@@ -89,8 +89,14 @@ public class EsStatisticsController extends BaseController {
            JSONObject result = new JSONObject();
            if (index != null) {
                for (String idx : indexes) {
                    result.put("index_" + idx, statisticsESService.getDateIncrementDetail(startDate, endDate, interval, area, level, idx, level2_type));
//                    result.put("index_" + idx, statisticsService.getDateIncrementDetail(startDate, endDate, Integer.parseInt(interval), area, level, idx, level2_type));
                    if ("4".equals(idx)){
                        //2017-12-20 修改总体分析里的随访量为到达量
                        String year = Constant.getNowYear();
                        result.put("index_" + idx, statisticsESService.getDateTotal(startDate, endDate, Integer.valueOf(interval), area, level, idx, level2_type, year));
                    }else{
                        result.put("index_" + idx, statisticsESService.getDateIncrementDetail(startDate, endDate, interval, area, level, idx, level2_type));
//                      result.put("index_" + idx, statisticsService.getDateIncrementDetail(startDate, endDate, Integer.parseInt(interval), area, level, idx, level2_type));
                    }
                }
            }
@@ -164,8 +170,9 @@ public class EsStatisticsController extends BaseController {
            JSONObject result = new JSONObject();
            for (String idx : indexes) {
                if("3".equals(idx)){
                if("3".equals(idx) || "4".equals(idx)){
                    //为了确保之前是咨询量是准确的 所以咨询量用到达量不用增量累加
                    //2017-12-20 修改总体分析里的随访量为到达量
                    result.put("index_" + idx, statisticsESService.getTotalAmount3(startDate, endDate, area, level, idx, level2_type));
                }else{
                    result.put("index_" + idx, statisticsESService.getTotalAmount(startDate, endDate, area, level, idx, level2_type));