From 2dee68b1faea6c50bd011c67deea203138f92997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 20 Jan 2026 11:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=98=9F=E6=9C=9F=E3=80=81=E6=97=A5=E6=9C=9F=E3=80=81?=
 =?UTF-8?q?=E9=A2=91=E6=AC=A1=E6=95=B0=E6=8D=AE=E6=B1=A0=E5=8F=8A=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=94=9F=E6=88=90=E5=8D=B3=E6=97=B6=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/datapool/mapper/xml/CareDataPoolMapper.xml        | 8 ++------
 .../biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml   | 8 ++------
 .../biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml   | 8 ++------
 .../modules/biz/order/mapper/xml/DirectiveOrderMapper.xml | 1 -
 .../biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml  | 1 -
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml
index 91835fee..aa3930ca 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml
@@ -52,12 +52,8 @@
         from nu_biz_nu_directive_order
         where nu_id = #{nuId}
         and start_time >= #{optTime}
-        <if test="izPackage != null and izPackage != 'N'">
-            AND directive_id = #{directiveId}
-        </if>
-        <if test="izPackage != null and izPackage != 'Y'">
-            AND package_id = #{directiveId}
-        </if>
+        and directive_id = #{directiveId}
+        and cycle_type_id = #{cycleTypeId}
     </select>
 
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml
index abf41f96..612b2173 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml
@@ -52,12 +52,8 @@
         from nu_biz_nu_directive_order
         where nu_id = #{nuId}
         and start_time >= #{optTime}
-        <if test="izPackage != null and izPackage != 'N'">
-            AND directive_id = #{directiveId}
-        </if>
-        <if test="izPackage != null and izPackage != 'Y'">
-            AND package_id = #{directiveId}
-        </if>
+        and directive_id = #{directiveId}
+        and cycle_type_id = #{cycleTypeId}
     </select>
 
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml
index 99831ec5..69d10753 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml
@@ -52,12 +52,8 @@
         from nu_biz_nu_directive_order
         where nu_id = #{nuId}
         and start_time >= #{optTime}
-        <if test="izPackage != null and izPackage != 'N'">
-            AND directive_id = #{directiveId}
-        </if>
-        <if test="izPackage != null and izPackage != 'Y'">
-            AND package_id = #{directiveId}
-        </if>
+        and directive_id = #{directiveId}
+        and cycle_type_id = #{cycleTypeId}
     </select>
 
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
index 43606b91..ce67cdbd 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
@@ -62,7 +62,6 @@
             <id column="sub_id" property="id"/>
             <result column="sub_order_type" property="orderType"/>
             <result column="sub_main_id" property="mainId"/>
-            <result column="sub_pool_sub_id" property="poolSubId"/>
             <result column="sub_nu_id" property="nuId"/>
             <result column="sub_nu_name" property="nuName"/>
             <result column="sub_elder_id" property="elderId"/>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
index dfc5837a..82ebfe10 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
@@ -59,7 +59,6 @@
             <id column="sub_id" property="id"/>
             <result column="sub_order_type" property="orderType"/>
             <result column="sub_main_id" property="mainId"/>
-            <result column="sub_pool_sub_id" property="poolSubId"/>
             <result column="sub_nu_id" property="nuId"/>
             <result column="sub_nu_name" property="nuName"/>
             <result column="sub_elder_id" property="elderId"/>