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 f05c5714..8ac73c8c 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 @@ -94,10 +94,10 @@ public class MedicalRecAnswerExcelDTO { } } this.absentCheck(); + this.matchQuestionDicId(questionTypeDicList); this.matchQuestion(questionLibraryList); this.matchAskPatientAnswer(askPatientAnswerList); this.matchAnswerResource(materialLibraryList); - this.matchQuestionDicId(questionTypeDicList); } public AskPatientAnswer toAskPatientAnswer(){ @@ -126,12 +126,12 @@ public class MedicalRecAnswerExcelDTO { return map; } public void absentCheck(){ - /*if (StrUtil.isEmpty(questionTypeOne)){ + if (StrUtil.isEmpty(questionTypeOne)){ errorCodeEnums.add(ErrorCodeEnum.QUESTION_TYPE_ONE_EMPTY); } if (StrUtil.isEmpty(questionTypeTwo)){ errorCodeEnums.add(ErrorCodeEnum.QUESTION_TYPE_TWO_EMPTY); - }*/ + } if (StrUtil.isEmpty(question)){ errorCodeEnums.add(ErrorCodeEnum.QUESTION_EMPTY); } @@ -232,6 +232,7 @@ public class MedicalRecAnswerExcelDTO { return; } } + errorCodeEnums.add(ErrorCodeEnum.DICE_NOT_FIND); } @@ -255,6 +256,20 @@ public class MedicalRecAnswerExcelDTO { map.put("errorReason", "错误原因"); return map; } + + /** + * 转换为AskTemplateQuestionLibrary + * @return AskTemplateQuestionLibrary 不对answer进行设置 + */ + public AskTemplateQuestionLibrary toAskTemplateQuestionLibrary() { + AskTemplateQuestionLibrary questionLibrary = new AskTemplateQuestionLibrary(); + if (StrUtil.isNotEmpty(this.dictId)){ + questionLibrary.setDictId(Long.parseLong(this.dictId)); + } + questionLibrary.setDescription(this.question); + return questionLibrary; + } + public enum ErrorCodeEnum{ QUESTION_TYPE_ONE_EMPTY("0001","问诊类目1不能为空"), QUESTION_TYPE_TWO_EMPTY("0002","问诊类目2不能为空"),