es代码修改bug

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

@@ -2730,19 +2730,6 @@ public class StatisticsESService {
        rs.put(signTotal);
        //3.平均满意度
        SaveModel saveModel2 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, admin.getId() + "", Integer.parseInt(SaveModel.teamLevel), "28", SaveModel.timeLevel_ZL);
//        String sql = "SELECT count(1) as num FROM wlyy_consult_team d WHERE d.czrq>= ? and d.czrq<=? and d.admin_team_code =? ";
//        Map<String, Object> map = jdbcTemplate.queryForMap(sql, startDate, endDate,admin.getId());
        SaveModel saveModel21 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, admin.getId() + "", Integer.parseInt(SaveModel.teamLevel), "3", SaveModel.timeLevel_ZL);
        Double avgCout = 0.0;
        if (saveModel21.getResult2().intValue()!=0){
            avgCout = saveModel2.getResult1() / saveModel21.getResult2();
        }
        Map<String, Object> avgScore = new HashMap<>();
        avgScore.put("avgScore", avgCout);
        rs.put(avgScore);
        //4.获取咨詢數
        SaveModel saveModel3 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, admin.getId() + "", Integer.parseInt(SaveModel.teamLevel), "3", SaveModel.timeLevel_ZL);
        Map<String, Object> consultCout = new HashMap<>();
@@ -2773,6 +2760,26 @@ public class StatisticsESService {
        followupCout.put("followupCount", saveModel7.getResult2().longValue());
        rs.put(followupCout);
        //3.平均满意度
        SaveModel saveModel2 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, admin.getId() + "", Integer.parseInt(SaveModel.teamLevel), "28", SaveModel.timeLevel_ZL);
//        String sql = "SELECT count(1) as num FROM wlyy_consult_team d WHERE d.czrq>= ? and d.czrq<=? and d.admin_team_code =? ";
//        Map<String, Object> map = jdbcTemplate.queryForMap(sql, startDate, endDate,admin.getId());
        //SaveModel saveModel21 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, admin.getId() + "", Integer.parseInt(SaveModel.teamLevel), "3", SaveModel.timeLevel_ZL);
        Double avgCout = 0.0;
        String avgCoutStr="";
        DecimalFormat df = new DecimalFormat("#.0");
        if (saveModel2.getResult1().intValue()!=0 && saveModel2.getResult2().intValue()!=0){
            avgCout = saveModel2.getResult1()/saveModel2.getResult2();
            avgCoutStr=df.format(avgCout);
        }
//        if (saveModel21.getResult2().intValue()!=0){
//            avgCout = saveModel2.getResult1() / saveModel21.getResult2();
//            avgCoutStr = df.format(avgCout);
//        }
        Map<String, Object> avgScore = new HashMap<>();
        avgScore.put("avgScore", avgCoutStr);
        rs.put(avgScore);
        return rs;
    }
@@ -2795,10 +2802,12 @@ public class StatisticsESService {
        List<Map<String, Object>> rs = new ArrayList<>();
        for (SaveModel saveModel : list) {
            Map<String, Object> map = new HashMap<>();
            map.put("applyDate", dateFormat3.format(saveModel.getQuotaDate()));
            map.put("signCount", saveModel.getResult2().longValue());
            rs.add(map);
            if(saveModel.getResult2().intValue()!=0){
                Map<String, Object> map = new HashMap<>();
                map.put("applyDate", dateFormat.format(saveModel.getQuotaDate()));
                map.put("signCount", saveModel.getResult2().longValue());
                rs.add(map);
            }
        }
        JSONArray rsJs = new JSONArray(rs);
        return rsJs;
@@ -2822,10 +2831,12 @@ public class StatisticsESService {
        List<SaveModel> list = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, id + "", Integer.parseInt(SaveModel.teamLevel), "42", SaveModel.timeLevel_ZL, String.valueOf(Integer.parseInt(type) + 1));
        List<Map<String, Object>> rs = new ArrayList<>();
        for (SaveModel saveModel : list) {
            Map<String, Object> map = new HashMap<>();
            map.put("applyDate", dateFormat3.format(saveModel.getQuotaDate()));
            map.put("signCount", saveModel.getResult2().longValue());
            rs.add(map);
            if (saveModel.getResult2().intValue()!=0){
                Map<String, Object> map = new HashMap<>();
                map.put("applyDate", dateFormat.format(saveModel.getQuotaDate()));
                map.put("signCount", saveModel.getResult2().longValue());
                rs.add(map);
            }
        }
        JSONArray rsJs = new JSONArray(rs);
        return rsJs;
@@ -2848,13 +2859,14 @@ public class StatisticsESService {
        }
        startDate = startDate + " 00:00:00";
        endDate = endDate + " 23:59:59";
        String quotaTime = elasticsearchUtil.getQuotaTime();
        Long id = admin.getId();
        //家庭医生、健康咨询到达量
        //家庭医生、健康咨询增量
        SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, id + "", Integer.parseInt(SaveModel.teamLevel), "3", SaveModel.timeLevel_ZL);
        Long totalCount = saveModel.getResult2().longValue();
        //健康咨询量  未回复到达量
        SaveModel saveModel2 = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, id + "", Integer.parseInt(SaveModel.teamLevel), "22", SaveModel.timeLevel_ZL);
        //健康咨询量  未回复当天的到达量
        SaveModel saveModel2 = elasticsearchUtil.findOneDateQuotaLevel0(quotaTime, quotaTime, id + "", Integer.parseInt(SaveModel.teamLevel), "22", SaveModel.timeLevel_DDL);
        Long noReyCount = saveModel2.getResult2().longValue();
        JSONObject rs = new JSONObject();
        rs.put("onReyCount", noReyCount);
