From 5b29851955140cf23dab720cab13033a0dc242a1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 3 Mar 2026 17:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigServiceDirectiveController.java | 42 ++++++++++--------- .../entity/ConfigServiceDirective.java | 2 + .../xml/ConfigServiceDirectiveMapper.xml | 16 ++++--- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index b3801010..188c648f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -93,26 +93,30 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); + + if(StringUtils.isNotBlank(configServiceDirective.getNotId())){ + queryWrapper.notIn("id", configServiceDirective.getNotId().split(",")); + } //如果有服务指令需要提前查询下对应的服务指令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"); - } - } +// 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"); +// } +// } if (configServiceDirective.isIzAbnormal()) { queryWrapper.eq("toll_price", new BigDecimal("0")); queryWrapper.eq("com_price", new BigDecimal("0")); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java index 330c0519..8b9d2c3b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java @@ -333,6 +333,8 @@ public class ConfigServiceDirective implements Serializable { // private String cycleTypeValue; @TableField(exist = false) private String syncCode; + @TableField(exist = false) + private String notId; // /** // * 指令类型 1日常护理 2周期护理 3即时护理 // */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 1bf5d102..bfc858af 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -89,16 +89,8 @@ c.preview_file_md5, c.preview_file_small_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 + c.immediate_file_focus_md5 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 c.id IN @@ -107,6 +99,12 @@ and c.iz_enabled = #{directive.izEnabled} + + c.id not IN + + #{item.id} + + ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc