|
@ -3725,12 +3725,10 @@ public class StatisticsESService {
|
|
map.put("name", one.getTeamName());
|
|
map.put("name", one.getTeamName());
|
|
}
|
|
}
|
|
map.put("val", one.getResult2().longValue());
|
|
map.put("val", one.getResult2().longValue());
|
|
|
|
rs.add(map);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
|
|
|
|
//统计数据为空时,自建结果集
|
|
//统计数据为空时,自建结果集
|
|
// List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
|
// resultList = getLowLevelMapKey(level, lowlevel, area);
|
|
|
|
List<Town> townList = null;
|
|
List<Town> townList = null;
|
|
List<Hospital> hospitalList = null;
|
|
List<Hospital> hospitalList = null;
|
|
List<AdminTeam> adminTeams = null;
|
|
List<AdminTeam> adminTeams = null;
|
|
@ -3746,25 +3744,30 @@ public class StatisticsESService {
|
|
}
|
|
}
|
|
if (SaveModel.townLevel.equals(lowlevel)) {
|
|
if (SaveModel.townLevel.equals(lowlevel)) {
|
|
for (Town one : townList) {
|
|
for (Town one : townList) {
|
|
|
|
map = new HashMap<>();
|
|
map.put("code", one.getCode());
|
|
map.put("code", one.getCode());
|
|
map.put("name", one.getName());
|
|
map.put("name", one.getName());
|
|
map.put("val", 0);
|
|
map.put("val", 0);
|
|
|
|
rs.add(map);
|
|
}
|
|
}
|
|
} else if (SaveModel.OrgLevel.equals(lowlevel)) {
|
|
} else if (SaveModel.OrgLevel.equals(lowlevel)) {
|
|
for (Hospital one : hospitalList) {
|
|
for (Hospital one : hospitalList) {
|
|
|
|
map = new HashMap<>();
|
|
map.put("code", one.getCode());
|
|
map.put("code", one.getCode());
|
|
map.put("name", one.getName());
|
|
map.put("name", one.getName());
|
|
map.put("val", 0);
|
|
map.put("val", 0);
|
|
|
|
rs.add(map);
|
|
}
|
|
}
|
|
} else if (SaveModel.teamLevel.equals(lowlevel)) {
|
|
} else if (SaveModel.teamLevel.equals(lowlevel)) {
|
|
for (AdminTeam one : adminTeams) {
|
|
for (AdminTeam one : adminTeams) {
|
|
|
|
map = new HashMap<>();
|
|
map.put("code", one.getLeaderCode());
|
|
map.put("code", one.getLeaderCode());
|
|
map.put("name", one.getName());
|
|
map.put("name", one.getName());
|
|
map.put("val", 0);
|
|
map.put("val", 0);
|
|
|
|
rs.add(map);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
rs.add(map);
|
|
|
|
return rs;
|
|
return rs;
|
|
}
|
|
}
|
|
|
|
|