|
@ -1026,7 +1026,7 @@ public class StatisticsESService {
|
|
if (rs != null) {
|
|
if (rs != null) {
|
|
for (int i = 0; i < rs.length(); i++) {
|
|
for (int i = 0; i < rs.length(); i++) {
|
|
JSONObject r = rs.getJSONObject(i);
|
|
JSONObject r = rs.getJSONObject(i);
|
|
Integer id = (Integer) r.get("id");
|
|
|
|
|
|
Integer id = Integer.valueOf( r.get("code").toString());
|
|
String name = getTeamLeaderNameByTeamCode(leaders, id);
|
|
String name = getTeamLeaderNameByTeamCode(leaders, id);
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(name)) {
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(name)) {
|
|
r.put("name", name);
|
|
r.put("name", name);
|
|
@ -1355,7 +1355,7 @@ public class StatisticsESService {
|
|
});
|
|
});
|
|
}
|
|
}
|
|
} else if (level == 3) {
|
|
} else if (level == 3) {
|
|
List<SaveModel> esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0(DateUtil.dateToStrShort(new Date()), area, level, "28", SaveModel.timeLevel_DDL, "3");
|
|
|
|
|
|
List<SaveModel> esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0(DateUtil.dateToStrShort(new Date()), area, level, "28", SaveModel.timeLevel_DDL, "4");
|
|
esModelList.forEach(one -> {
|
|
esModelList.forEach(one -> {
|
|
JSONObject jo = new JSONObject();
|
|
JSONObject jo = new JSONObject();
|
|
jo.put("name", one.getHospitalName());
|
|
jo.put("name", one.getHospitalName());
|
|
@ -1368,8 +1368,8 @@ public class StatisticsESService {
|
|
List<SaveModel> esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0(DateUtil.dateToStrShort(new Date()), area, level, "28", SaveModel.timeLevel_DDL, "5");
|
|
List<SaveModel> esModelList = (List<SaveModel>) elasticsearchUtil.findListDateQuotaLevel0(DateUtil.dateToStrShort(new Date()), area, level, "28", SaveModel.timeLevel_DDL, "5");
|
|
esModelList.forEach(one -> {
|
|
esModelList.forEach(one -> {
|
|
JSONObject jo = new JSONObject();
|
|
JSONObject jo = new JSONObject();
|
|
jo.put("name", one.getTeam());
|
|
|
|
jo.put("code", one.getTeamName());
|
|
|
|
|
|
jo.put("name", one.getTeamName());
|
|
|
|
jo.put("code", one.getTeam());
|
|
jo.put("avgCount", getRangeDouuble(one.getResult1(), one.getResult2().intValue(), 2));
|
|
jo.put("avgCount", getRangeDouuble(one.getResult1(), one.getResult2().intValue(), 2));
|
|
ja.put(jo);
|
|
ja.put(jo);
|
|
});
|
|
});
|