diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java index a25c775..2689238 100644 --- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java +++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java @@ -177,8 +177,8 @@ public class RouteSectionCostCalculationService { var chanceRiskFactors = changeRiskFactorCalculationService.getChanceRiskFactors(setId, periodId); BigDecimal annualCost = (containerCalculation.isWeightExceeded() ? prices.weightPrice.multiply(annualWeight) : prices.volumePrice.multiply(annualVolume)); - BigDecimal annualRiskCost = annualCost.multiply(chanceRiskFactors.getRiskFactor()); - BigDecimal annualChanceCost = annualCost.multiply(chanceRiskFactors.getChanceFactor()); + BigDecimal annualRiskCost = RateType.MATRIX != section.getRateType() ? annualCost.multiply(chanceRiskFactors.getRiskFactor()) : annualCost; + BigDecimal annualChanceCost = RateType.MATRIX != section.getRateType() ? annualCost.multiply(chanceRiskFactors.getChanceFactor()): annualCost; result.setAnnualRiskCost(annualRiskCost); result.setAnnualChanceCost(annualChanceCost);