From e373408852ae249beb134dc033d371b1ee3043a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 15 Jan 2026 09:39:29 +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=95=B0=E6=8D=AE=E6=B1=A0=E6=97=B6=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B1=A0=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/datapool/service/impl/CareDataPoolServiceImpl.java   | 3 ++-
 .../datapool/service/impl/InvoicingDataPoolServiceImpl.java  | 3 ++-
 .../datapool/service/impl/LogisticsDataPoolServiceImpl.java  | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java
index ea4ebdab..9cd308f2 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java
@@ -57,7 +57,6 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
             List<DirectiveDataPool> planList = baseMapper.queryPlanList(entity);//获取计划
             if(planList.size()>0){
                 for(DirectiveDataPool plan : planList){
-                    plan.setPoolType("1");
                     DirectiveDataPool pool = dataPoolService.queryPoolOne(plan);
                     if(pool!=null){
                         continue;
@@ -88,6 +87,7 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
                 dataPool.setIzOrders("N");
                 dataPool.setIzStart("N");
                 dataPool.setDelFlag("0");
+                dataPool.setPoolType("1");
                 String izPackage = dataPool.getIzPackage();
                 if(izPackage!=null&&izPackage.equals("Y")){
                     addPackage(dataPool);
@@ -255,6 +255,7 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
         dataPoolSub.setPackageName(dataPool.getPackageName());
         dataPoolSub.setDelFlag(dataPool.getDelFlag());
         dataPoolSub.setMainId(dataPool.getId());
+        dataPoolSub.setPoolType("1");
         dataPoolSubService.save(dataPoolSub);
     }
 
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java
index d4032d08..47ad0db5 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java
@@ -56,7 +56,6 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
             List<DirectiveDataPool> planList = baseMapper.queryPlanList(entity);//获取计划
             if(planList.size()>0){
                 for(DirectiveDataPool plan : planList){
-                    plan.setPoolType("3");
                     DirectiveDataPool pool = dataPoolService.queryPoolOne(plan);
                     if(pool!=null){
                         continue;
@@ -87,6 +86,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
                 dataPool.setIzOrders("N");
                 dataPool.setIzStart("N");
                 dataPool.setDelFlag("0");
+                dataPool.setPoolType("3");
                 String izPackage = dataPool.getIzPackage();
                 if(izPackage!=null&&izPackage.equals("Y")){
                     addPackage(dataPool);
@@ -250,6 +250,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
         dataPoolSub.setPackageName(dataPool.getPackageName());
         dataPoolSub.setDelFlag(dataPool.getDelFlag());
         dataPoolSub.setMainId(dataPool.getId());
+        dataPoolSub.setPoolType("3");
         dataPoolSubService.save(dataPoolSub);
     }
 
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/LogisticsDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/LogisticsDataPoolServiceImpl.java
index 19d641f5..9e3f30e0 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/LogisticsDataPoolServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/LogisticsDataPoolServiceImpl.java
@@ -55,7 +55,6 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
             List<DirectiveDataPool> planList = baseMapper.queryPlanList(entity);//获取计划
             if(planList.size()>0){
                 for(DirectiveDataPool plan : planList){
-                    plan.setPoolType("1");
                     DirectiveDataPool pool = dataPoolService.queryPoolOne(plan);
                     if(pool!=null){
                         continue;
@@ -86,6 +85,7 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
                 dataPool.setIzOrders("N");
                 dataPool.setIzStart("N");
                 dataPool.setDelFlag("0");
+                dataPool.setPoolType("4");
                 String izPackage = dataPool.getIzPackage();
                 if(izPackage!=null&&izPackage.equals("Y")){
                     addPackage(dataPool);
@@ -180,7 +180,7 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
         dataPoolSub.setIzPackage("N");
         dataPoolSub.setDelFlag(dataPool.getDelFlag());
         dataPoolSub.setMainId(dataPool.getId());
-        dataPoolSub.setPoolType("1");
+        dataPoolSub.setPoolType("4");
         dataPoolSubService.save(dataPoolSub);
     }
 
@@ -253,6 +253,7 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
         dataPoolSub.setPackageName(dataPool.getPackageName());
         dataPoolSub.setDelFlag(dataPool.getDelFlag());
         dataPoolSub.setMainId(dataPool.getId());
+        dataPoolSub.setPoolType("4");
         dataPoolSubService.save(dataPoolSub);
     }