@@ -2885,25 +2897,23 @@ public class StatisticsESService {
        Map<String, Object> map = null;
        List<Map<String, Object>> rs = new ArrayList<>();
        Double avgCount = 0.0;
        String avgCountStr = "";
        DecimalFormat df = new DecimalFormat("#.0");
        for (SaveModel one : list) {
            String quotaDate = dateFormat.format(one.getQuotaDate());
            saveModel = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, id + "", Integer.parseInt(SaveModel.teamLevel), "59", SaveModel.timeLevel_ZL);
            //如果曾量为0，则说明没有数据。直接返回
            if(one.getResult2()!=0 && saveModel.getResult2().intValue()!=0){
                avgCount = one.getResult2() / saveModel.getResult2();
            }else if (one.getResult2()!=0 && saveModel.getResult2().intValue()==0){
                avgCount = 80.0;
            }else if (one.getResult2()==0){
                avgCount=0.0;
            }
            map = new HashMap<>();
            if ("0".equals(type)) {
                map.put("dateNo", dateFormat.format(one.getQuotaDate()));
            } else {
                map.put("weekNo", dateFormat.format(one.getQuotaDate()));
            if (one.getResult1()==null || one.getResult2()==null){
                avgCount=80.0;
            }else if (one.getResult1().intValue()!=0 && one.getResult2().intValue()!=0){
                avgCount=one.getResult1().doubleValue()/one.getResult2().doubleValue();
                avgCountStr = df.format(avgCount);
                map = new HashMap<>();
                if ("0".equals(type)) {
                    map.put("dateNo", dateFormat.format(one.getQuotaDate()));
                } else {
                    map.put("weekNo", dateFormat.format(one.getQuotaDate()));
                }
                map.put("avgCount", avgCountStr);
                rs.add(map);
            }
            map.put("avgCount", avgCount);
            rs.add(map);
        }
        return new JSONArray(rs);
    }
