From 77f4f1559dbfc1a4e6187925d2ab2665d70ba310 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 19 Nov 2025 11:22:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9=E6=8B=A3?=
 =?UTF-8?q?=E8=B4=A7=E7=85=A7=E7=89=87=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 1687353..21d3e4a 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
@@ -711,8 +711,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         BeanUtils.copyProperties(warehouseMaterialCrkInfoEntityDto,warehouseMaterialCrkInfo);
         QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialCrkInfo, req.getParameterMap());
         queryWrapper.eq("cgd_id",warehouseMaterialCrkInfo.getCgdId());
-        queryWrapper.isNotNull("jh_pic");
+//        queryWrapper.isNotNull("jh_pic");
         queryWrapper.eq("crk_status","1");
+        queryWrapper.apply("(jh_pic is not null or jh_pic != '')");
         List<NuWarehouseMaterialCrkInfo> list = crkInfoMapper.selectList(queryWrapper);
         List<Map<String,Object>> jhlist = new ArrayList<>();
         for(NuWarehouseMaterialCrkInfo crkInfo : list){