From 1b17c6ffa07154407b73190f31dd16c97cb62be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 27 Jan 2026 08:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=8C=87=E4=BB=A4=E5=8C=85=E7=94=9F=E6=88=90=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E7=9A=84=E8=AF=AD=E5=8F=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/DirectiveOrderSubMapper.xml    | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
index 5f027d1e..1ccdd2ac 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
@@ -29,30 +29,31 @@
     </select>
 
     <select id="getSubDirectiveList" resultType="com.nu.modules.biz.order.entity.DirectiveOrderSub">
-        select
-            b.instruction_tag_id as instructionTagId,
-            e.instruction_name as instructionTagName,
-            b.category_id as categoryId,
+        SELECT
+            b.instruction_tag_id AS instructionTagId,
+            e.instruction_name AS instructionTagName,
+            b.category_id AS categoryId,
             c.category_name AS categoryName,
-            b.type_id as typeId,
-            d.type_name as typeName,
-            b.id as directiveId,
-            b.directive_name as directiveName,
-            b.preview_file as previewFile,
-            b.preview_file_small as previewFileSmall,
-            b.mp3_file as mp3File,
-            b.mp4_file as mp4File,
-            b.service_duration as serviceDuration,
-            b.service_content as serviceContent,
-            b.timeout_duration as timeoutDuration
-        from nu_config_package_directive a
-        left join nu_config_service_directive b on a.directive_id = b.id
-        left join nu_config_service_category c on b.category_id = c.id
-        left join nu_config_service_type d on b.type_id = d.id
-        left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
+            b.type_id AS typeId,
+            d.type_name AS typeName,
+            b.id AS directiveId,
+            b.directive_name AS directiveName,
+            b.preview_file AS previewFile,
+            b.preview_file_small AS previewFileSmall,
+            b.mp3_file AS mp3File,
+            b.mp4_file AS mp4File,
+            b.service_duration AS serviceDuration,
+            b.service_content AS serviceContent,
+            b.timeout_duration AS timeoutDuration
+        FROM nu_config_directive_package p
+        INNER JOIN nu_config_package_directive a ON p.id = a.package_id
+        LEFT JOIN nu_config_service_directive b ON a.directive_id = b.id
+        LEFT JOIN nu_config_service_category c ON b.category_id = c.id
+        LEFT JOIN nu_config_service_type d ON b.type_id = d.id
+        LEFT JOIN nu_config_service_instruction_tag e ON b.instruction_tag_id = e.id
         where a.package_id = #{packageId}
-          and a.del_flag = '0'
-          and a.iz_enabled = 'Y'
+          and p.del_flag = '0'
+          and p.iz_enabled = 'Y'
           and b.del_flag = '0'
           and b.iz_enabled = 'Y'
     </select>