diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java index 7e148c17..a58b32f1 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java +++ b/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; } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java index f04bfa2a..f36999ea 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java +++ b/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; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index a56f68c0..dcb19ec4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/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 qaList,String medicalRecId,String answerType){ + private void saveAskPatientAnswer(List 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 medicalRecQaVOS = queryMedicalRecQaInfo(id); - Map> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType)); - medicalRecInfoVO.setQaList(qaListMap.getOrDefault("1", Collections.emptyList())); - medicalRecInfoVO.setDefaultQaList(qaListMap.getOrDefault("0", Collections.emptyList())); + Map> 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()); diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java index a1cfa67b..4d032fa4 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java @@ -44,7 +44,7 @@ public class AskPatientAnswer extends Model implements Seriali private String answerResourceId; @ApiModelProperty("回答类型 0:默认回答 1:自定义回答") - private String answerType; + private Integer answerType; /** * 创建人ID diff --git a/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml b/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml index 047401a0..4374e3ab 100644 --- a/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml @@ -11,7 +11,7 @@ - + diff --git a/virtual-patient-web/src/main/resources/sqlScript/todo.sql b/virtual-patient-web/src/main/resources/sqlScript/todo.sql index ac113ca3..3d32fb8d 100644 --- a/virtual-patient-web/src/main/resources/sqlScript/todo.sql +++ b/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 '主键',