diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java
index b341c6d4..b950ff3c 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java
@@ -103,6 +103,16 @@ public class QuestionSubjectOption extends BaseEntity {
*/
private String remarkableFlag;
+ /**
+ * 附加问题内容
+ */
+ private String additionalQuestion;
+
+ /**
+ * 附加问题的意图
+ */
+ private String additionalQuestionIntent;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/yzaiobs/impl/YZAIOBSServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/yzaiobs/impl/YZAIOBSServiceImpl.java
index 376fcac8..d7d955af 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/yzaiobs/impl/YZAIOBSServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/yzaiobs/impl/YZAIOBSServiceImpl.java
@@ -409,7 +409,7 @@ public class YZAIOBSServiceImpl implements IYZAIOBSService {
String aiobQuestionName = "";
for (int i = 0; i < recordList.size(); i++) {
if (StringUtils.equals(recordList.get(i).getRole(), "speech") && StringUtils.isNotBlank(recordList.get(i).getContextText())
- &&recordList.get(i).getContextText().contains(questionNameAlias.replaceAll("\\p{P}", ""))
+ && recordList.get(i).getContextText().contains(questionNameAlias.replaceAll("\\p{P}", ""))
) {
hasQuestion = true;
aiobQuestionName = recordList.get(i).getContextText();
@@ -453,6 +453,11 @@ public class YZAIOBSServiceImpl implements IYZAIOBSService {
patientQuestionOptionResult.setQuestionSubjectOptionId(questionSubjectOption.getId());
+ // 判断是否有附加问题
+ if (callResultIntents.contains(questionSubjectOption.getAdditionalQuestionIntent())) {
+ //recordList.get(i).getContextText().contains(questionNameAlias.replaceAll("\\p{P}", "")
+ patientQuestionOptionResult.setOptionSubmitAnswer(getReply(recordList, questionSubjectOption.getAdditionalQuestion()));
+ }
patientQuestionOptionResults.add(patientQuestionOptionResult);
});
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml
index c78d18a2..31357a67 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml
@@ -21,6 +21,8 @@
+
+
@@ -39,7 +41,9 @@
speech_context_text,
intent,
contented_flag,
- remarkable_flag
+ remarkable_flag,
+ additional_question,
+ additional_question_intent
from question_subject_option
@@ -117,6 +121,10 @@
remarkable_flag,
+ additional_question,
+
+ additional_question_intent,
+
#{questionnaireSubjectId},
@@ -149,6 +157,10 @@
#{remarkableFlag},
+ #{additionalQuestion},
+
+ #{additionalQuestionIntent},
+
@@ -200,6 +212,12 @@
remarkable_flag =
#{remarkableFlag},
+ additional_question =
+ #{additionalQuestion},
+
+ additional_question_intent =
+ #{additionalQuestionIntent},
+
where id = #{id}
@@ -231,8 +249,10 @@
speech_context_text,
intent,
contented_flag,
- remarkable_flag
- ) values
+ remarkable_flag,
+ additional_question,
+ additional_question_intent
+ ) values
(
#{QuestionSubjectOption.questionnaireSubjectId},
@@ -247,8 +267,10 @@
#{QuestionSubjectOption.speechContextText},
#{QuestionSubjectOption.intent},
#{QuestionSubjectOption.contentedFlag},
- #{QuestionSubjectOption.remarkableFlag}
- )
+ #{QuestionSubjectOption.remarkableFlag},
+ #{QuestionSubjectOption.additionalQuestion},
+ #{QuestionSubjectOption.additionalQuestionIntent}
+ )
@@ -269,7 +291,9 @@
speech_context_text,
intent,
contented_flag,
- remarkable_flag
+ remarkable_flag,
+ additional_question,
+ additional_question_intent
from question_subject_option