manage : 修改 vp_ask_patient_answer answerType字段类型

virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java

@@ -102,7 +102,7 @@ public class MedicalRecAnswerExcelDTO {
         askPatientAnswer.setLibraryQuestionId(this.libraryQuestionId);
         askPatientAnswer.setAnswer(this.answer);
         // 默认自定义回答
-        askPatientAnswer.setAnswerType("1");
+        askPatientAnswer.setAnswerType(1);
         return askPatientAnswer;
     }
 

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java

@@ -39,7 +39,7 @@ public class MedicalRecQaVO {
     private String medicalRecAnswer;
 
     @ApiModelProperty(value = "回答类型",hidden = true)
-    private String answerType;
+    private Integer answerType;
 
 
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -91,12 +91,12 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
         // 这里生成一个新的编号(首先去数据库里面查询编号,然后用最大的编号+1)(可能存在并发修改导致编码重复问题,不是重点,等有问题再说)
         medicalRecService.updateMedicalRecNo("QL", "男".equals(reqVO.getPatientGender()) ? "M" : "F", medicalRec.getId());
         // 然后保存病历对应的问题
-        saveAskPatientAnswer(reqVO.getQaList(), medicalRec.getId(), "1");
-        saveAskPatientAnswer(reqVO.getDefaultQaList(), medicalRec.getId(), "0");
+        saveAskPatientAnswer(reqVO.getQaList(), medicalRec.getId(), 1);
+        saveAskPatientAnswer(reqVO.getDefaultQaList(), medicalRec.getId(), 0);
     }
 
 
-    private void  saveAskPatientAnswer(List<MedicalRecQaVO> qaList,String medicalRecId,String answerType){
+    private void  saveAskPatientAnswer(List<MedicalRecQaVO> qaList,String medicalRecId,Integer answerType){
         if (CollUtil.isEmpty(qaList)) {
             return;
         }
@@ -215,9 +215,9 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
         medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
         // 问答策略
         List<MedicalRecQaVO> medicalRecQaVOS = queryMedicalRecQaInfo(id);
-        Map<String, List<MedicalRecQaVO>> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType));
-        medicalRecInfoVO.setQaList(qaListMap.getOrDefault("1", Collections.emptyList()));
-        medicalRecInfoVO.setDefaultQaList(qaListMap.getOrDefault("0", Collections.emptyList()));
+        Map<Integer, List<MedicalRecQaVO>> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType));
+        medicalRecInfoVO.setQaList(qaListMap.getOrDefault(1, Collections.emptyList()));
+        medicalRecInfoVO.setDefaultQaList(qaListMap.getOrDefault(0, Collections.emptyList()));
         return medicalRecInfoVO;
     }
 
@@ -230,7 +230,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
             MedicalRecQaVO medicalRecQaVO = new MedicalRecQaVO();
             medicalRecQaVO.setId(e.getId());
             medicalRecQaVO.setLibraryQuestionId(e.getLibraryQuestionId());
-            medicalRecQaVO.setAnswerType(StrUtil.isEmpty(e.getAnswerType()) ? "1" : e.getAnswerType());
+            medicalRecQaVO.setAnswerType(Objects.nonNull(e.getAnswerType()) ? 1 : e.getAnswerType());
             // 病历的回答
             medicalRecQaVO.setMedicalRecAnswer(e.getAnswer());
             medicalRecQaVO.setAnswerResourceId(e.getAnswerResourceId());

virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java

@@ -44,7 +44,7 @@ public class AskPatientAnswer extends Model<AskPatientAnswer> implements Seriali
     private  String answerResourceId;
 
     @ApiModelProperty("回答类型 0:默认回答 1:自定义回答")
-    private String answerType;
+    private Integer answerType;
 
     /**
      * 创建人ID

virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml

@@ -11,7 +11,7 @@
             <result property="answer" column="answer" jdbcType="VARCHAR"/>
             <result property="code" column="code" jdbcType="VARCHAR"/>
             <result property="answerResourceId" column="answer_resources_id" jdbcType="VARCHAR"/>
-            <result property="answerType" column="answer_type" jdbcType="VARCHAR"/>
+            <result property="answerType" column="answer_type" jdbcType="INTEGER"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>

virtual-patient-web/src/main/resources/sqlScript/todo.sql

@@ -83,7 +83,7 @@ alter table vp_file_resource
 
 -- 添加字段
 alter table vp_ask_patient_answer
-    add answer_type varchar(16) null comment '回答类型  0:默认回答 1:自定义回答' after answer_resource_id;
+    add answer_type integer null comment '回答类型  0:默认回答 1:自定义回答' after answer_resource_id;
 
 CREATE TABLE vp_directory_info (
                                      `id` varchar(64) NOT NULL COMMENT '主键',