@@ -2920,33 +2930,37 @@ public class StatisticsESService {
    public JSONObject getTeamConsultCount(String teamCode, String startDate, String endDate, String type) throws Exception {
        //咨询未回复
        Integer interval = Integer.parseInt(type) + 2;
        List<SaveModel> list = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, teamCode, Integer.parseInt(SaveModel.teamLevel), "22", "2", interval + "");
        Integer interval = Integer.parseInt(type) + 1;
        List<SaveModel> list = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, teamCode, Integer.parseInt(SaveModel.teamLevel), "22", SaveModel.timeLevel_ZL, interval + "");
        //咨询总数
        List<SaveModel> list2 = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, teamCode, Integer.parseInt(SaveModel.teamLevel), "3", "2", interval + "");
        List<SaveModel> list2 = elasticsearchUtil.findLineChartDateQuotaLevel0(startDate, endDate, teamCode, Integer.parseInt(SaveModel.teamLevel), "3", SaveModel.timeLevel_ZL, interval + "");
        Map<String, Object> map = null;
        List<Map<String, Object>> noReyList = new ArrayList<>();
        for (SaveModel one : list) {
            map = new HashMap<>();
            if ("0".equals(type)) {
                map.put("weekOfMonth", DateUtil.getWeekOfMonth(dateFormat.format(one.getQuotaDate())));
            } else {
                map.put("dateNo", dateFormat.format(one.getQuotaDate()));
            if (one.getResult2().intValue()!=0){
                map = new HashMap<>();
                if ("0".equals(type)) {
                    map.put("dateNo",dateFormat.format(one.getQuotaDate()));
                } else {
                    map.put("dateNo", dateFormat.format(one.getQuotaDate()));
                }
                map.put("noRely", one.getResult2().longValue());
                noReyList.add(map);
            }
            map.put("noRely", one.getResult2().longValue());
            noReyList.add(map);
        }
        List<Map<String, Object>> totalList = new ArrayList<>();
        for (SaveModel one : list) {
            map = new HashMap<>();
            if ("0".equals(type)) {
                map.put("weekOfMonth", DateUtil.getWeekOfMonth(dateFormat.format(one.getQuotaDate())));
            } else {
                map.put("dateNo", dateFormat.format(one.getQuotaDate()));
        for (SaveModel one : list2) {
            if (one.getResult2().intValue()!=0){
                map = new HashMap<>();
                if ("0".equals(type)) {
                    map.put("dateNo", dateFormat.format(one.getQuotaDate()));
                } else {
                    map.put("dateNo", dateFormat.format(one.getQuotaDate()));
                }
                map.put("total", one.getResult2().longValue());
                totalList.add(map);
            }
            map.put("noRely", one.getResult2().longValue());
            totalList.add(map);
        }
        JSONObject result = new JSONObject();
        result.put("noReyList", noReyList);

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

@@ -835,7 +835,7 @@ public class EsStatisticsController extends BaseController {
        try {
            return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D201703150222",startDate,endDate));
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
        } catch (Exception e) {
            error(e);
@@ -862,10 +862,10 @@ public class EsStatisticsController extends BaseController {
            //判断是签约还是续签
            if ("0".equals(signType)) {
                return write(200, "查询成功", "data", statisticsESService.getSignCountLineByType(getUID(), type, startDate, endDate));
                //return write(200, "查询成功", "data", statisticsESService.getSignCountLineByType("xh1D201703150222",type,startDate,endDate));
                //return write(200, "查询成功", "data", statisticsESService.getSignCountLineByType("xh1D2017031502222",type,startDate,endDate));
            } else {
                return write(200, "查询成功", "data", statisticsESService.getRenewCountLineByType(getUID(), type, startDate, endDate));
                //return write(200, "查询成功", "data", statisticsESService.getRenewCountLineByType("xh1D201703150222",type,startDate,endDate));
                //return write(200, "查询成功", "data", statisticsESService.getRenewCountLineByType("xh1D2017031502222",type,startDate,endDate));
            }
        } catch (Exception e) {
            error(e);
@@ -888,7 +888,7 @@ public class EsStatisticsController extends BaseController {
                                   @RequestParam(required = true) String isNow) {
        try {
            return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow(getUID(), startDate, endDate, isNow));
            //return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow("xh1D201703150222",startDate,endDate,isNow));
            //return write(200, "查询成功", "data", statisticsESService.getReyStatbyTeamNow("xh1D2017031502222",startDate,endDate,isNow));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
@@ -896,7 +896,7 @@ public class EsStatisticsController extends BaseController {
    }
    /**
     * 获取机构内服务排行.
     * 获取机构内服务排行
     *
     * @param startDate
     * @param endDate
@@ -930,7 +930,7 @@ public class EsStatisticsController extends BaseController {
                             @RequestParam(required = true) String type) {
        try {
            return write(200, "查询成功", "data", statisticsESService.getAvgLine(getUID(), startDate, endDate, type));
            //return write(200, "查询成功", "data", statisticsESService.getAvgLine("xh1D201703150222",startDate,endDate,type));
            //return write(200, "查询成功", "data", statisticsESService.getAvgLine("xh1D2017031502222",startDate,endDate,type));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");

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

@@ -867,7 +867,7 @@ public class StatisticsController extends BaseController {
        try {
            return write(200, "查询成功", "data", statisticsService.getStatTitleInfo(getUID(), startDate, endDate));
            //return write(200, "查询成功", "data", statisticsService.getStatTitleInfo("xh1D201703150222",startDate,endDate));
            //return write(200, "查询成功", "data", statisticsService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
        } catch (Exception e) {
            error(e);
@@ -895,10 +895,10 @@ public class StatisticsController extends BaseController {
            //判断是签约还是续签
            if ("0".equals(signType)) {
                return write(200, "查询成功", "data", statisticsService.getSignCountLineByType(getUID(), type, startDate, endDate));
                //return write(200, "查询成功", "data", statisticsService.getSignCountLineByType("xh1D201703150222",type,startDate,endDate));
                //return write(200, "查询成功", "data", statisticsService.getSignCountLineByType("xh1D2017031502222",type,startDate,endDate));
            } else {
                return write(200, "查询成功", "data", statisticsService.getRenewCountLineByType(getUID(), type, startDate, endDate));
                //return write(200, "查询成功", "data", statisticsService.getRenewCountLineByType("xh1D201703150222",type,startDate,endDate));
                //return write(200, "查询成功", "data", statisticsService.getRenewCountLineByType("xh1D2017031502222",type,startDate,endDate));
            }
        } catch (Exception e) {
            error(e);
@@ -922,7 +922,7 @@ public class StatisticsController extends BaseController {
                                   @RequestParam(required = true) String isNow) {
        try {
            return write(200, "查询成功", "data", statisticsService.getReyStatbyTeamNow(getUID(), startDate, endDate, isNow));
            //return write(200, "查询成功", "data", statisticsService.getReyStatbyTeamNow("xh1D201703150222",startDate,endDate,isNow));
            //return write(200, "查询成功", "data", statisticsService.getReyStatbyTeamNow("xh1D2017031502222",startDate,endDate,isNow));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
@@ -966,7 +966,7 @@ public class StatisticsController extends BaseController {
                             @RequestParam(required = true) String type) {
        try {
             return write(200, "查询成功", "data", statisticsService.getAvgLine(getUID(), startDate, endDate, type));
             //return write(200, "查询成功", "data", statisticsService.getAvgLine("xh1D201703150222",startDate,endDate,type));
             //return write(200, "查询成功", "data", statisticsService.getAvgLine("xh1D2017031502222",startDate,endDate,type));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");