diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
index 9bded0b..c7de04f 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
@@ -9,14 +9,10 @@
             nu_name as nuName,
             customer_id as customerId,
             customer_name as customerName,
-/*            (case when iz_package = 'Y' then '' else directive_id end) as directiveId,
+            (case when iz_package = 'Y' then '' else directive_id end) as directiveId,
             (case when iz_package = 'Y' then '' else directive_name end) as directiveName,
             (case when iz_package = 'Y' then directive_id else '' end) as packageId,
-            (case when iz_package = 'Y' then directive_name else '' end) as packageName,*/
-        (case when iz_package = '1' then '' else directive_id end) as directiveId,
-        (case when iz_package = '1' then '' else directive_name end) as directiveName,
-        (case when iz_package = '1' then directive_id else '' end) as packageId,
-        (case when iz_package = '1' then directive_name else '' end) as packageName,
+            (case when iz_package = 'Y' then directive_name else '' end) as packageName,
             iz_package as izPackage,
             CONCAT(CURDATE(), ' ',STR_TO_DATE(start_time, '%H:%i')) as startTime,
             CONCAT(CURDATE(), ' ',STR_TO_DATE(end_time, '%H:%i')) as endTime,
@@ -53,14 +49,10 @@
         nu_name as nuName,
         customer_id as customerId,
         customer_name as customerName,
-/*        (case when iz_package = 'Y' then '' else directive_id end) as directiveId,
+        (case when iz_package = 'Y' then '' else directive_id end) as directiveId,
         (case when iz_package = 'Y' then '' else directive_name end) as directiveName,
         (case when iz_package = 'Y' then directive_id else '' end) as packageId,
-        (case when iz_package = 'Y' then directive_name else '' end) as packageName,*/
-        (case when iz_package = '1' then '' else directive_id end) as directiveId,
-        (case when iz_package = '1' then '' else directive_name end) as directiveName,
-        (case when iz_package = '1' then directive_id else '' end) as packageId,
-        (case when iz_package = '1' then directive_name else '' end) as packageName,
+        (case when iz_package = 'Y' then directive_name else '' end) as packageName,
         iz_package as izPackage,
         CONCAT(CURDATE(), ' ',STR_TO_DATE(start_time, '%H:%i')) as startTime,
         CONCAT(CURDATE(), ' ',STR_TO_DATE(end_time, '%H:%i')) as endTime,