From 2cb2d3fcde8ab4cd3df812c4b19bb09dda977e53 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 五月 2025 11:59:53 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index e2696ba..22e321b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -95,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>
--
Gitblit v1.9.3