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/ServiceRelativesconfirmationMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index f8620d8..99b0ec9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -271,33 +271,51 @@
sd.DonorNo as donorno,
sd.case_no as caseNo,
sd.Name as name,
+ sd.InpatientNo as inpatientno,
+ sd.extracontent as extracontent,
sd.RecordState as recordstate,
sd.Sex as sex,
sd.Age as age,
sd.BloodType as bloodtype,
sd.idcardno as idcardno,
sd.diagnosisname as diagnosisname,
- sr.infoID as infoid,
+ sd.ID as infoid,
sr.ID as id,
+ sr.Name as relativesName,
+ sr.FamilyRelations as familyRelations,
+ sr.IDCardType as idCardType,
+ sr.IDCardNo as idCardNo,
+ sr.Phone as phone,
+ sr.Kinship_ChildrenNum as kinshipChildrenNum,
+ sr.KinshipConfirmationSign as kinshipConfirmationSign,
sr.RelativeConfirmationSign as relativeConfirmationSign,
+ sr.OrganDecision as organDecision,
+ sr.OrganDecision_Other as organDecisionOther,
+ sr.SignFamilyRelations as signFamilyRelations,
sr.SignDate as signdate,
sr.ResponsibleUserName as responsibleusername,
sr.ResponsibleUserID as responsibleuserid,
sr.CoordinatedUserIDO as coordinateduserido,
sr.CoordinatedUserNameO as coordinatedusernameo,
sr.CoordinatedUserNameT as coordinateduseridt,
- sr.ResponsibleUserID as responsibleuserid
+ sr.ResponsibleUserID as responsibleuserid,
+ sr.nation as nation,
+ sr.occupation as occupation,
+ sr.relative_remark as relativeRemark,
+ sr.assessannex as assessannex,
+ sr.education as education
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
<where>
- <if test="infoid != null and infoid != ''">AND sr.InfoID = #{infoid}</if>
+ <if test="infoid != null">AND sd.ID = #{infoid}</if>
<if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
<if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sd.TreatmentHospitalName =
#{treatmenthospitalname}
</if>
<if test="name != null and name != ''">AND sd.Name = #{name}</if>
+ <if test="inpatientno != null ">AND sd.InpatientNo = #{inpatientno}</if>
<if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
#{responsibleusername}
</if>
--
Gitblit v1.9.3