From 265d679da698220daff6fd46b2d3503930987942 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 30 Apr 2026 16:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgd/mapper/xml/NuInvoicingCgdMainMapper.xml   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
index f555286b..f08f5922 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml
@@ -28,19 +28,28 @@
 
 
     <select id="getCgdListNum" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdMain">
-        SELECT main.*
+        SELECT distinct main.*
         FROM nu_invoicing_cgd_info info
             INNER JOIN nu_invoicing_cgd_main main ON info.cgd_id = main.id
         <where>
             <if test="params.gysId != null and params.gysId != ''">
-                and FIND_IN_SET(main.gys_id, #{params.gysId}) > 0
+                and main.gys_id in
+                <foreach collection="params.gysId.split(',')" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="params.typeId != null and params.typeId != ''">
-                and FIND_IN_SET(info.type_id, #{params.typeId}) > 0
+                and info.type_id in
+                <foreach collection="params.typeId.split(',')" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="params.status != null and params.status != ''">
                 and main.status = #{params.status}
             </if>
+            <if test="params.nuId != null and params.nuId != ''">
+                and main.nu_id = #{params.nuId}
+            </if>
         </where>
     </select>
 </mapper>