From 83d6294f8ba6540c784875562de045c6f152e66e Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 4 Jul 2024 17:44:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=83=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LabelFieldContentController.java | 18 ++++++----------- .../LabelFieldContentMapper.java | 9 +++++++++ .../ILabelFieldContentService.java | 2 +- .../impl/LabelFieldContentServiceImpl.java | 16 +++++++++++---- .../impl/LabelFieldInfoServiceImpl.java | 3 +++ .../LabelFieldContentMapper.xml | 20 +++++++++++++++++++ 6 files changed, 51 insertions(+), 17 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java index 5414d6dc..3dcebb40 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java @@ -11,18 +11,12 @@ import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO; import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService; import com.xinelu.manage.vo.labelfieldcontent.LabelField; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldAndPartitionDict; -import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import java.util.List; /** * 标签字段内容信息Controller @@ -102,8 +96,8 @@ public class LabelFieldContentController extends BaseController { * 分组信息 */ @GetMapping("/groupingContent") - public AjaxResult groupingContent() { - return labelFieldContentService.groupingContent(); + public AjaxResult groupingContent(Long patientId) { + return labelFieldContentService.groupingContent(patientId); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java index 7330699c..294a8879 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java @@ -116,4 +116,13 @@ public interface LabelFieldContentMapper { * @return int */ int updateContentRemarkLabelFieldContentList(List labelFieldContentList); + + /** + * 查询画像sn + * + * @param taskPartitionDictIds 细分id + * @param patientId 患者id + * @return LabelFieldContent + */ + List selectLabelFieldContentPortraitSn(@Param("taskPartitionDictIds") List taskPartitionDictIds, @Param("patientId") Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java index 885291b1..f75ea3b0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java @@ -72,7 +72,7 @@ public interface ILabelFieldContentService { * * @return LabelFieldInfo */ - AjaxResult groupingContent(); + AjaxResult groupingContent(Long patientId); /** * 画像查询 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index 20980ed7..98fcf69d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -171,7 +171,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { * @return LabelFieldInfo */ @Override - public AjaxResult groupingContent() { + public AjaxResult groupingContent(Long patientId) { //创建全部选项 TaskPartitionDictId =0为全部 List labelFieldInfoList = new ArrayList<>(); LabelFieldInfo labelFieldInfo = new LabelFieldInfo(); @@ -181,12 +181,20 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { //任务细分表数据 List labelFieldInfos = labelFieldInfoMapper.taskPartitionDictIdList(); if (CollectionUtils.isNotEmpty(labelFieldInfos)) { + List collect = labelFieldInfos.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskPartitionDictId())).map(LabelFieldInfo::getTaskPartitionDictId).distinct().collect(Collectors.toList()); + List labelFieldContents = labelFieldContentMapper.selectLabelFieldContentPortraitSn(collect,patientId); + if (CollectionUtils.isNotEmpty(labelFieldContents)) { + for (LabelFieldInfo fieldInfo : labelFieldInfos) { + List collect1 = labelFieldContents.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getFieldId()) && fieldInfo.getTaskPartitionDictId().equals(item.getFieldId())).map(LabelFieldContent::getPortraitSn).distinct().collect(Collectors.toList()); + fieldInfo.setFieldSort(collect1.size()); + } + } labelFieldInfoList.addAll(labelFieldInfos); } //未分组选项 TaskPartitionDictId =null 为未分组 - LabelFieldInfo labelFieldInfoTow = new LabelFieldInfo(); - labelFieldInfoTow.setTaskPartitionDictName("未分组"); - labelFieldInfoList.add(labelFieldInfoTow); + LabelFieldInfo labelFieldInfoTwo = new LabelFieldInfo(); + labelFieldInfoTwo.setTaskPartitionDictName("未分组"); + labelFieldInfoList.add(labelFieldInfoTwo); return AjaxResult.success(labelFieldInfoList); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index aa9ccd40..b60813be 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -71,6 +71,9 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { */ @Override public List labelFieldList(Long taskPartitionDictId, String fieldType) { + if (Objects.isNull(taskPartitionDictId)) { + return new ArrayList<>(); + } int i = 1; //查询细分 List labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml index 69e92f3c..4119067e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -431,4 +431,24 @@ where id = #{labelFieldContentList.labelFieldContentId} + + \ No newline at end of file