From 8a8a94d9a6de7d1d1a5720ce1f36d7b5bc6d7702 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 十二月 2025 20:13:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 150 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 145 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 83a05fc..1abf391 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -81,6 +81,10 @@
<result property="workflow" column="workflow"/>
<result property="donatetime" column="donatetime"/>
<result property="donateno" column="donateno"/>
+ <result property="currentMedicalInstitution" column="current_medical_institution"/>
+ <result property="firstMedicalInstitution" column="first_medical_institution"/>
+ <result property="currentDept" column="current_dept"/>
+ <result property="firstDept" column="first_dept"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoVo">
@@ -89,6 +93,14 @@
LEFT JOIN `base_organization`
ON `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
</sql>
+
+
+ <sql id="queryServiceDonatebaseinfoVo">
+ select *
+ from service_donatebaseinfo
+ </sql>
+
+
<update id="updateDonateNumber">
update service_donatebaseinfo
set DonorNo = #{updateNumber}
@@ -206,8 +218,136 @@
<if test="infoname != null ">and infoName = #{infoname}</if>
<if test="infophone != null ">and infoPhone = #{infophone}</if>
<if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
- <if test="starttime != null ">and ReportTime >= #{starttime}</if>
- <if test="endtime != null ">and ReportTime <= #{endtime}</if>
+ <if test="starttime != null ">and donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and donatetime <= #{endtime}</if>
+ <if test="nativeplace != null and nativeplace != ''">and NativePlace = #{nativeplace}</if>
+ <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
+ <if test="deptid != null ">and deptid = #{deptid}</if>
+ <if test="deptname != null ">and deptname = #{deptname}</if>
+ <if test="leaderno != null ">and leaderno = #{leaderno}</if>
+ <if test="leadername != null ">and leadername = #{leadername}</if>
+ <if test="businessarea != null ">and businessarea = #{businessarea}</if>
+ <if test="donatetime != null ">and donatetime = #{donatetime}</if>
+ <if test="donateno != null ">and donateno = #{donateno}</if>
+ <if test="workflow != null ">and workflow = #{workflow}</if>
+ </where>
+
+ order by ReportTime desc
+
+ </select>
+ <select id="getPatName" parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfo"
+ resultMap="ServiceDonatebaseinfoResult">
+ <include refid="queryServiceDonatebaseinfoVo"/>
+ <where>
+ service_donatebaseinfo.del_flag = 0
+ <if test="name != null and name != ''">and Name like concat('%', #{name}, '%')</if>
+ <if test="sex != null ">and Sex = #{sex}</if>
+ <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="age != null ">and Age = #{age}</if>
+ <if test="ageunit != null and ageunit != ''">and AgeUnit = #{ageunit}</if>
+ <if test="birthday != null and birthday != ''">and Birthday = #{birthday}</if>
+ <if test="phone != null and phone != ''">and Phone = #{phone}</if>
+ <if test="residenceaddress != null and residenceaddress != ''">and ResidenceAddress = #{residenceaddress}
+ </if>
+ <if test="residenceprovince != null and residenceprovince != ''">and ResidenceProvince =
+ #{residenceprovince}
+ </if>
+ <if test="terminationCase != null">and termination_case =
+ #{terminationCase}
+ </if>
+ <if test="residenceprovincename != null and residenceprovincename != ''">and ResidenceProvinceName like
+ concat('%', #{residenceprovincename}, '%')
+ </if>
+ <if test="residencecity != null and residencecity != ''">and ResidenceCity = #{residencecity}</if>
+ <if test="residencecityname != null and residencecityname != ''">and ResidenceCityName like concat('%',
+ #{residencecityname}, '%')
+ </if>
+ <if test="residencetown != null and residencetown != ''">and ResidenceTown = #{residencetown}</if>
+ <if test="residencetownname != null and residencetownname != ''">and ResidenceTownName like concat('%',
+ #{residencetownname}, '%')
+ </if>
+ <if test="residencecommunity != null and residencecommunity != ''">and ResidenceCommunity =
+ #{residencecommunity}
+ </if>
+ <if test="residencecommunityname != null and residencecommunityname != ''">and ResidenceCommunityName like
+ concat('%', #{residencecommunityname}, '%')
+ </if>
+ <if test="residencecountycode != null and residencecountycode != ''">and ResidenceCountyCode =
+ #{residencecountycode}
+ </if>
+ <if test="residencecountyname != null and residencecountyname != ''">and ResidenceCountyName like
+ concat('%', #{residencecountyname}, '%')
+ </if>
+ <if test="registeraddress != null and registeraddress != ''">and RegisterAddress = #{registeraddress}</if>
+ <if test="registerprovince != null and registerprovince != ''">and RegisterProvince = #{registerprovince}
+ </if>
+ <if test="registerprovincename != null and registerprovincename != ''">and RegisterProvinceName like
+ concat('%', #{registerprovincename}, '%')
+ </if>
+ <if test="registercity != null and registercity != ''">and RegisterCity = #{registercity}</if>
+ <if test="registercityname != null and registercityname != ''">and RegisterCityName like concat('%',
+ #{registercityname}, '%')
+ </if>
+ <if test="registertown != null and registertown != ''">and RegisterTown = #{registertown}</if>
+ <if test="registertownname != null and registertownname != ''">and RegisterTownName like concat('%',
+ #{registertownname}, '%')
+ </if>
+ <if test="registercommunity != null and registercommunity != ''">and RegisterCommunity =
+ #{registercommunity}
+ </if>
+ <if test="registercommunityname != null and registercommunityname != ''">and RegisterCommunityName like
+ concat('%', #{registercommunityname}, '%')
+ </if>
+ <if test="registercountycode != null and registercountycode != ''">and RegisterCountyCode =
+ #{registercountycode}
+ </if>
+ <if test="registercountyname != null and registercountyname != ''">and RegisterCountyName like concat('%',
+ #{registercountyname}, '%')
+ </if>
+ <if test="recordstate != null and recordstate != ''">and RecordState = #{recordstate}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and TreatmentHospitalNo =
+ #{treatmenthospitalno}
+ </if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">and TreatmentHospitalName like
+ concat('%', #{treatmenthospitalname}, '%')
+ </if>
+ <!-- <if test="treatmentdeptno != null and treatmentdeptno != ''"> and TreatmentDeptNo = #{treatmentdeptno}</if>-->
+ <if test="treatmentdeptname != null and treatmentdeptname != ''">and TreatmentDeptName like concat('%',
+ #{treatmentdeptname}, '%')
+ </if>
+ <if test="diagnosisno != null and diagnosisno != ''">and DiagnosisNo = #{diagnosisno}</if>
+ <if test="diagnosisname != null and diagnosisname != ''">and DiagnosisName like concat('%',
+ #{diagnosisname}, '%')
+ </if>
+ <if test="bloodtype != null and bloodtype != ''">and BloodType = #{bloodtype}</if>
+ <if test="inpatientno != null and inpatientno != ''">and InpatientNo = #{inpatientno}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo like concat('%', #{donorno}, '%')</if>
+ <if test="donationcategory != null and donationcategory != ''">and DonationCategory = #{donationcategory}
+ </if>
+ <if test="illnessoverview != null and illnessoverview != ''">and IllnessOverview = #{illnessoverview}</if>
+ <if test="kinship != null and kinship != ''">and Kinship = #{kinship}</if>
+ <if test="selfwill != null ">and SelfWill = #{selfwill}</if>
+ <if test="kinshipwill != null ">and KinshipWill = #{kinshipwill}</if>
+ <if test="infosources != null and infosources != ''">and InfoSources = #{infosources}</if>
+ <if test="redorganno != null and redorganno != ''">and RedOrganNo = #{redorganno}</if>
+ <if test="redorganname != null and redorganname != ''">and RedOrganName like concat('%', #{redorganname},
+ '%')
+ </if>
+ <if test="contactperson != null and contactperson != ''">and ContactPerson = #{contactperson}</if>
+ <if test="contactnumber != null and contactnumber != ''">and ContactNumber = #{contactnumber}</if>
+ <if test="contacttime != null and contacttime != ''">and ContactTime = #{contacttime}</if>
+ <if test="reporterno != null and reporterno != ''">and ReporterNo = #{reporterno}</if>
+ <if test="reportername != null and reportername != ''">and ReporterName like concat('%', #{reportername},
+ '%')
+ </if>
+ <if test="reporterphone != null and reporterphone != ''">and ReporterPhone = #{reporterphone}</if>
+ <if test="reporttime != null ">and ReportTime = #{reporttime}</if>
+ <if test="infoname != null ">and infoName = #{infoname}</if>
+ <if test="infophone != null ">and infoPhone = #{infophone}</if>
+ <if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
+ <if test="starttime != null ">and donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and donatetime <= #{endtime}</if>
<if test="nativeplace != null and nativeplace != ''">and NativePlace = #{nativeplace}</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
<if test="deptid != null ">and deptid = #{deptid}</if>
@@ -241,8 +381,8 @@
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
AND b.del_flag=0
- <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
- <if test="endtime != null ">and b.ReportTime <= #{endtime}</if>
+ <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+ <if test="endtime != null ">and b.donatetime <= #{endtime}</if>
<if test="city != null and city != ''">and o.City = #{city}</if>
<if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
</where>
@@ -389,4 +529,4 @@
AND d.OrganGetTime <= #{endtime}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3