From 3bd750de3f4788a5206a76f57a58670718519a2a Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 04 十一月 2026 10:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 9720d4d..0e0c1cf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -76,6 +76,7 @@
             resultMap="ServiceDonorchargeorganResult">
         <include refid="selectServiceDonorchargeorganVo"/>
         <where>
+            and (del_flag = 0 or del_flag is null)
             <if test="infoid != null ">and InfoID = #{infoid}</if>
             <if test="receiveTime != null ">and receive_time = #{receiveTime}</if>
             <if test="paymentid != null ">and paymentid = #{paymentid}</if>
@@ -146,6 +147,7 @@
         from service_donorchargeorgan o
                  left join service_donatebaseinfo b on b.ID = o.InfoID
         <where>
+            and (o.del_flag = 0 or o.del_flag is null)
             <if test="selectAll != true ">
                and (o.paymentid IS NULL or o.paymentid=0 or organcharge-amount>0)
                and (organ_charge_state =0 OR organ_charge_state IS null)
@@ -159,6 +161,7 @@
                 '%')
             </if>
             <if test="hospitalno != null  and hospitalno != ''">and o.HospitalNo = #{hospitalno}</if>
+            <if test="hospitalnoIsNull == true">and (o.Hospitalname is null or o.Hospitalname = '')</if>
             <if test="organno != null  and organno != ''">and o.OrganNo = #{organno}</if>
             <if test="organname != null  and organname != ''">and o.OrganName like concat('%', #{organname}, '%')</if>
             <if test="organState != null  and organState != ''">and o.organ_state = #{organState}</if>
@@ -186,6 +189,15 @@
         order by b.donatetime
     </select>
 
+    <update id="removeByIds">
+        update service_donorchargeorgan
+        set del_flag = 1
+        where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="updateDonorchargeorgan" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan">
         update service_donorchargeorgan
         <set>

--
Gitblit v1.9.3