|
|
@@ -93,6 +93,12 @@ public class InfusionDoseStatsAnalyse implements CommonHistoryStats {
|
|
|
BigDecimal lastInputDose = Optional.ofNullable(inputDoseByInfusion.get(combineResult.getId())).orElse(BigDecimal.ZERO);
|
|
|
combineResult.setTotalAppendDose(inputDose.subtract(lastInputDose));
|
|
|
inputDoseByInfusion.put(combineResult.getId(),lastInputDose);
|
|
|
+ ladderResult.compute(timeRange,
|
|
|
+ (k,v)->{
|
|
|
+ List<CombineHistoryResult> value = Optional.ofNullable(v).orElse(new ArrayList<>());
|
|
|
+ value.add(combineResult);
|
|
|
+ return value;
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
handleMixPolyLines(ladderResult,result,
|
|
|
@@ -115,7 +121,7 @@ public class InfusionDoseStatsAnalyse implements CommonHistoryStats {
|
|
|
*/
|
|
|
private LineResult inputDoseLine(Map<String, List<CombineHistoryResult>> groupByTime) {
|
|
|
LineResult<BigDecimal> result = LineResult.of("inputDoseLine",false,false,"已输入量分析走势图");
|
|
|
- //阶梯状计算每个输注在特定区间内的已输注量
|
|
|
+ //阶梯状计算每个输注在特定区间内的已输注量
|
|
|
Map<String, List<CombineHistoryResult>> ladderResult = new HashMap<>();
|
|
|
//记录每个输注在最后区间范围内计算的结果, 当前区间的已输注量-前一时间区间的Pca数量=当前时间区间pca数量
|
|
|
Map<String, BigDecimal> inputDoseByInfusion = new HashMap<>();
|
|
|
@@ -125,6 +131,12 @@ public class InfusionDoseStatsAnalyse implements CommonHistoryStats {
|
|
|
BigDecimal lastInputDose = Optional.ofNullable(inputDoseByInfusion.get(combineResult.getId())).orElse(BigDecimal.ZERO);
|
|
|
combineResult.setInputDose(inputDose.subtract(lastInputDose));
|
|
|
inputDoseByInfusion.put(combineResult.getId(),lastInputDose);
|
|
|
+ ladderResult.compute(timeRange,
|
|
|
+ (k,v)->{
|
|
|
+ List<CombineHistoryResult> value = Optional.ofNullable(v).orElse(new ArrayList<>());
|
|
|
+ value.add(combineResult);
|
|
|
+ return value;
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
|