|
|
@@ -264,7 +264,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
|
|
|
combineResults.stream()
|
|
|
.filter(r->ObjectUtil.isNotNull(r.getAlarmTime()))
|
|
|
.forEach(alarmTotalPieResult::handle);
|
|
|
- alarmTotalPieResult.setInfusionCount(CollectionUtil.size(groupByInfusionTimeResults.get(timeRange)));
|
|
|
+ alarmTotalPieResult.setInfusionCount(Optional.ofNullable(groupByInfusionTimeResults.get(timeRange)).orElse(new ArrayList<>()).stream().map(CombineAlarmResult::getId).distinct().count());
|
|
|
});
|
|
|
groupByTimeCountResult.forEach((timeRange,totalResult)->{
|
|
|
//表格内容
|