diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/dto/PtValsCalReqDto.java b/backend/src/main/java/ca/bc/gov/backendstartapi/dto/PtValsCalReqDto.java index 94cff9744..6d22d0a4a 100644 --- a/backend/src/main/java/ca/bc/gov/backendstartapi/dto/PtValsCalReqDto.java +++ b/backend/src/main/java/ca/bc/gov/backendstartapi/dto/PtValsCalReqDto.java @@ -13,4 +13,4 @@ public record PtValsCalReqDto( @NotNull List orchardPtVals, @NotNull List smpMixIdAndProps, @NotNull Integer smpParentsOutside, - @NotNull BigDecimal contaminantPollenBv) {} + BigDecimal contaminantPollenBv) {} diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java index 1a05562c3..400d110e8 100644 --- a/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java +++ b/backend/src/main/java/ca/bc/gov/backendstartapi/service/ParentTreeService.java @@ -203,7 +203,12 @@ public PtCalculationResDto calculatePtVals(PtValsCalReqDto ptVals) { Integer totalNonOrchardPollen = 0; Integer numNonOrchardPollen = 0; - SparLog.debug("ptVals.contaminantPollenBv(): {}", ptVals.contaminantPollenBv()); + double contaminantPollenBvDouble = 0; + if (ValueUtil.hasValue(ptVals.contaminantPollenBv())) { + contaminantPollenBvDouble = ptVals.contaminantPollenBv().doubleValue(); + } + + SparLog.debug("contaminantPollenBvDouble: {}", contaminantPollenBvDouble); // --Third pass to calc values that depend on totals derived above and the remainder for (OrchardParentTreeValsDto parentTreeRow : ptVals.orchardPtVals()) { @@ -257,7 +262,7 @@ public PtCalculationResDto calculatePtVals(PtValsCalReqDto ptVals) { // --col:AA double vmContamContrib = - (auxValueAa * ptVals.contaminantPollenBv().doubleValue()) * femaleCropPop.doubleValue(); + (auxValueAa * contaminantPollenBvDouble) * femaleCropPop.doubleValue(); // --col:AB (depends on SUM(X)=v_sum_m_gw_contrib_orch_poll) double auxValueAb =