修改曜智外呼。

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)

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);
 				});
 

postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml

@@ -21,6 +21,8 @@
 	    <result property="intent" column="intent"/>
         <result property="contentedFlag" column="contented_flag"/>
         <result property="remarkableFlag" column="remarkable_flag"/>
+	    <result property="additionalQuestion" column="additional_question"/>
+	    <result property="additionalQuestionIntent" column="additional_question_intent"/>
     </resultMap>
 
     <sql id="selectQuestionSubjectOptionVo">
@@ -39,7 +41,9 @@
                speech_context_text,
                intent,
                contented_flag,
-               remarkable_flag
+               remarkable_flag,
+               additional_question,
+	    	   additional_question_intent
         from question_subject_option
     </sql>
 
@@ -117,6 +121,10 @@
             </if>
             <if test="remarkableFlag != null">remarkable_flag,
             </if>
+	        <if test="additionalQuestion != null">additional_question,
+	        </if>
+	        <if test="additionalQuestionIntent != null">additional_question_intent,
+	        </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionnaireSubjectId != null">#{questionnaireSubjectId},
@@ -149,6 +157,10 @@
             </if>
             <if test="remarkableFlag != null">#{remarkableFlag},
             </if>
+	        <if test="additionalQuestion != null">#{additionalQuestion},
+	        </if>
+	        <if test="additionalQuestionIntent != null">#{additionalQuestionIntent},
+	        </if>
         </trim>
     </insert>
 
@@ -200,6 +212,12 @@
             <if test="remarkableFlag != null">remarkable_flag =
                 #{remarkableFlag},
             </if>
+	        <if test="additionalQuestion != null">additional_question =
+		        #{additionalQuestion},
+	        </if>
+	        <if test="additionalQuestionIntent != null">additional_question_intent =
+		        #{additionalQuestionIntent},
+	        </if>
         </trim>
         where id = #{id}
     </update>
@@ -231,8 +249,10 @@
 	    speech_context_text,
 	    intent,
         contented_flag,
-        remarkable_flag
+        remarkable_flag,
-        ) values
+	    additional_question,
+	    additional_question_intent
+	    ) values
         <foreach item="QuestionSubjectOption" index="index" collection="list" separator=",">
             (
             #{QuestionSubjectOption.questionnaireSubjectId},
@@ -247,8 +267,10 @@
 	        #{QuestionSubjectOption.speechContextText},
 	        #{QuestionSubjectOption.intent},
             #{QuestionSubjectOption.contentedFlag},
-            #{QuestionSubjectOption.remarkableFlag}
+            #{QuestionSubjectOption.remarkableFlag},
-            )
+	        #{QuestionSubjectOption.additionalQuestion},
+	        #{QuestionSubjectOption.additionalQuestionIntent}
+	        )
         </foreach>
     </insert>
 
@@ -269,7 +291,9 @@
 	    speech_context_text,
 	    intent,
         contented_flag,
-        remarkable_flag
+        remarkable_flag,
+	    additional_question,
+	    additional_question_intent
         from question_subject_option
         <where>
             <if test="questionSubjectIds != null and questionSubjectIds.size() > 0">