From 17e08759071de47a7513d1cc1408c62d79713cd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 28 十月 2026 17:47:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 5c87490..9749fa1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
<result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
<result property="donorchargeid" column="donorchargeid"/>
<result property="paymentid" column="paymentid"/>
<result property="paymentno" column="paymentno"/>
@@ -29,7 +30,11 @@
<result property="updateTime" column="update_time"/>
<result property="caseno" column="caseno"/>
<result property="name" column="name"/>
+ <result property="receiveTime" column="receive_time"/>
<result property="annexFiles" column="annex_files"/>
+ <result property="donatetime" column="donatetime"/>
+ <result property="organState" column="organ_state"/>
+ <result property="organChargeState" column="organ_charge_state"/>
</resultMap>
<sql id="selectServiceDonorchargeorganVo">
@@ -58,7 +63,10 @@
update_time,
caseno,
name,
- annex_files
+ receive_time,
+ annex_files,
+ organ_state,
+ organ_charge_state
from service_donorchargeorgan
</sql>
@@ -67,6 +75,7 @@
<include refid="selectServiceDonorchargeorganVo"/>
<where>
<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>
<if test="paymentno != null ">and paymentno = #{paymentno}</if>
<if test="donorchargeid != null ">and donorchargeID = #{donorchargeid}</if>
@@ -88,4 +97,116 @@
</where>
</select>
+ <select id="queryListBypaymentidIsNull" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan"
+ resultMap="ServiceDonorchargeorganResult">
+ select o.ID,
+ o.donorchargeid,
+ o.paymentid,
+ o.paymentno,
+ o.InfoID,
+ o.donorname,
+ o.HospitalName,
+ o.HospitalNo,
+ o.OrganNo,
+ o.OrganName,
+ o.organcharge,
+ o.organtime,
+ o.chargeoperator,
+ o.amount,
+ o.amounttime,
+ o.amountoperator,
+ o.chargestate,
+ o.organchargedesc,
+ o.del_flag,
+ o.create_by,
+ o.create_time,
+ o.update_by,
+ o.update_time,
+ o.caseno,
+ o.name,
+ o.receive_time,
+ o.annex_files,
+ o.organ_state,
+ o.organ_charge_state,
+ b.donatetime
+ from service_donorchargeorgan o
+ left join service_donatebaseinfo b on b.ID = o.InfoID
+ <where>
+ <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)
+ </if>
+ <if test="infoid != null ">and o.InfoID = #{infoid}</if>
+ <if test="receiveTime != null ">and o.receive_time = #{receiveTime}</if>
+ <if test="paymentno != null ">and o.paymentno = #{paymentno}</if>
+ <if test="donorchargeid != null ">and o.donorchargeID = #{donorchargeid}</if>
+ <if test="donorname != null and donorname != ''">and o.donorname like concat('%', #{donorname}, '%')</if>
+ <if test="hospitalname != null and hospitalname != ''">and o.HospitalName like concat('%', #{hospitalname},
+ '%')
+ </if>
+ <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="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>
+ <if test="amount != null ">and o.amount = #{amount}</if>
+ <if test="amounttime != null ">and o.amounttime = #{amounttime}</if>
+ <if test="amountoperator != null and amountoperator != ''">and o.amountoperator = #{amountoperator}</if>
+ <if test="chargestate != null ">and o.chargestate = #{chargestate}</if>
+ <if test="organchargedesc != null and organchargedesc != ''">and o.organchargedesc = #{organchargedesc}</if>
+ <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and b.donatetime <= #{endtime}</if>
+ </where>
+ order by b.donatetime
+ </select>
+
+ <update id="updateDonorchargeorgan" parameterType="com.ruoyi.project.domain.ServiceDonorchargeorgan">
+ update service_donorchargeorgan
+ <set>
+ <if test="infoid != null ">InfoID = #{infoid},</if>
+ <if test="receiveTime != null ">receive_time = #{receiveTime},</if>
+ <if test="paymentno != null ">paymentno = #{paymentno},</if>
+ <if test="donorchargeid != null ">donorchargeID = #{donorchargeid},</if>
+ <if test="donorname != null and donorname != ''">donorname=#{donorname},</if>
+ <if test="hospitalname != null and hospitalname != ''">HospitalName= #{hospitalname},</if>
+ <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="organcharge != null ">organcharge = #{organcharge},</if>
+ <if test="organtime != null ">organtime = #{organtime},</if>
+ <if test="chargeoperator != null and chargeoperator != ''">chargeoperator = #{chargeoperator},</if>
+ <if test="amount != null ">amount = #{amount},</if>
+ <if test="amounttime != null ">amounttime = #{amounttime},</if>
+ <if test="amountoperator != null and amountoperator != ''">amountoperator = #{amountoperator},</if>
+ <if test="chargestate != null ">chargestate = #{chargestate},</if>
+ <if test="organchargedesc != null and organchargedesc != ''">organchargedesc = #{organchargedesc},</if>
+ <if test="caseno != null and caseno != ''">caseno = #{caseno},</if>
+ <if test="name != null and name != ''">name = #{name},</if>
+ <if test="annexFiles != null and annexFiles != ''">annex_files = #{annexFiles},</if>
+ <if test="receiveTime != null">receive_time = #{receiveTime},</if>
+ <if test="organState != null ">organ_state = #{organState},</if>
+ <if test="organChargeState != null ">organ_charge_state = #{organChargeState},</if>
+ paymentid = #{paymentid},
+ update_time = sysdate()
+ </set>
+ where id = #{id} and del_flag=0
+ </update>
+
+ <resultMap id="SpStatChangeResult" type="com.ruoyi.project.domain.SpStatChange">
+ <result property="hospitalname" column="HospitalName"/>
+ <result property="amount" column="amount"/>
+ <result property="nonpayment" column="nonpayment"/>
+ <result property="organcharge" column="organcharge"/>
+ </resultMap>
+
+ <select id="getListBySpStatChange" statementType="CALLABLE"
+ resultMap="SpStatChangeResult">
+ call `SP_STAT_CHANGE`(
+ #{PABEGTIME,mode=IN,jdbcType=VARCHAR},
+ #{PAENDTIME,mode=IN,jdbcType=VARCHAR},
+ #{PAHOSPITALNAME,mode=IN,jdbcType=VARCHAR}
+ )
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3