试题答案是多个

tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java

@@ -2,7 +2,6 @@ package com.ccsens.tcm.api;
 
 import com.ccsens.tcm.bean.dto.CodeVo;
 import com.ccsens.tcm.bean.dto.QuestionDto;
-import com.ccsens.tcm.bean.po.Question;
 import com.ccsens.tcm.bean.vo.QuestionVo;
 import com.ccsens.tcm.service.IImportService;
 import com.ccsens.tcm.service.IQuestionService;
@@ -57,9 +56,9 @@ public class QuestionController {
     }
     @ApiOperation(value = "查询所有得题目的类型和题目相关信息",notes = "1007:查询所有试题")
     @RequestMapping(value="/queryQuestion",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<QuestionVo.subjectLists>> queryQuestion() throws Exception {
+    public JsonResponse<List<QuestionVo.SubjectLists>> queryQuestion() throws Exception {
         log.info("查询所有试题:{}");
-        List<QuestionVo.subjectLists> subjectLists = questionService.queryQuestion();
+        List<QuestionVo.SubjectLists> subjectLists = questionService.queryQuestion();
         log.info("查询所有试题");
         return JsonResponse.newInstance().ok(subjectLists);
     }

tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java

@@ -1,5 +1,7 @@
 package com.ccsens.tcm.bean.vo;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -88,7 +90,7 @@ public class QuestionVo {
     }
     @Data
     @ApiModel("所有试题类型的信息")
-    public static class subjectLists{
+    public static class SubjectLists {
         @ApiModelProperty("id")
         private Long id;
         @ApiModelProperty("code")
@@ -96,7 +98,7 @@ public class QuestionVo {
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("子类型")
-        private List<subjectLists> optionVos;
+        private List<SubjectLists> optionVos;
     }
     @Data
     @ApiModel("患者信息的试题类型")
@@ -156,13 +158,22 @@ public class QuestionVo {
         private String remark;
         @ApiModelProperty("答题记录id")
         private Long recordId;
-        @ApiModelProperty("答案")
+        @ApiModelProperty("默认答案")
         private String answer;
+        @ApiModelProperty("答案数组，不包含默认答案")
+        private List<String> domList;
         @ApiModelProperty("说明")
         private String explains;
         @ApiModelProperty("选项信息")
         private List<PatientOption> optionVos;
 
+        public String getAnswer() {
+            if (StrUtil.isEmpty(answer) && CollectionUtil.isNotEmpty(domList)) {
+                this.answer = domList.get(0);
+                domList.remove(0);
+            }
+            return this.answer;
+        }
     }
 
     @Data

tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java

@@ -56,7 +56,7 @@ public interface QuestionDao extends QuestionMapper {
      * 查询所有的试题的相关信息
      * @return
      */
-    List<QuestionVo.subjectLists> queryQuestion();
+    List<QuestionVo.SubjectLists> queryQuestion();
 
-    List<QuestionVo.subjectLists> queryQuestion1();
+    List<QuestionVo.SubjectLists> queryQuestion1();
 }

tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java

@@ -16,5 +16,5 @@ public interface IQuestionService {
      */
     List<QuestionVo.PatientCode> getQuestionAndAnswer(QuestionDto.QueryQuestionAndAnswer param);
 
-    List<QuestionVo.subjectLists> queryQuestion();
+    List<QuestionVo.SubjectLists> queryQuestion();
 }

tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java

@@ -84,12 +84,12 @@ public class QuestionService implements IQuestionService{
     }
 
     @Override
-    public List<QuestionVo.subjectLists> queryQuestion() {
+    public List<QuestionVo.SubjectLists> queryQuestion() {
         //
-        List<QuestionVo.subjectLists> subjectLists= questionDao.queryQuestion();
+        List<QuestionVo.SubjectLists> subjectLists= questionDao.queryQuestion();
 
 
-        List<QuestionVo.subjectLists> subjectLists1=  questionDao.queryQuestion1();
+        List<QuestionVo.SubjectLists> subjectLists1=  questionDao.queryQuestion1();
         if(subjectLists1.size()>0){
             subjectLists1.forEach(subject1 -> {
                 for (int i = 0; i < subjectLists.size(); i++) {

tcm/src/main/resources/mapper_dao/QuestionDao.xml

@@ -116,8 +116,11 @@
       <result column="fillType" jdbcType="TINYINT" property="fillType" />
       <result column="qremark" jdbcType="VARCHAR" property="remark" />
       <result column="recordId" jdbcType="VARCHAR" property="recordId" />
-      <result column="answer" jdbcType="VARCHAR" property="answer" />
+      <!--<result column="answer" jdbcType="VARCHAR" property="answer" />-->
       <result column="explains" jdbcType="VARCHAR" property="explains" />
+      <collection property="domList" ofType="String">
+        <result column="answer"/>
+      </collection>
       <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$PatientOption">
         <id column="oid" jdbcType="BIGINT" property="id" />
         <result column="osort" jdbcType="INTEGER" property="sort" />
@@ -259,15 +262,15 @@
       )a
       ORDER BY a.qsort,a.osort,a.choose DESC,-a.otherInformation DESC
   </select>
-  <resultMap id="queryQuestionMap" type="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
+  <resultMap id="queryQuestionMap" type="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
       <id column="id" property="id"/>
       <result column="code" property="code"/>
       <result column="name" property="name"/>
-      <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
+      <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
           <id column="id1" property="id"/>
           <result column="code1" property="code"/>
           <result column="name1" property="name"/>
-          <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
+          <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
             <id property="id" column="id2"/>
             <result property="name" column="question"/>
           </collection>
@@ -295,11 +298,11 @@
         AND trc.rec_status =0
         order by trc.sort,trc1.sort,tq.sort
   </select>
-    <resultMap id="queryQuestion1Map" type="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
+    <resultMap id="queryQuestion1Map" type="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
-        <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
+        <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo.SubjectLists">
             <id property="id" column="id2"/>
             <result column="question" property="name"/>
         </collection>