From 24a2f363743d8a2e4aa038635ef1d8b60a8e7131 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 07 五月 2026 14:45:59 +0800
Subject: [PATCH] 查询捐献完成列表基本信息数据出错
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index b0bd5b7..0c66ac5 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,13 +111,17 @@
</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,
+ sd.DonationCategory as donationcategory,
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,
@@ -122,7 +129,8 @@
sd.idcardno AS idcardno,
sd.diagnosisname AS diagnosisname,
st.coordinator_in_operating as coordinatorInOperating,
- st.InfoID as infoid,
+ 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,
@@ -148,21 +156,27 @@
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
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
+ and st.ID is not null
AND sd.del_flag = 0
AND st.del_flag = 0
<where>
+ sd.termination_case = 0
+
<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>
</where>
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3