diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
index 6c3b24a3..04e55d4a 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
@@ -118,7 +118,7 @@ public class MedicalRecManageController {
 
     @ApiOperation("查询病例默认问题")
     @PostMapping("/queryMedicalDefaultAnswer")
-    public MedicalAnswerVideoResVo queryMedicalDefaultAnswer(@ApiParam("病例id")
+    public List<MedicalRecQaVO> queryMedicalDefaultAnswer(@ApiParam("病例id")
                                                                  @RequestParam(value = "medicalRecId",required = false) String medicalRecId) {
 
         return medicalRecManageService.queryMedicalDefaultAnswer(medicalRecId);
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
index bcbb66c4..3e6c263d 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
@@ -43,5 +43,5 @@ public interface MedicalRecManageService {
 
     MedicalAnswerVideoResVo preUploadMedicalAnswer(MultipartFile multipartFile, String medicalRecId) throws Exception;
 
-    MedicalAnswerVideoResVo queryMedicalDefaultAnswer(String medicalRecId);
+    List<MedicalRecQaVO> queryMedicalDefaultAnswer(String medicalRecId);
 }
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 08709a95..b05adc93 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
@@ -2,6 +2,7 @@ package com.supervision.manage.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -258,8 +259,34 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
     }
 
     @Override
-    public MedicalAnswerVideoResVo queryMedicalDefaultAnswer(String medicalRecId) {
+    public List<MedicalRecQaVO> queryMedicalDefaultAnswer(String medicalRecId) {
 
-        return null;
+        CommonDic systemDic = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").eq(CommonDic::getCode, "system").one();
+        Assert.notNull(systemDic, "未找到系统问题");
+
+        Long systemDicId = systemDic.getId();
+
+        if (StrUtil.isNotEmpty(medicalRecId)) {
+            List<AskPatientAnswer> askPatientAnswerList = askPatientAnswerService.lambdaQuery()
+                    .eq(AskPatientAnswer::getMedicalId, medicalRecId).eq(AskPatientAnswer::getAnswerType, "0").list();
+            return askPatientAnswerList.stream().map(e -> {
+                MedicalRecQaVO medicalRecQaVO = new MedicalRecQaVO();
+                medicalRecQaVO.setId(e.getId());
+                medicalRecQaVO.setLibraryQuestionId(e.getLibraryQuestionId());
+                medicalRecQaVO.setDictId(systemDicId);
+                medicalRecQaVO.setDictNamePath(systemDic.getNameZhPath());
+                medicalRecQaVO.setMedicalRecAnswer(e.getAnswer());
+                return medicalRecQaVO;
+            }).collect(Collectors.toList());
+        }
+        List<AskTemplateQuestionLibrary> askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.lambdaQuery().eq(AskTemplateQuestionLibrary::getDictId, systemDicId).list();
+        return askTemplateQuestionLibraryList.stream().map(e -> {
+            MedicalRecQaVO medicalRecQaVO = new MedicalRecQaVO();
+            medicalRecQaVO.setLibraryQuestionId(e.getId());
+            medicalRecQaVO.setDictId(systemDicId);
+            medicalRecQaVO.setDictNamePath(systemDic.getNameZhPath());
+            medicalRecQaVO.setMedicalRecAnswer(e.getDefaultAnswer());
+            return medicalRecQaVO;
+        }).collect(Collectors.toList());
     }
 }