From f7c4962e258ad329aafcd6d443bc68f45da7fcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 6 Nov 2025 08:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=8E=B7=E5=8F=96=E6=8C=87=E4=BB=A4=E5=8C=85=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NuBizNuCustomerServer/entity/DirectivePackageDto.java | 4 +---
 .../mapper/xml/NuBizNuCustomerServerMapper.xml            | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java
index 75dfcd88..bd3e43c8 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java
@@ -24,7 +24,7 @@ public class DirectivePackageDto implements Serializable {
 	/**服务指令包名称*/
     private String packageName;
     /**服务指令包总时长*/
-    private Long totalDuration;
+    private Long duration;
 	/**备注*/
     private String description;
 	/**排序*/
@@ -53,8 +53,6 @@ public class DirectivePackageDto implements Serializable {
     private String startTimeStr;
 //    结束时间
     private String endTimeStr;
-//    服务标签
-    private String instructionTagId;
 //    服务指令集合
     private List<NuBizNuCustomerServer> directivesList;
 
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
index 02468cb2..ad3464ab 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
@@ -8,7 +8,13 @@
 
 
     <select id="getNcPackagelist" resultType="com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto">
-        select * from nu_directive_package where del_flag = '0' and iz_enabled = '0'
+        select id,
+            package_name as packageName,
+            total_duration as duration,
+            description
+        from nu_directive_package
+        where del_flag = '0'
+          and iz_enabled = '0'
     </select>
 
     <select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer">