From 18a23107bef4f21b1e72c2e7e1e3da4ee7821661 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 04 十一月 2026 09:56:11 +0800
Subject: [PATCH] 器管回款列表增加无回款医院的过滤,修改增加应收款、实收款修改

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java |    7 +++++++
 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index 496bd0f..4d162c3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -240,5 +240,12 @@
     @ApiModelProperty("鏌ヨ鎵�鏈�")
     @TableField(exist = false)
     private Boolean selectAll = false;
+
+    /**
+     * 鏄惁鍙煡璇㈠洖娆惧尰闄紙HospitalNo锛変负绌虹殑鏁版嵁
+     */
+    @ApiModelProperty("鏄惁鍙煡璇㈠洖娆惧尰闄负绌虹殑鏁版嵁")
+    @TableField(exist = false)
+    private Boolean hospitalnoIsNull = false;
 }
 
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index dbd68d4..57d7ce6 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -150,6 +150,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="organcharge != null ">and o.organcharge = #{organcharge}</if>

--
Gitblit v1.9.3