From 2359f47c2f89a9867e72aa9b171cb118b874afec Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:29:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 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 55c3a37..68024d7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper">
- <resultMap type="com.ruoyi.project.domain.ServiceDonatemaintenance" id="ServiceDonatemaintenanceResult">
+ <resultMap type="com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity" id="ServiceDonatemaintenanceResult">
<result property="id" column="ID"/>
<result property="infoid" column="InfoID"/>
<result property="caseNo" column="case_no"/>
@@ -37,12 +37,14 @@
from service_donatemaintenance
</sql>
- <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.ServiceDonatemaintenance"
- resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
+ <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO"
+ resultType="com.ruoyi.project.domain.entity.MaintenanceBaseInfoEntity">
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,
@@ -52,10 +54,15 @@
sd.BloodType AS bloodtype,
sd.idcardno AS idcardno,
sd.diagnosisname AS diagnosisname,
- sdm.id AS infoid,
+ 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
@@ -63,10 +70,13 @@
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>
sd.termination_case = 0
- <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <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>
@@ -74,7 +84,9 @@
<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>
+ <if test="id != null ">and sdt.id = #{id}</if>
</where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
</mapper>
--
Gitblit v1.9.3