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

@@ -4287,11 +4287,11 @@ public class StatisticsESService {
                    signOnlineMap.put("name", one.getTeamName());
                }*/
                if (low_level.equals("3") && one.getTown() != null) {
                    signOnlineMap.put(one.getTown(), one.getResult2().intValue());
                    signOnlineMap.put(one.getTown(), one.getResult2().longValue());
                } else if (low_level.equals("4") && one.getHospital() != null) {
                    signOnlineMap.put(one.getHospital(), one.getResult2().intValue());
                    signOnlineMap.put(one.getHospital(), one.getResult2().longValue());
                } else if (low_level.equals("5") && one.getTeam() != null) {
                    signOnlineMap.put(one.getTeam(), one.getResult2().intValue());
                    signOnlineMap.put(one.getTeam(), one.getResult2().longValue());
                }
            }
        }
@@ -4315,24 +4315,24 @@ public class StatisticsESService {
            for (Map<String, Object> reMap : resultList) {
                reMap.put("amount", reMap.get("amount") != null ? Long.valueOf(reMap.get("amount").toString()) : 0L);
                Integer signNun = 0;
                Integer signOnlineNum = 0;
                Long signNun = 0L;
                Long signOnlineNum = 0L;
                //获取签约量
                if (resultMap != null && resultMap.size() > 0) {
                    SaveModel one = resultMap.get(reMap.get("code").toString());
                    if (one != null) {
                        signNun = one.getResult2().intValue();
                        signNun = one.getResult2().longValue();
                    }
                }
                if (signOnlineMap != null && signOnlineMap.size() > 0) {
                    signOnlineNum = (Integer) signOnlineMap.get(String.valueOf(reMap.get("code")));
                    signOnlineNum = (Long) signOnlineMap.get(String.valueOf(reMap.get("code")));
                    if (signOnlineNum == null) {
                        signOnlineNum = 0;
                        signOnlineNum = 0L;
                    }
                }
                reMap.put("signNun", signNun);
                reMap.put("signOnlineNum", signOnlineNum);
                reMap.put("rate", getRange(signOnlineNum, signNun, 2));//线上签约率是 线上签约量/签约量
                reMap.put("rate", getRange(signOnlineNum.intValue(), signNun.intValue(), 2));//线上签约率是 线上签约量/签约量
            }
            if ((level == 2 && "5".equals(lowLevel)) || (level == 4) || (level == 3 && "5".equals(lowLevel))) {

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

@@ -589,7 +589,7 @@ public class EsStatisticsController extends BaseController {
    /**
     * 获取三师转签或高危人群
     *
     **-
     * @param endDate
     * @param area
     * @param level
@@ -1925,7 +1925,7 @@ public class EsStatisticsController extends BaseController {
    /**
     * 获取 线上续签率和续签率
     * 前端:线上续签.
     * 前端:线上续签
     *
     * @param index 29,43,44 （51，53，54 服务类型维度）
     * @param level 等级  4 市  3区  2社区 1团队