From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index d0b44d5..22e321b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -71,6 +71,7 @@
`service_donatebaseinfo`.`create_by` AS `basecreateby`,
`service_donatebaseinfo`.`workflow` AS `workflow`,
`service_donatebaseinfo`.`termination_case` AS `terminationCase`,
+ `service_donatebaseinfo`.`donatetime` AS `donatetime`,
`service_medicalevaluation`.`ID` AS `meID`,
`service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
`service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
@@ -94,16 +95,14 @@
`service_medicalevaluation`.`update_by` AS `updateby`,
`service_medicalevaluation`.`update_time` AS `updatetime`
FROM
-
`service_donatebaseinfo`
LEFT JOIN `service_medicalevaluation` ON
`service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
-
-
<where>
- service_medicalevaluation.del_flag != 1
+ service_medicalevaluation.del_flag = 0
+ and service_donatebaseinfo.del_flag = 0
<if test="name != null and name != ''"> and `service_donatebaseinfo`.Name like concat('%', #{name}, '%')</if>
<if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
@@ -126,4 +125,4 @@
where CoreTeamAssessTime >= #{starttime} and CoreTeamAssessTime <= #{endtime}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3