From c99c9df383895b96803b324cc301de8bfb08cca9 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 22 Feb 2024 12:40:35 +0800 Subject: [PATCH] =?UTF-8?q?manage=20:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/manage/dto/MedicalRecAnswerExcelDTO.java | 4 ++-- .../service/impl/AskQuestionLibraryManageServiceImpl.java | 2 +- .../manage/service/impl/OfflineAnswerVideoResource.java | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) 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 c0bad1ac..05f721e0 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 @@ -96,7 +96,7 @@ public class MedicalRecAnswerExcelDTO { } this.absentCheck(); this.matchQuestionDicId(questionTypeDicList); - //this.matchQuestion(questionLibraryList); + this.matchQuestion(questionLibraryList); this.matchAskPatientAnswer(askPatientAnswerList); this.matchAnswerResource(materialLibraryList); } @@ -185,7 +185,7 @@ public class MedicalRecAnswerExcelDTO { String answerAnswer = askPatientAnswer.getAnswer(); if (this.libraryQuestionId.equals(questionId) && this.answer.equals(answerAnswer)){ this.askPatientAnswerId = askPatientAnswer.getId(); - errorCodeEnums.add(ErrorCodeEnum.ASK_PATIENT_ANSWER_REPEAT); + //errorCodeEnums.add(ErrorCodeEnum.ASK_PATIENT_ANSWER_REPEAT); return; } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index e2253731..86e5a691 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java @@ -97,7 +97,7 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa question.add(askTemplateQuestionLibrary.getDescription()); } if (StrUtil.isNotEmpty(askTemplateQuestionLibrary.getDefaultAnswer())){ - one.setDescription(askTemplateQuestionLibrary.getDefaultAnswer()); + one.setDefaultAnswer(askTemplateQuestionLibrary.getDefaultAnswer()); } one.setQuestion(question); askTemplateQuestionLibraryService.updateById(one); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java index 46bc7e35..234d58aa 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/OfflineAnswerVideoResource.java @@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.*; import java.util.List; @@ -52,6 +53,7 @@ public class OfflineAnswerVideoResource implements AnswerVideoResourceService { @Override + @Transactional(rollbackFor = Exception.class) public MedicalAnswerVideoResVo preGenerationMedicalAnswerVideo(InputStream inputStream, String medicalId) throws Exception { TimeInterval timer = DateUtil.timer();