From 2c0606f61f16e9ec05652b0676cb7c55e7723c39 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 11 Mar 2026 15:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=A0=87=E7=AD=BE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servicedirective/entity/ConfigServiceDirective.java       | 2 ++
 .../mapper/xml/ConfigServiceDirectiveMapper.xml               | 1 +
 .../modules/config/servicetag/mapper/xml/ServiceTagMapper.xml | 4 ++++
 3 files changed, 7 insertions(+)

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 8b9d2c3b..9f0757ad 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
@@ -335,6 +335,8 @@ public class ConfigServiceDirective implements Serializable {
     private String syncCode;
     @TableField(exist = false)
     private String notId;
+    @TableField(exist = false)
+    private String serviceAttributeName;
 //    /**
 //     * 指令类型  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 f9d42ffb..0324aa90 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
@@ -68,6 +68,7 @@
         c.sort,
         c.service_content,
         c.service_attribute,
+        case c.service_attribute when 'ds' then '定时' when 'js' then '计时' else null end as serviceAttributeName,
         c.service_duration,
         c.timeout_duration,
         c.status,
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml
index 7abdbaf1..13e2e28b 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml
@@ -21,6 +21,8 @@
             <result property="categoryId" column="category_id"/>
             <result property="typeId" column="type_id"/>
             <result property="instructionTagId" column="instruction_tag_id"/>
+            <result property="serviceAttribute" column="service_attribute"/>
+            <result property="serviceAttributeName" column="serviceAttributeName"/>
             <result property="tollPrice" column="toll_price"/>
             <result property="comPrice" column="com_price"/>
             <result property="izReimbursement" column="iz_reimbursement"/>
@@ -90,6 +92,8 @@
         csd.category_id,
         csd.type_id,
         csd.instruction_tag_id,
+        csd.service_attribute,
+        case csd.service_attribute when 'ds' then '定时' when 'js' then '计时' else null end as serviceAttributeName,
         csd.toll_price,
         csd.com_price,
         csd.iz_reimbursement,