Commit 2384cfad authored by Hando Lukats's avatar Hando Lukats
Browse files

TEIS-2394 implemented changes from testing

parent d0a7b9ef
......@@ -102,9 +102,9 @@ public class RiskAssessmentPDFService {
RequestMetaDTO requestMetaDTO, List<RiskFactorAssessmentEntity> riskFactorAssessments) {
List<RiskFactorPdfCategoryDto> categoryList = new ArrayList<>();
riskFactorAssessments.forEach(riskFactorAssessment -> {
if (riskFactorAssessment.getRiskFactorId() != null && BooleanUtils.isFalse(riskFactorAssessment.getAdditional())) {
if (BooleanUtils.isFalse(riskFactorAssessment.getAdditional()) && riskFactorAssessment.getRiskFactorId() != null) {
setRiskFactorCategoryByClassifier(categoryList, riskFactorAssessment, requestMetaDTO);
} else {
} else if (BooleanUtils.isTrue(riskFactorAssessment.getAdditional()) || riskFactorAssessment.getRiskFactorId() != null) {
RiskFactorPdfCategoryDto category = pdfComposeService.composeRiskFactorCategoryDto(ADDITIONAL_RISK_FACTORS, null);
Optional<RiskFactorPdfCategoryDto> existingCategory = getExistingRiskFactorCategory(categoryList, ADDITIONAL_RISK_FACTORS);
RiskFactorPdfDto riskFactor = pdfComposeService.composeRiskFactorPdfDto(riskFactorAssessment.getName(), riskFactorAssessment.getDescription(), null);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment