From b88b42be258535e65d38888823ac85fd8467b571 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 02 十一月 2026 14:02:11 +0800
Subject: [PATCH] 已收金额，未收金额钻取数据列表

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 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 9749fa1..49514fd 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -15,6 +15,7 @@
         <result property="hospitalno" column="HospitalNo"/>
         <result property="organno" column="OrganNo"/>
         <result property="organname" column="OrganName"/>
+        <result property="payOrganName" column="pay_organ_name"/>
         <result property="organcharge" column="organcharge"/>
         <result property="organtime" column="organtime"/>
         <result property="chargeoperator" column="chargeoperator"/>
@@ -48,6 +49,7 @@
                HospitalNo,
                OrganNo,
                OrganName,
+               pay_organ_name,
                organcharge,
                organtime,
                chargeoperator,
@@ -109,6 +111,7 @@
         o.HospitalNo,
         o.OrganNo,
         o.OrganName,
+        o.pay_organ_name,
         o.organcharge,
         o.organtime,
         o.chargeoperator,
@@ -173,6 +176,7 @@
             <if test="hospitalno != null  and hospitalno != ''">HospitalNo = #{hospitalno},</if>
             <if test="organno != null  and organno != ''">OrganNo = #{organno},</if>
             <if test="organname != null  and organname != ''">OrganName = #{organname},</if>
+            <if test="payOrganName != null  and payOrganName != ''">pay_organ_name = #{payOrganName},</if>
             <if test="organcharge != null ">organcharge = #{organcharge},</if>
             <if test="organtime != null ">organtime = #{organtime},</if>
             <if test="chargeoperator != null  and chargeoperator != ''">chargeoperator = #{chargeoperator},</if>
@@ -209,4 +213,39 @@
         )
     </select>
 
+    <resultMap id="SpStatChangeDetailResult" type="com.ruoyi.project.domain.SpStatChangeDetail">
+        <result property="donatetime" column="donatetime"/>
+        <result property="donorname" column="donorname"/>
+        <result property="organno" column="OrganNo"/>
+        <result property="organname" column="OrganName"/>
+        <result property="name" column="name"/>
+        <result property="caseno" column="caseno"/>
+        <result property="hospitalname" column="HospitalName"/>
+        <result property="organcharge" column="organcharge"/>
+        <result property="amount" column="amount"/>
+        <result property="nonpayment" column="nonpayment"/>
+    </resultMap>
+
+    <select id="getSpStatChangeDetail" resultMap="SpStatChangeDetailResult">
+        select b.donatetime,
+               o.donorname,
+               o.OrganNo,
+               o.OrganName,
+               o.name,
+               o.caseno,
+               o.HospitalName,
+               o.organcharge,
+               o.amount,
+               (ifnull(o.organcharge, 0) - ifnull(o.amount, 0)) as nonpayment
+        from service_donorchargeorgan o
+                 left join service_donatebaseinfo b on b.ID = o.InfoID
+        where o.del_flag = 0
+        <if test="PABEGTIME != null and PABEGTIME != ''">and b.donatetime &gt;= #{PABEGTIME}</if>
+        <if test="PAENDTIME != null and PAENDTIME != ''">and b.donatetime &lt;= #{PAENDTIME}</if>
+        <if test="PAHOSPITALNAME != null and PAHOSPITALNAME != ''">and o.HospitalName = #{PAHOSPITALNAME}</if>
+        <if test='"1".equals(PACHARGESTATE)'>and ifnull(o.amount, 0) &gt; 0</if>
+        <if test='"0".equals(PACHARGESTATE)'>and (ifnull(o.organcharge, 0) - ifnull(o.amount, 0)) &gt; 0</if>
+        order by b.donatetime
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3