From 05859cb2b3f8a2faaeef18a24f5aae6c5e1b904d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 14:28:55 +0800
Subject: [PATCH] 在捐献、已获取、案例完成 状态连动保存
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index c69d04c..6d08453 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -47,6 +47,8 @@
<result property="coordinatorOutOperating" column="coordinator_out_operating"/>
<result property="coordinatorSign" column="coordinator_sign"/>
<result property="coordinatorSignTime" column="coordinator_sign_time"/>
+ <result property="witnessState" column="witness_state"/>
+
</resultMap>
<sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
update_time,
OrganDonation,
OrganDonation_Other,
- DonationCategory
+ donationcategory,
+ witness_state
from service_donationwitness
</sql>
@@ -108,7 +111,8 @@
</where>
</select>
- <select id="getDonationwitnessBaseInfo" parameterType="com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO" resultType="com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO">
+ <select id="getDonationwitnessBaseInfo" parameterType="com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO"
+ resultType="com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO">
select
sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
@@ -116,6 +120,8 @@
sd.DonorNo AS donorno,
sd.case_no AS caseNo,
sd.NAME AS name,
+ sd.extracontent AS extracontent,
+ sd.InpatientNo AS inpatientno,
sd.RecordState AS recordstate,
sd.Sex AS sex,
sd.Age AS age,
@@ -124,6 +130,7 @@
sd.diagnosisname AS diagnosisname,
st.coordinator_in_operating as coordinatorInOperating,
sd.id AS infoid,
+ st.id as id,
st.coordinator_out_operating as coordinatorOutOperating,
st.coordinator_sign as coordinatorSign,
st.coordinator_sign_time as coordinatorSignTime,
@@ -149,7 +156,11 @@
st.AortaPerfusionTime as aortaperfusiontime,
st.OrganDonation as organdonation,
st.OrganDonation_Other as organdonationOther,
- st.DonationCategory as donationcategory
+ st.DonationCategory as donationcategory,
+ st.DeathJudgeAnnex as deathjudgeannex,
+ st.witness_state as witnessState,
+ st.IsSpendRemember as isspendremember,
+ st.IsRestoreRemains as isrestoreremains
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
@@ -162,12 +173,15 @@
<if test="name != null and name != ''">and sd.Name like concat('%', #{name}, '%')</if>
<if test="inpatientno != null and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
<if test="donorno != null and donorno != ''">and st.DonorNo = #{donorno}</if>
- <if test="gainhospitalname != null and gainhospitalname != ''">and st.GainHospitalName like concat('%',
+ <if test="gainhospitalname != null and gainhospitalname != ''">and st.GainHospitalName like concat('%',
#{gainhospitalname}, '%')
</if>
- <if test="operationdoctor != null and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}</if>
- <if test="infoid != null">and st.InfoID = #{infoid}</if>
+ <if test="operationdoctor != null and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
+ </if>
+ <if test="infoid != null">and sd.ID = #{infoid}</if>
+ <if test="witnessState != null">and st.witness_state = #{witnessState}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
@@ -274,7 +288,7 @@
<select id="getDBDDonaterNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donationwitness w
inner join service_donatebaseinfo b on w.InfoID = b.id
- inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+ left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where w.DonationCategory = "DBD"
<if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
<if test="endtime != null ">and w.OperationBegTime <= #{endtime}</if>
@@ -284,7 +298,7 @@
<select id="getDCDDonaterNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donationwitness w
inner join service_donatebaseinfo b on w.InfoID = b.id
- inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+ left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where w.DonationCategory = "DCD"
<if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
<if test="endtime != null ">and w.OperationBegTime <= #{endtime}</if>
@@ -295,7 +309,7 @@
<select id="getDBCDDonaterNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donationwitness w
inner join service_donatebaseinfo b on w.InfoID = b.id
- inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+ left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where w.DonationCategory = "DBCD"
<if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
<if test="endtime != null ">and w.OperationBegTime <= #{endtime}</if>
@@ -324,7 +338,7 @@
<select id="countThisYearByTime" resultType="java.lang.Integer">
select count(*) from service_donationwitness w
inner join service_donatebaseinfo b on w.InfoID = b.id
- inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+ left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
w.del_flag=0
and b.del_flag=0
--
Gitblit v1.9.3