bug修改

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

@@ -1286,7 +1286,7 @@ public class StatisticsESService {
            return 0;
        }
        Double size = first  / second;
        DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0
        DecimalFormat df = new DecimalFormat("0.0");//格式化小数，不足的补0
        String filesize = df.format(size);
        return Double.valueOf(filesize);
    }
@@ -1905,26 +1905,14 @@ public class StatisticsESService {
    public JSONObject getConsultingTitle(int level, String area, String year) throws Exception {
        JSONObject result = new JSONObject();
        String quotaDate = elasticsearchUtil.getQuotaTime();
        if (StringUtils.isNotEmpty(year)) {
        if(!Constant.getNowYear().equals(year)){
            quotaDate = year + "-06-30";
        }
//        List<SaveModel> relyVal = elasticsearchUtil.findOneDateQuotaLevel1(quotaDate,area,level,"23","2");
//        List<SaveModel> relyTotal = elasticsearchUtil.findOneDateQuotaLevel1(quotaDate,area,level,"25","2");
//        List<SaveModel> onRelyTotal = elasticsearchUtil.findOneDateQuotaLevel1(quotaDate,area,level,"22","2");
        SaveModel relyVal = elasticsearchUtil.findOneDateQuotaLevel0(null, quotaDate, area, level, "23", "1");
        SaveModel relyTotal = elasticsearchUtil.findOneDateQuotaLevel0(null, quotaDate, area, level, "25", "1");
        SaveModel onRelyTotal = elasticsearchUtil.findOneDateQuotaLevel0(null, quotaDate, area, level, "22", "1");
//        JSONObject relyObject = new JSONObject(relyVal);
//        JSONObject totalObject = new JSONObject(relyTotal);
//        JSONObject onRelyObject = new JSONObject(onRelyTotal);
//        JSONArray rely = new JSONArray();
//        rely.put(relyObject);
//        JSONArray total = new JSONArray();
//        total.put(totalObject);
//        JSONArray onRely = new JSONArray();
//        onRely.put(onRelyObject);
        SaveModel relyVal = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, quotaDate, area, level, "23", "1");
        SaveModel relyTotal = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, quotaDate, area, level, "25", "1");
        SaveModel onRelyTotal = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, quotaDate, area, level, "22", "1");
        result.put("result", getCoutListTitle(level, relyVal, relyTotal, onRelyTotal));
        return result;
    }
@@ -1936,52 +1924,6 @@ public class StatisticsESService {
        Map<String, Object> onRelyMap = new HashMap<>();
        JSONObject result = new JSONObject();
        List<Map<String, Object>> resultMaps = new ArrayList<>();
//        for (String key : totalMap.keySet()) {
//            Map<String, Object> rs = new HashMap<>();
//            JSONObject relyRs = (JSONObject) relyMap.get(key);
//            JSONObject totalRs = (JSONObject) totalMap.get(key);
//            JSONObject onRelyRs = (JSONObject) onRelyMap.get(key);
//            if (relyRs == null || totalRs == null || onRelyRs == null) {
//                continue;
//            }
//            //合并结果集
//            Integer totalNm = totalRs.getInt("result2");
//            Integer relyNm = relyRs.getInt("result2");
//            Integer noRelyNm = onRelyRs.getInt("result2");
//            rs.put("name", relyRs.get(area + "Name"));
//            rs.put("noRelyCount", noRelyNm);
//            rs.put("relyCount", relyNm);
//            rs.put("total", totalNm);
//            rs.put("code", key);
//            if (totalNm != null && totalNm != 0) {
//                if (relyNm != null && relyNm != 0) {
//                    double rr = (double) relyNm / totalNm * 100;
//                    DecimalFormat df = new DecimalFormat("0.00");
//                    rs.put("relyRate", df.format(rr) + "%");
//                    rs.put("relyDoubleRate", rr);
//                } else {
//                    rs.put("relyRate", "0.00%");
//                    rs.put("relyDoubleRate", 0.0);
//                }
//                if (noRelyNm != null && noRelyNm != 0) {
//                    double rr = (double) noRelyNm / totalNm * 100;
//                    DecimalFormat df = new DecimalFormat("0.00");
//                    rs.put("noRelyRate", df.format(rr) + "%");
//                    rs.put("noRelyDoubleRate", rr);
//                } else {
//                    rs.put("noRelyRate", "0.00%");
//                    rs.put("noRelyDoubleRate", 0.0);
//                }
//
//            } else {
//                rs.put("relyRate", "0.00%");
//                rs.put("relyDoubleRate", 0.0);
//                rs.put("noRelyRate", "0.00%");
//                rs.put("noRelyDoubleRate", 0.0);
//            }
//            resultMaps.add(rs);
//        }
        //合并结果集
        Map<String, Object> rs = new HashMap<>();
        Integer totalNm = total.getResult2().intValue();
@@ -3638,4 +3580,17 @@ public class StatisticsESService {
        rs.put("avg", a.divide((new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP));
        return rs;
    }
    public JSONObject getAVGSocre(String level, String area) throws Exception {
        JSONObject resultJSON = new JSONObject();
        String quotaDate = elasticsearchUtil.getQuotaTime();
        SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, area, Integer.parseInt(level), "28", "2");
        JSONObject json = new JSONObject();
        json.put("avgCount", getRangeDouuble(saveModel.getResult1(), saveModel.getResult2().intValue(), 2));
        resultJSON.put("rs",json);
        return resultJSON;
    }
}

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

@@ -550,6 +550,8 @@ public class EsStatisticsController extends BaseController {
                    } else if (idx.equals("28")) {
                        //level=4&area=350200&sort=1&index=28&date=undefined&lowLevel=2
                        result.put("index_" + idx, statisticsESService.getAvgAllInfo(level, area, lowLevel));
                        //列表先用旧版  因为之前没有数据 等数据生成在切换到新版
                       // result.put("index_" + idx, statisticsService.getAvgAllInfo(levelTemp, area, lowLevelTemp));
                    } else if (idx.equals("13")) {
                        // sort=1&date=2017-07-13&level=4&index=13&area=350200&lowCode=
                        idx="1";
@@ -715,19 +717,7 @@ public class EsStatisticsController extends BaseController {
        try {
            //版与旧版统计适配
            level = elasticsearchUtil.changeLevel(level);
            JSONObject data = null;
//            if (Constant.getNowYear().equals(year)) {
//                //查今年的查找redis即可
//                data = statisticsService.getConsultingTitle(level, area);
//            } else if (org.springframework.util.StringUtils.isEmpty(year)) {
//                //为空默认查询全部
//                //查找redis的然后再添加去年年度的
//                data = statisticsService.getConsultingTitleAll(level, area, year);
//            } else {
//                //去数据库查找年份
//                data = statisticsService.getConsultingTitleWithYear(level, area, year);
//            }
            data = statisticsESService.getConsultingTitle(level, area, year);
            JSONObject data = statisticsESService.getConsultingTitle(level, area, year);
            if (data != null) {
                return write(200, "查询成功", "data", data);
            } else {
@@ -798,7 +788,9 @@ public class EsStatisticsController extends BaseController {
    @ResponseBody
    public String getAVGSocre(@RequestParam(required = true) String level, @RequestParam(required = true) String area) {
        try {
            return write(200, "查询成功", "data", statisticsService.getAVGSocre(level, area));
            //新版与旧版统计适配
            level = elasticsearchUtil.changeLevel(Integer.valueOf(level))+"";
            return write(200, "查询成功", "data", statisticsESService.getAVGSocre(level, area));
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");