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"/>