Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1363,7 +1363,7 @@ public class StatisticsService extends BaseService {
                }
                JSONArray onRely = new JSONArray(onRelyTotal);
                result.put("resultList", getCoutList(rely, total, onRely));
                result.put("resultList", getCoutList(level,rely, total, onRely));
            } else {
                String timeKey = redisTemplate.opsForValue().get("quota:timeKey");
                if (StringUtils.isBlank(timeKey)) {
@@ -1391,7 +1391,7 @@ public class StatisticsService extends BaseService {
                }
                JSONArray onRely = new JSONArray(onRelyTotal);
                result.put("resultList", getCoutList(rely, total, onRely));
                result.put("resultList", getCoutList(level,rely, total, onRely));
            }
@@ -1424,7 +1424,7 @@ public class StatisticsService extends BaseService {
                return null;
            }
            JSONArray noRely = new JSONArray(noRelyTotal);
            result.put("resultList", getCoutList(rely, total, noRely));
            result.put("resultList", getCoutList(level,rely, total, noRely));
        } else if (level == 2) {//机构级别统计,统计所有团队
@@ -1455,7 +1455,7 @@ public class StatisticsService extends BaseService {
                return null;
            }
            JSONArray noRely = new JSONArray(noRelyTotal);
            List<Map<String, Object>> rs = getCoutList(rely, total, noRely);
            List<Map<String, Object>> rs = getCoutList(level,rely, total, noRely);
            statisticsAllService.translateTeamLeaderName(rs);
            result.put("resultList", rs);
        }
@@ -1503,7 +1503,7 @@ public class StatisticsService extends BaseService {
        JSONArray onRely = new JSONArray();
        onRely.put(onRelyObject);
        result.put("result", getCoutList(rely, total, onRely));
        result.put("result", getCoutList(level,rely, total, onRely));
        return result;
    }
@@ -1517,7 +1517,7 @@ public class StatisticsService extends BaseService {
     * @param onRely
     * @return
     */
    public List<Map<String, Object>> getCoutList(JSONArray rely, JSONArray total, JSONArray onRely) {
    public List<Map<String, Object>> getCoutList(Integer level,JSONArray rely, JSONArray total, JSONArray onRely) {
        Map<String, Object> relyMap = new HashMap<>();
        Map<String, Object> totalMap = new HashMap<>();
@@ -1588,7 +1588,9 @@ public class StatisticsService extends BaseService {
            resultMaps.add(rs);
        }
        if(level==1){
            statisticsAllService.translateTeamLeaderName(resultMaps);
        }
        //根据为回复数排序
        Collections.sort(resultMaps, new Comparator<Map<String, Object>>() {
@@ -4204,7 +4206,7 @@ public class StatisticsService extends BaseService {
        JSONArray onRely = new JSONArray();
        onRely.put(onRelyObject);
        result.put("result", getCoutList(rely, total, onRely));
        result.put("result", getCoutList(level,rely, total, onRely));
        return result;
    }
@@ -4245,7 +4247,7 @@ public class StatisticsService extends BaseService {
        JSONArray onRely = new JSONArray();
        onRely.put(onRelyObject);
        result.put("result", getCoutList(rely, total, onRely));
        result.put("result", getCoutList(level,rely, total, onRely));
        return result;
    }
@@ -4310,7 +4312,7 @@ public class StatisticsService extends BaseService {
                }
                JSONArray onRely = new JSONArray(onRelyTotal);
                result.put("resultList", getCoutList(rely, total, onRely));
                result.put("resultList", getCoutList(level,rely, total, onRely));
            } else {
                String timeKey = redisTemplate.opsForValue().get("quota:timeKey");
                if (StringUtils.isBlank(timeKey)) {
@@ -4338,7 +4340,7 @@ public class StatisticsService extends BaseService {
                }
                JSONArray onRely = new JSONArray(onRelyTotal);
                result.put("resultList", getCoutList(rely, total, onRely));
                result.put("resultList", getCoutList(level,rely, total, onRely));
            }
@@ -4371,7 +4373,7 @@ public class StatisticsService extends BaseService {
                return null;
            }
            JSONArray noRely = new JSONArray(noRelyTotal);
            result.put("resultList", getCoutList(rely, total, noRely));
            result.put("resultList", getCoutList(level,rely, total, noRely));
        } else if (level == 2) {//机构级别统计,统计所有团队
@@ -4402,7 +4404,7 @@ public class StatisticsService extends BaseService {
                return null;
            }
            JSONArray noRely = new JSONArray(noRelyTotal);
            List<Map<String, Object>> rs = getCoutList(rely, total, noRely);
            List<Map<String, Object>> rs = getCoutList(level,rely, total, noRely);
            statisticsAllService.translateTeamLeaderName(rs);
            result.put("resultList", rs);
        }
@@ -4430,7 +4432,7 @@ public class StatisticsService extends BaseService {
            return null;
        }
        result.put("resultList", statisticsAllService.translateTeamLeaderName(getCoutList(rely, total, onRely)));
        result.put("resultList", getCoutList(level,rely, total, onRely));
        return result;
    }