From 109774f1a0f31d2eaa908f6f8e548dac2510d72d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 24 Nov 2025 14:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/nu/entity/CgdMainEntity.java           | 2 +-
 .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
index 500f4313..03150269 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java
@@ -105,6 +105,6 @@ public class CgdMainEntity implements Serializable {
     @ApiModelProperty(value = "审核时间")
     private Date wjTime;
 
-
+    private String nuId;
     private String izNew;
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index 5efd0d70..c71fafe5 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -245,7 +245,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         List<NuInvoicingCgdMain> mapList = new ArrayList<>();
         // 创建一个临时Map来按suppliersId分组
         Map<String, List<QgdInfo>> tempMap = new HashMap<>();
-        String nuId = "";
+        String nuId = infoEntityList.get(0).getNuId();
+
 
         for (QgdInfoEntity qgdInfoEntity : infoEntityList) {
             String suppliersId = qgdInfoEntity.getSuppliersId();
@@ -289,6 +290,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             cgdMain.setStatus("0");//待入库
             cgdMain.setCgdType("0");//待入库
             cgdMain.setGysName(ConfigSuppliersInfo.getSuppliersName());
+            cgdMain.setNuId(nuId);
             List<NuInvoicingCgdInfo> cgdInfoList = new ArrayList<>();
             BigDecimal totalPrice = new BigDecimal(0);
             String qgdId = "";
@@ -397,6 +399,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
+        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
 //        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
         if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
             if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){