From b71271f0a78b12ac9ba8752e9335b24fd71bbea0 Mon Sep 17 00:00:00 2001
From: huangjin <huangjin@lucahealthcare.com>
Date: Wed, 4 Sep 2024 14:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4dot=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/luca/pilot/service/impl/PlanServiceImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 188bce5..c5b349b 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;
}
}
--
GitLab