From 5f971ca24e695f6b733910f5eac567656c7edd3b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 04 十一月 2026 10:00:54 +0800
Subject: [PATCH] 修改了收费器官查询

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java |    7 +++++++
 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml |   22 ++++++++++++++++++++++
 2 files changed, 29 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..62b2821 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
@@ -231,6 +231,13 @@
     private String organState;
 
     /**
+     * 鍥炴鐘舵�佹煡璇紙宸蹭粯/鏈粯锛岄潪鏁版嵁搴撳瓧娈碉級
+     */
+    @ApiModelProperty("鍥炴鐘舵�佹煡璇細宸蹭粯銆佹湭浠�")
+    @TableField(exist = false)
+    private String payStatus;
+
+    /**
      * 鍣ㄥ畼鐘舵��
      */
     @ApiModelProperty("鍣ㄧ鏀惰垂鐘舵�侊細0鏈敹銆�1宸叉敹")
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 49514fd..9720d4d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -88,6 +88,17 @@
             <if test="hospitalno != null  and hospitalno != ''">and HospitalNo = #{hospitalno}</if>
             <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
             <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
+            <if test="organState != null  and organState != ''">and organ_state = #{organState}</if>
+            <if test="payStatus != null  and payStatus != ''">
+                <choose>
+                    <when test="payStatus == '宸蹭粯'">
+                        and organcharge is not null and (organcharge - IFNULL(amount, 0)) = 0
+                    </when>
+                    <when test="payStatus == '鏈粯'">
+                        and organcharge is not null and (organcharge - IFNULL(amount, 0)) &lt;&gt; 0
+                    </when>
+                </choose>
+            </if>
             <if test="organcharge != null ">and organcharge = #{organcharge}</if>
             <if test="organtime != null ">and organtime = #{organtime}</if>
             <if test="chargeoperator != null  and chargeoperator != ''">and chargeoperator = #{chargeoperator}</if>
@@ -150,6 +161,17 @@
             <if test="hospitalno != null  and hospitalno != ''">and o.HospitalNo = #{hospitalno}</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>
+            <if test="payStatus != null  and payStatus != ''">
+                <choose>
+                    <when test="payStatus == '宸蹭粯'">
+                        and o.organcharge is not null and (o.organcharge - IFNULL(o.amount, 0)) = 0
+                    </when>
+                    <when test="payStatus == '鏈粯'">
+                        and o.organcharge is not null and (o.organcharge - IFNULL(o.amount, 0)) &lt;&gt; 0
+                    </when>
+                </choose>
+            </if>
             <if test="organcharge != null ">and o.organcharge = #{organcharge}</if>
             <if test="organtime != null ">and o.organtime = #{organtime}</if>
             <if test="chargeoperator != null  and chargeoperator != ''">and o.chargeoperator = #{chargeoperator}</if>

--
Gitblit v1.9.3