From b11dc5c85734118415eb5ca6f08dc50c8e125e30 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 22 Feb 2024 16:29:26 +0800 Subject: [PATCH] =?UTF-8?q?manage=20:=20=E7=96=BE=E7=97=85=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MedicalRecManageServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 9e1da676..811a5a24 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 @@ -133,6 +133,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { askPatientAnswer.setMedicalId(medicalRecId); askPatientAnswer.setAnswerResourceId(medicalRecQaVO.getAnswerResourceId()); askPatientAnswer.setAnswerType(answerType); + askPatientAnswer.setQuestion(CollUtil.getFirst(medicalRecQaVO.getQuestionList())); askPatientAnswer.insert(); } } @@ -215,6 +216,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { // 然后进行更新 existAnswer.setAnswer(medicalRecQaVO.getMedicalRecAnswer()); existAnswer.setAnswerResourceId(medicalRecQaVO.getAnswerResourceId()); + existAnswer.setQuestion(CollUtil.getFirst(medicalRecQaVO.getQuestionList())); existAnswer.updateById(); } else { AskPatientAnswer askPatientAnswer = new AskPatientAnswer(); @@ -222,6 +224,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { askPatientAnswer.setAnswer(medicalRecQaVO.getMedicalRecAnswer()); askPatientAnswer.setMedicalId(medicalRec.getId()); askPatientAnswer.setAnswerResourceId(medicalRecQaVO.getAnswerResourceId()); + askPatientAnswer.setQuestion(CollUtil.getFirst(medicalRecQaVO.getQuestionList())); askPatientAnswer.insert(); } } @@ -260,6 +263,9 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { medicalRecQaVO.setAnswerType(Objects.isNull(e.getAnswerType()) ? 1 : e.getAnswerType()); // 病历的回答 medicalRecQaVO.setMedicalRecAnswer(e.getAnswer()); + if (StrUtil.isNotEmpty(e.getQuestion())){ + medicalRecQaVO.setQuestionList(CollUtil.newArrayList(e.getQuestion())); + } medicalRecQaVO.setAnswerResourceId(e.getAnswerResourceId()); return medicalRecQaVO; }).collect(Collectors.toList()); @@ -286,7 +292,16 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { AskTemplateQuestionLibrary questionLibrary = askQuestionMap.get(medicalRecQaVO.getLibraryQuestionId()); if (ObjectUtil.isNotEmpty(questionLibrary)) { // 问题 - medicalRecQaVO.setQuestionList(questionLibrary.getQuestion()); + if (CollUtil.isNotEmpty(medicalRecQaVO.getQuestionList())){ + if (CollUtil.isNotEmpty(questionLibrary.getQuestion())){ + List question = questionLibrary.getQuestion(); + question.remove(CollUtil.getFirst(medicalRecQaVO.getQuestionList())); + medicalRecQaVO.getQuestionList().addAll(question); + } + }else { + medicalRecQaVO.setQuestionList(questionLibrary.getQuestion()); + } + // 类目 medicalRecQaVO.setDictId(questionLibrary.getDictId()); // 类目名称