diff --git a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java index 188bce5e06b59d74e2778778e96d3f84d2f3c2ac..c5b349b272a90ac3e5afe9434500899e410c41cb 100644 --- a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java +++ b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java @@ -502,29 +502,29 @@ public class PlanServiceImpl implements PlanService { switch (answer.getType()) { case "CHOICE": - keyValueNewVos.put(answer.getQuestionName() , optionalAnswerOption.map(QuestionnaireAnswerOption::getOptionName).orElse("-")); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), optionalAnswerOption.map(QuestionnaireAnswerOption::getOptionName).orElse("-")); break; case "SLIDE": case "DATE_SELECT": case "NUMBER": - keyValueNewVos.put(answer.getQuestionName() , optionalAnswerOption.map(option -> String.valueOf(option.getNumberAnswer())).orElse("-")); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), optionalAnswerOption.map(option -> String.valueOf(option.getNumberAnswer())).orElse("-")); break; case "MULTIPLE_CHOICE": List<String> optionNames = answerOptions.stream() .filter(x -> x.getAnswerId().equals(answer.getId()) && x.getQuestionId().equals(answer.getQuestionId())) .map(QuestionnaireAnswerOption::getOptionName) .collect(Collectors.toList()); - keyValueNewVos.put(answer.getQuestionName() , (optionNames.isEmpty() ? "-" : String.join(",", optionNames))); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), (optionNames.isEmpty() ? "-" : String.join(",", optionNames))); break; case "DATE": - keyValueNewVos.put(answer.getQuestionName() , optionalAnswerOption.map(QuestionnaireAnswerOption::getDateAt).orElse("-")); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), optionalAnswerOption.map(QuestionnaireAnswerOption::getDateAt).orElse("-")); break; case "SECTION_NUMBER": - keyValueNewVos.put(answer.getQuestionName() , (optionalAnswerOption.map(option -> option.getLeftMin() + "-" + option.getRightMax()).orElse("-"))); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), (optionalAnswerOption.map(option -> option.getLeftMin() + "-" + option.getRightMax()).orElse("-"))); break; case "TEXT": - keyValueNewVos.put(answer.getQuestionName() , optionalAnswerOption.map(QuestionnaireAnswerOption::getContent).orElse("-")); + keyValueNewVos.put(answer.getQuestionName().replaceAll("\\.", ""), optionalAnswerOption.map(QuestionnaireAnswerOption::getContent).orElse("-")); break; } }