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 63628994..c0bad1ac 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 @@ -18,13 +18,13 @@ public class MedicalRecAnswerExcelDTO { /** * 问诊类目1 */ - @Alias(value = "问诊类目Ⅰ") + @Alias(value = "* 问诊类目Ⅰ") private String questionTypeOne; /** * 问诊类目2 对应于 vp_ask_template_question_library 表中的 dict_id对应的 name_zh */ - @Alias(value = "问诊类目Ⅱ") + @Alias(value = "* 问诊类目Ⅱ") private String questionTypeTwo; /** @@ -73,7 +73,7 @@ public class MedicalRecAnswerExcelDTO { private String answerVideoSuffix = ".mp4"; - public static final List READ_ANSWER_VIDEO_TITLE = CollUtil.newArrayList("问诊类目Ⅰ", "问诊类目Ⅱ", "* 知识", "* 回答","* 视频名称"); + public static final List READ_ANSWER_VIDEO_TITLE = CollUtil.newArrayList("* 问诊类目Ⅰ", "* 问诊类目Ⅱ", "* 知识", "* 回答","* 视频名称"); public static final List WRITE_ANSWER_VIDEO_TITLE = CollUtil.newArrayList("问诊类目Ⅰ", "问诊类目Ⅱ", "* 知识", "* 回答","* 视频名称","错误原因"); @@ -91,6 +91,7 @@ public class MedicalRecAnswerExcelDTO { List split = StrUtil.split(this.answerVideoName, "."); if (split.size() > 1){ answerVideoSuffix = "." + split.get(split.size() - 1); + answerVideoName = CollUtil.getFirst(split); } } this.absentCheck(); @@ -271,8 +272,8 @@ public class MedicalRecAnswerExcelDTO { } public enum ErrorCodeEnum{ - QUESTION_TYPE_ONE_EMPTY("0001","问诊类目1不能为空"), - QUESTION_TYPE_TWO_EMPTY("0002","问诊类目2不能为空"), + QUESTION_TYPE_ONE_EMPTY("0001","问诊类目Ⅰ不能为空"), + QUESTION_TYPE_TWO_EMPTY("0002","问诊类目Ⅱ不能为空"), QUESTION_EMPTY("0003","知识不能为空"), ANSWER_EMPTY("0004","回答不能为空"), ANSWER_VIDEO_NAME_EMPTY("0005","视频名称不能为空"), diff --git a/virtual-patient-manage/src/main/resources/template/medical_answer_template.xlsx b/virtual-patient-manage/src/main/resources/template/medical_answer_template.xlsx index 83edd079..82c620bc 100644 Binary files a/virtual-patient-manage/src/main/resources/template/medical_answer_template.xlsx and b/virtual-patient-manage/src/main/resources/template/medical_answer_template.xlsx differ diff --git a/virtual-patient-manage/src/main/resources/template/medical_answer_template_error.xlsx b/virtual-patient-manage/src/main/resources/template/medical_answer_template_error.xlsx index f231d278..e9bc52d9 100644 Binary files a/virtual-patient-manage/src/main/resources/template/medical_answer_template_error.xlsx and b/virtual-patient-manage/src/main/resources/template/medical_answer_template_error.xlsx differ