From 2bcbca68d294ae1d076637eeaae94e32d0cdea32 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 17 Jan 2024 15:01:46 +0800 Subject: [PATCH] =?UTF-8?q?manage=20:=20=E9=97=AE=E9=A2=98=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=88=B6=E7=BA=A7=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AskQuestionLibraryManageServiceImpl.java | 7 ++++++- .../vo/manage/AskQuestionLibraryResVo.java | 18 ++++++++++++++++++ .../AskTemplateQuestionLibraryMapper.xml | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) 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 9be34576..f6a6ea51 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 @@ -36,7 +36,12 @@ public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryMa public Page queryPageList(Integer pageNum, Integer pageSize, AskQuestionLibraryReqVo askQuestionLibraryReqVo) { - return askTemplateQuestionLibraryService.queryPageList(pageNum,pageSize,askQuestionLibraryReqVo); + Page askQuestionLibraryResVoPage = askTemplateQuestionLibraryService.queryPageList(pageNum, pageSize, askQuestionLibraryReqVo); + if (CollUtil.isNotEmpty(askQuestionLibraryResVoPage.getRecords())){ + askQuestionLibraryResVoPage.getRecords().forEach(AskQuestionLibraryResVo::generateDicIdPath); + } + + return askQuestionLibraryResVoPage; } @Override diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java index 46d0c9e1..078777be 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java @@ -1,8 +1,10 @@ package com.supervision.vo.manage; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -20,6 +22,9 @@ public class AskQuestionLibraryResVo { @ApiModelProperty("问题类目id") private String dictId; + @ApiModelProperty(value = "问题类目父级id") + private String parentDictId; + @ApiModelProperty("由用户传入的问题生成的问题列表") private List question; @@ -34,4 +39,17 @@ public class AskQuestionLibraryResVo { @ApiModelProperty("类目名") private String nameZh; + + + private List dicIdPath; + public void generateDicIdPath(){ + + dicIdPath = new ArrayList<>(); + if (StrUtil.isNotEmpty(parentDictId)){ + dicIdPath.add(Integer.parseInt(parentDictId)); + } + if (StrUtil.isNotEmpty(dictId)){ + dicIdPath.add(Integer.parseInt(dictId)); + } + } } diff --git a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml index 17448c71..dd97b60e 100644 --- a/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml @@ -46,6 +46,7 @@ atql.id as libraryQuestionId, cd.code as code, atql.dict_id as dictId, + cd.parent_id as parentDictId, atql.description as description, atql.question as question, cd.name_zh_path as nameZhPath,