From 9c9b4bec68df57356425441c62466651150e3b6e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 三月 2024 09:28:51 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 125 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 61 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index c13d8e5..ceb3664 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -56,65 +56,68 @@
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
SELECT
- `service_donatebaseinfo`.`ID` AS `ID`,
- `service_donatebaseinfo`.`Name` AS `Name`,
- `service_donatebaseinfo`.`Sex` AS `Sex`,
- `service_donatebaseinfo`.`IDCardNo` AS `IDCardNo`,
- `service_donatebaseinfo`.`Age` AS `Age`,
- `service_donatebaseinfo`.`Birthday` AS `Birthday`,
- `service_donatebaseinfo`.`Nationality` AS `Nationality`,
- `service_donatebaseinfo`.`Nation` AS `Nation`,
- `service_donatebaseinfo`.`RegisterAddress` AS `RegisterAddress`,
- `service_donatebaseinfo`.`RegisterProvince` AS `RegisterProvince`,
- `service_donatebaseinfo`.`RegisterProvinceName` AS `RegisterProvinceName`,
- `service_donatebaseinfo`.`RegisterCity` AS `RegisterCity`,
- `service_donatebaseinfo`.`RegisterCityName` AS `RegisterCityName`,
- `service_donatebaseinfo`.`RegisterTown` AS `RegisterTown`,
- `service_donatebaseinfo`.`RegisterTownName` AS `RegisterTownName`,
- `service_donatebaseinfo`.`RegisterCommunity` AS `RegisterCommunity`,
- `service_donatebaseinfo`.`RegisterCommunityName` AS `RegisterCommunityName`,
- `service_donatebaseinfo`.`RegisterCountyCode` AS `RegisterCountyCode`,
- `service_donatebaseinfo`.`RegisterCountyName` AS `RegisterCountyName`,
- `service_donatebaseinfo`.`RecordState` AS `RecordState`,
- `service_donatebaseinfo`.`TreatmentHospitalNo` AS `TreatmentHospitalNo`,
- `service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
- `service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
- `service_donatebaseinfo`.`DiagnosisNo` AS `DiagnosisNo`,
- `service_donatebaseinfo`.`DiagnosisName` AS `DiagnosisName`,
- `service_donatebaseinfo`.`DonorNo` AS `DonorNo`,
- `service_donatebaseinfo`.`ReporterNo` AS `ReporterNo`,
- `service_donatebaseinfo`.`ReporterName` AS `ReporterName`,
- `service_donatebaseinfo`.`ReporterPhone` AS `ReporterPhone`,
- `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
- `service_donatebaseinfo`.`BloodType` AS `BloodType`,
- `service_donatebaseinfo`.`RhYin` AS `RhYin`,
- `service_donatebaseinfo`.`InpatientNo` AS `InpatientNo`,
- `service_donatebaseinfo`.`IllnessOverview` AS `IllnessOverview`,
- `service_donatebaseinfo`.`DiseaseType` AS `DiseaseType`,
- `service_donatebaseinfo`.`PatientState` AS `PatientState`,
- `service_donatebaseinfo`.`create_by` AS `basecreateby`,
- `service_donatebaseinfo`.`workflow` AS `workflow;`,
- `service_donatebaseinfo`.`termination_case` AS `terminationCase;`,
- `service_donateflowchart`.`ID` AS `fcID`,
- `service_donateflowchart`.`InfoID` AS `InfoID`,
- `service_donateflowchart`.`DonorNo` AS `fcDonorNo`,
- `service_donateflowchart`.`del_flag` AS `delFlag`,
- `service_donateflowchart`.`create_by` AS `createBy`,
- `service_donateflowchart`.`create_time` AS `createTime`,
- `service_donateflowchart`.`update_by` AS `updateBy`,
- `service_donateflowchart`.`update_time` AS `updateTime`,
- `service_donateflowchart`.`FlowName` AS `FlowName`,
- `service_donateflowchart`.`FlowAnnex` AS `FlowAnnex`,
- `service_donateflowchart`.`FlowContent` AS `FlowContent`,
- `service_donateflowchart`.`FlowConclusion` AS `FlowConclusion`
+ service_donatebaseinfo.ID as id,
+ service_donatebaseinfo.`Name` as name,
+ service_donatebaseinfo.IDCardNo as idcardno,
+ service_donatebaseinfo.IDCardType as idcardtype,
+ service_donatebaseinfo.Sex as sex,
+ service_donatebaseinfo.Age as age,
+ service_donatebaseinfo.AgeUnit as ageUnit,
+ service_donatebaseinfo.Birthday as irthday,
+ service_donatebaseinfo.Phone as phone,
+ service_donatebaseinfo.Nationality as nationality,
+ service_donatebaseinfo.NativePlace as nativePlace,
+ service_donatebaseinfo.Nation as nation,
+ service_donatebaseinfo.RegisterAddress as registerAddress,
+ service_donatebaseinfo.RegisterProvince as registerProvince,
+ service_donatebaseinfo.RegisterProvinceName as registerProvinceName,
+ service_donatebaseinfo.RegisterCity as registerCity,
+ service_donatebaseinfo.RegisterCityName aS registerCityName,
+ service_donatebaseinfo.RegisterTown as registerTown,
+ service_donatebaseinfo.RegisterTownName as registerTownName,
+ service_donatebaseinfo.RegisterCommunity as registerCommunity,
+ service_donatebaseinfo.RegisterCommunityName as registerCommunityName,
+ service_donatebaseinfo.RegisterCountyCode as registerCountyCode,
+ service_donatebaseinfo.RegisterCountyName as registerCountyName,
+ service_donatebaseinfo.RecordState as recordState,
+ service_donatebaseinfo.TreatmentHospitalNo as treatmentHospitalNo,
+ service_donatebaseinfo.TreatmentHospitalName as treatmentHospitalName,
+ service_donatebaseinfo.TreatmentDeptName as treatmentDeptName,
+ service_donatebaseinfo.DiagnosisNo as diagnosisNo,
+ service_donatebaseinfo.DiagnosisName as diagnosisName,
+ service_donatebaseinfo.BloodType as bloodType,
+ service_donatebaseinfo.RhYin as rhYin,
+ service_donatebaseinfo.InpatientNo as inpatientNo,
+ service_donatebaseinfo.DonorNo as donorNo,
+ service_donatebaseinfo.DonationCategory as donationcategory,
+ service_donatebaseinfo.IllnessOverview as illnessoverview,
+ service_donatebaseinfo.DiseaseType as diseasetype,
+ service_donatebaseinfo.DiseaseType_Other as diseasetypeOther,
+ service_donatebaseinfo.create_by as createBy,
+ service_donatebaseinfo.create_time as createTime,
+ service_donatebaseinfo.del_flag as delFlag,
+ service_donatebaseinfo.workflow,
+ service_donatebaseinfo.termination_case as terminationCase,
+ service_donatebaseinfo.donatetime,
+ service_donatebaseinfo.donateno,
+ service_donatebaseinfo.deptid,
+ service_donatebaseinfo.deptname,
+ service_ethicalreviewopinions.ID as fcid,
+ service_ethicalreviewopinions.ExpertOpinion as expertopinion,
+ service_ethicalreviewopinions.ExpertConclusion as expertconclusion,
+ service_ethicalreviewopinions.ExpertName as expertname,
+ service_ethicalreviewopinions.ConclusionTime as conclusiontime,
+ service_ethicalreviewopinions.ConclusionAnnex as conclusionannex,
+ service_ethicalreviewopinions.ConclusionOrder as conclusionorder
FROM
+ service_donatebaseinfo
+ LEFT JOIN
+ service_ethicalreviewopinions
+ ON
+ service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
+ LEFT JOIN base_organization ON
+ base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
- `service_donatebaseinfo`
- LEFT JOIN `service_donateflowchart` ON
- `service_donatebaseinfo`.`ID` = `service_donateflowchart`.`InfoID`
- AND `service_donateflowchart`.`FlowName` = '浼︾悊瀹℃煡'
- LEFT JOIN `base_organization` ON
- `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
@@ -129,17 +132,17 @@
<if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
#{basecreateby}
</if>
- <if test="starttime != null ">and `service_donateflowchart`.create_time >= #{starttime}</if>
- <if test="endtime != null ">and `service_donateflowchart`.create_time <= #{endtime}</if>
+ <if test="starttime != null ">and `service_ethicalreviewopinions`.ConclusionTime >= #{starttime}</if>
+ <if test="endtime != null ">and `service_ethicalreviewopinions`.ConclusionTime <= #{endtime}</if>
<if test="reporterno != null and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
#{reporterno}
</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
- <if test="fcid != null ">and `service_donateflowchart`.`ID` = #{fcid}</if>
+ <if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
<if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
- order by `service_donateflowchart`.`create_time` desc
+ order by `service_ethicalreviewopinions`.`ConclusionTime` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
--
Gitblit v1.9.3