|
|
@@ -117,7 +117,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
|
|
|
private LineResult ratioLine(Map<String, List<CombineAlarmResult>> results) {
|
|
|
LineResult<BigDecimal> result =LineResult.of("ratio",true,false,"提示率分布图");
|
|
|
List<String> time = result.getTime();
|
|
|
- Map<String, AlarmTotalPieResult> groupByTime = new HashMap<>();
|
|
|
+ Map<String, AlarmTotalPieResult> groupByTime = new LinkedHashMap<>();
|
|
|
//根据时间区间对镇痛方式进行统计
|
|
|
results.forEach((timeRange,combineResults)->{
|
|
|
AlarmTotalPieResult alarmTotalPieResult = groupByTime.computeIfAbsent(timeRange, k -> new AlarmTotalPieResult(addIntelligentParam()));
|
|
|
@@ -196,7 +196,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
|
|
|
lineContentMap.computeIfAbsent(DeviceAlarmEnum.Machine.getText(),k->new LineResult.LineContent<>(DeviceAlarmEnum.Machine.getText())).getValue().add(totalResult.getMachine().getValue());
|
|
|
lineContentMap.computeIfAbsent("低电量",k->new LineResult.LineContent<>("低电量")).getValue().add(totalResult.getLowBattery().getValue());
|
|
|
lineContentMap.computeIfAbsent(DeviceAlarmEnum.Bubble.getText(),k->new LineResult.LineContent<>(DeviceAlarmEnum.Bubble.getText())).getValue().add(totalResult.getBubble().getValue());
|
|
|
- lineContentMap.computeIfAbsent(DeviceAlarmEnum.InfusionMax.getText(),k->new LineResult.LineContent<>(DeviceAlarmEnum.InfusionMax.getText())).getValue().add(totalResult.getLowInfusion().getValue());
|
|
|
+ lineContentMap.computeIfAbsent(DeviceAlarmEnum.InfusionMax.getText(),k->new LineResult.LineContent<>(DeviceAlarmEnum.InfusionMax.getText())).getValue().add(totalResult.getInfusionMax().getValue());
|
|
|
|
|
|
if(addIntelligentParam()){
|
|
|
//智能泵专属
|
