Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0

virtual-patient-model/src/main/java/com/supervision/service/DiagnosisQaRecordService.java

@@ -1,5 +1,6 @@
 package com.supervision.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.model.DiagnosisQaRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.vo.ask.DiagnosisQaRecordHistoryResVO;
@@ -14,5 +15,5 @@ import java.util.List;
 public interface DiagnosisQaRecordService extends IService<DiagnosisQaRecord> {
 
 
-    List<DiagnosisQaRecordHistoryResVO> queryByProcessId(String processId,Integer pageNum,Integer pageSize);
+    IPage<DiagnosisQaRecordHistoryResVO> queryByProcessId(String processId, Integer pageNum, Integer pageSize);
 }

virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java

@@ -1,8 +1,10 @@
 package com.supervision.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.AskTemplateQuestionLibrary;
@@ -36,16 +38,19 @@ public class DiagnosisQaRecordServiceImpl extends ServiceImpl<DiagnosisQaRecordM
     private final CommonDicService commonDicService;
 
     private final AskTemplateQuestionLibraryService askTemplateQuestionLibraryService;
+
     @Override
-    public List<DiagnosisQaRecordHistoryResVO> queryByProcessId(String processId,Integer pageNum,Integer pageSize) {
+    public IPage<DiagnosisQaRecordHistoryResVO> queryByProcessId(String processId, Integer pageNum, Integer pageSize) {
         Page<DiagnosisQaRecord> page = this.lambdaQuery().eq(DiagnosisQaRecord::getProcessId, processId).page(new Page<>(pageNum, pageSize));
+        List<DiagnosisQaRecordHistoryResVO> resVOS = BeanUtil.copyToList(page.getRecords(), DiagnosisQaRecordHistoryResVO.class);
         // 根据questionLibraryId找到对应的字典
         Set<String> questionIdList = page.getRecords().stream().map(DiagnosisQaRecord::getQuestionLibraryId).filter(StrUtil::isNotBlank).collect(Collectors.toSet());
+        if (CollUtil.isNotEmpty(questionIdList)){
             List<AskTemplateQuestionLibrary> askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.listByIds(questionIdList);
             Map<String, Long> questionLibraryMap = askTemplateQuestionLibraryList.stream().collect(Collectors.toMap(AskTemplateQuestionLibrary::getId, AskTemplateQuestionLibrary::getDictId));
             List<CommonDic> commonDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list();
             Map<Long, CommonDic> dicMap = commonDicList.stream().collect(Collectors.toMap(CommonDic::getId, Function.identity()));
-        List<DiagnosisQaRecordHistoryResVO> resVOS = BeanUtil.copyToList(page.getRecords(), DiagnosisQaRecordHistoryResVO.class);
+
             for (DiagnosisQaRecordHistoryResVO resVO : resVOS) {
                 Long dictId = questionLibraryMap.get(resVO.getQuestionLibraryId());
                 if (ObjectUtil.isNotEmpty(dictId)) {
@@ -53,10 +58,11 @@ public class DiagnosisQaRecordServiceImpl extends ServiceImpl<DiagnosisQaRecordM
                     resVO.setCommonDic(commonDic);
                 }
             }
+        }
         // 分页转换
-        Page<DiagnosisQaRecordHistoryResVO> resultPage = new Page<>(page.getPages(), page.getSize(), page.getTotal());
+        IPage<DiagnosisQaRecordHistoryResVO> resultPage = new Page<>(page.getPages(), page.getSize(), page.getTotal());
         resultPage.setRecords(resVOS);
-        return resVOS;
+        return resultPage;
     }
 }
 

virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java

@@ -1,6 +1,7 @@
 package com.supervision.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.exception.BusinessException;
 import com.supervision.model.DiagnosisQaRecord;
 import com.supervision.service.DiagnosisQaRecordService;
@@ -24,7 +25,7 @@ public class DiagnosisQaRecordController {
     private final DiagnosisQaRecordService diagnosisQaRecordService;
     @ApiOperation("查询问诊历史记录")
     @GetMapping("queryHistoryList")
-    public List<DiagnosisQaRecordHistoryResVO> queryDiagnosisHistoryQaList(String processId,Integer pageNum,Integer pageSize){
+    public IPage<DiagnosisQaRecordHistoryResVO> queryDiagnosisHistoryQaList(String processId, Integer pageNum, Integer pageSize){
         if (StrUtil.isEmpty(processId)){
             throw new BusinessException("processId is empty");
         }