From 58f02edde6ea146b598d0793c847b860ebb1ba71 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 3 Apr 2026 14:52:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E4=B8=8E=E4=B8=9A=E5=8A=A1=E7=AB=AF=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigServiceDirectiveController.java | 26 ------------------- .../xml/ConfigServiceDirectiveMapper.xml | 17 ++++++------ .../ConfigServiceDirectiveServiceImpl.java | 11 -------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index b3d5450..e3b8cbc 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -159,32 +159,6 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); - //如果有服务指令需要提前查询下对应的服务指令id - List directiveIds = null; - if (StringUtils.isNotBlank(configServiceDirective.getBodyTags())) { - directiveIds = configServiceDirectiveService.queryDirectiveIdByBodyTagIds(configServiceDirective.getBodyTags()); - if (directiveIds != null && !directiveIds.isEmpty()) { - queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); - } else { - //体重标签下没有数据 - queryWrapper.eq("id", "null"); - } - } - if (StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { - directiveIds = configServiceDirectiveService.queryDirectiveIdByEmotionTagIds(configServiceDirective.getEmotionTags()); - if (directiveIds != null && !directiveIds.isEmpty() && StringUtils.isNotBlank(configServiceDirective.getEmotionTags())) { - queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); - } else { - //情绪标签下没有数据 - queryWrapper.eq("id", "null"); - } - } - //只查询已授权（status = 0) -// if (StringUtils.isNotBlank(configServiceDirective.getStatus())) { -// queryWrapper.in("status", configServiceDirective.getStatus().split(",")); -// } else { -// queryWrapper.in("status", new String[]{"0", "2"}); -// } if (StringUtils.isNotBlank(configServiceDirective.getExcludeIds())) { queryWrapper.notIn("id", configServiceDirective.getExcludeIds().split(",")); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 6e315d3..7897b4e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -39,6 +39,9 @@ + + + @@ -88,15 +91,13 @@ c.preview_file_md5, c.immediate_file_md5, c.immediate_file_focus_md5, - bodytag.id as bodyTagId, - bodytag.tag_name as bodyTagName, - emotag.id as emotionTagId, - emotag.tag_name as emotionTagName + inst.instruction_name as instructionName, + category.category_name as categoryName, + stype.type_name as typeName FROM nu_config_service_directive c - LEFT JOIN nu_directive_body_tag dbt ON c.id = dbt.directive_id - LEFT JOIN nu_config_body_tag bodytag ON dbt.tag_id = bodytag.id - LEFT JOIN nu_directive_emotion_tag det ON c.id = det.directive_id - LEFT JOIN nu_config_emotion_tag emotag ON det.tag_id = emotag.id + LEFT JOIN nu_config_service_instruction_tag inst ON c.instruction_tag_id = inst.id + LEFT JOIN nu_config_service_category category ON c.category_id = category.id + LEFT JOIN nu_config_service_type stype ON c.type_id = stype.id c.id IN diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index a19857d..f00f10c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -88,20 +88,9 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl list = baseMapper.pageList(configServiceDirective, list_.getRecords()); - //处理服务标签字段 - if (list != null && !list.isEmpty()) { - list.stream().forEach(record -> { - List bodyTagList = record.getBodyTagList(); - record.setBodyTags(bodyTagList.stream().map(DirectiveBodyTag::getId).collect(Collectors.joining(","))); - List emotionTagList = record.getEmotionTagList(); - record.setEmotionTags(emotionTagList.stream().map(DirectiveEmotionTag::getId).collect(Collectors.joining(","))); - }); - } - //处理单元格合并所需数据 // merge(list); - return list; }