From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 0a54e4a..e2fc8ae 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -37,19 +37,55 @@
from service_donatemaintenance
</sql>
- <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.ServiceDonatemaintenance"
- resultMap="ServiceDonatemaintenanceResult">
- <include refid="selectServiceDonatemaintenanceVo"/>
+ <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO"
+ resultType="com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO">
+ select
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.extracontent AS extracontent,
+ sd.inpatientno AS inpatientno,
+ sd.DonationCategory as donationcategory,
+ sd.case_no AS caseNo,
+ sd.NAME AS name,
+ sd.RecordState AS recordstate,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.diagnosisname AS diagnosisname,
+ sd.ReportTime AS reportTime,
+ sd.RhYin AS rhYin,
+ sd.IllnessOverview AS illnessOverview,
+ sd.id AS infoid,
+ sdm.id AS id,
+ sdm.item_no as itemNo,
+ sdm.item_name as itemName,
+ sdm.item_time as itemTime,
+ sdt.DeathTime as deathTime,
+ sdm.item_desc as itemDesc
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
+ AND sd.del_flag = 0
+ AND sdm.del_flag = 0
+ and sdm.ID is not null
+ left join service_deathinfo sdt on sd.ID = sdt.infoID and sdt.del_flag=0 and sdt.ID is not null
<where>
- del_flag=0
- <if test="infoid != null ">and InfoID = #{infoid}</if>
+ sd.termination_case = 0
+ <if test="infoid != null ">and sd.ID = #{infoid}</if>
+ <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
+ <if test="reportTime != null ">and ReportTime = #{reportTime}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
<if test="itemNo != null and itemNo != ''">and item_no = #{itemNo}</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemTime != null ">and item_time = #{itemTime}</if>
<if test="itemDesc != null and itemDesc != ''">and item_desc = #{itemDesc}</if>
</where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
</mapper>
--
Gitblit v1.9.3