From f6781d276fe3e6e9150c28cf13e213ebf8a1ea0a Mon Sep 17 00:00:00 2001 From: liu Date: Mon, 18 Dec 2023 15:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/DiagnosisQaRecordService.java | 2 +- .../service/impl/DiagnosisQaRecordServiceImpl.java | 14 ++++++++------ .../controller/DiagnosisQaRecordController.java | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiagnosisQaRecordService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiagnosisQaRecordService.java index b4ec8fce..58eb2f23 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiagnosisQaRecordService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiagnosisQaRecordService.java @@ -14,5 +14,5 @@ import java.util.List; public interface DiagnosisQaRecordService extends IService { - List queryByProcessId(String processId); + List queryByProcessId(String processId,Integer pageNum,Integer pageSize); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java index c50536ee..550b9a08 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiagnosisQaRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.supervision.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.AskTemplateQuestionLibrary; import com.supervision.model.CommonDic; @@ -36,17 +37,15 @@ public class DiagnosisQaRecordServiceImpl extends ServiceImpl queryByProcessId(String processId) { - - List list = this.lambdaQuery().eq(DiagnosisQaRecord::getProcessId, processId).list(); - + public List queryByProcessId(String processId,Integer pageNum,Integer pageSize) { + Page page = this.lambdaQuery().eq(DiagnosisQaRecord::getProcessId, processId).page(new Page<>(pageNum, pageSize)); // 根据questionLibraryId找到对应的字典 - Set questionIdList = list.stream().map(DiagnosisQaRecord::getQuestionLibraryId).filter(StrUtil::isNotBlank).collect(Collectors.toSet()); + Set questionIdList = page.getRecords().stream().map(DiagnosisQaRecord::getQuestionLibraryId).filter(StrUtil::isNotBlank).collect(Collectors.toSet()); List askTemplateQuestionLibraryList = askTemplateQuestionLibraryService.listByIds(questionIdList); Map questionLibraryMap = askTemplateQuestionLibraryList.stream().collect(Collectors.toMap(AskTemplateQuestionLibrary::getId, AskTemplateQuestionLibrary::getDictId)); List commonDicList = commonDicService.lambdaQuery().eq(CommonDic::getGroupCode, "AQT").list(); Map dicMap = commonDicList.stream().collect(Collectors.toMap(CommonDic::getId, Function.identity())); - List resVOS = BeanUtil.copyToList(list, DiagnosisQaRecordHistoryResVO.class); + List resVOS = BeanUtil.copyToList(page.getRecords(), DiagnosisQaRecordHistoryResVO.class); for (DiagnosisQaRecordHistoryResVO resVO : resVOS) { Long dictId = questionLibraryMap.get(resVO.getQuestionLibraryId()); if (ObjectUtil.isNotEmpty(dictId)){ @@ -54,6 +53,9 @@ public class DiagnosisQaRecordServiceImpl extends ServiceImpl resultPage = new Page<>(page.getPages(), page.getSize(), page.getTotal()); + resultPage.setRecords(resVOS); return resVOS; } } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java index 2ee3223e..9940aa64 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java @@ -24,10 +24,10 @@ public class DiagnosisQaRecordController { private final DiagnosisQaRecordService diagnosisQaRecordService; @ApiOperation("查询问诊历史记录") @GetMapping("queryHistoryList") - public List queryDiagnosisHistoryQaList(String processId){ + public List queryDiagnosisHistoryQaList(String processId,Integer pageNum,Integer pageSize){ if (StrUtil.isEmpty(processId)){ throw new BusinessException("processId is empty"); } - return diagnosisQaRecordService.queryByProcessId(processId); + return diagnosisQaRecordService.queryByProcessId(processId,pageNum,pageSize); } }