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

@@ -6226,7 +6226,7 @@ public class StatisticsESService {
                    " AND pd.category_code IN (1, 2)" +
                    " AND pd.czrq>='2018-06-30 17:00:00'"+
                    " AND pd.czrq < '"+time+" 17:00:00'" +
                    " AND LEFT(pd.czrq,4)= '"+year+"'";
                    " AND LEFT(pd.czrq,4)= '"+year+"' AND grant_admin_team NOT IN(SELECT id FROM wlyy_admin_team WHERE LENGTH(org_code)!=10)";
            if(level==3){
                sql +=" AND LEFT(dw.grant_org_code,6)= '"+area+"'";
            }else if (level==4){
@@ -6235,7 +6235,7 @@ public class StatisticsESService {
            sql +=" GROUP BY team";
            esModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(SaveModel.class));
        }else {
            esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0(date, area, level, index, SaveModel.timeLevel_DDL, low_level);
            esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0("2018-07-01",date, area, level, index, SaveModel.timeLevel_ZL, low_level);
        }
        if (esModelList != null && esModelList.size() > 0) {
@@ -6267,9 +6267,9 @@ public class StatisticsESService {
        }
        // 结果为空时,自建结果集
        if (resultList == null || resultList.size() < 1) {
        /*if (resultList == null || resultList.size() < 1) {
            resultList = getLowLevelMapKey(level, low_level, area);
        }
        }*/
        if (resultList != null) {
            DecimalFormat df = new DecimalFormat("0.0000");

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

@@ -531,7 +531,7 @@ public class EsStatisticsController extends BaseController {
    }
    /**
     * 指标截止日期累积量 到达量
     * 指标截止日期累积量 到达量.
     *
     * @param date
     * @param area
@@ -659,7 +659,14 @@ public class EsStatisticsController extends BaseController {
            JSONObject result = new JSONObject();
            for (String idx : indexes) {
                Long total = statisticsESService.getIndexTotal(endDate, area, level, idx, "2");
                Long total = 0L;
                if ("20".equals(idx)){
                    endDate = elasticsearchUtil.changeTime(endDate);
                    SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0("2018-07-01",endDate, area, level, index, "1");
                    total =  saveModel.getResult2().longValue();
                }else {
                    total=statisticsESService.getIndexTotal(endDate, area, level, idx, "2");
                }
                result.put("index_" + idx, total);
            }