From 3165f71939bf0783787fbe19ac77063c23ec22bc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 15:01:55 +0800
Subject: [PATCH] 通过生日算年龄

---
 ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml |    8 +++-----
 1 files changed, 3 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 e2696ba..39f3514 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -49,7 +49,7 @@
         `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`.`RegisterAddress` AS `RegisterAddress`,
         `service_donatebaseinfo`.`RegisterProvince` AS `RegisterProvince`,
         `service_donatebaseinfo`.`RegisterProvinceName` AS `RegisterProvinceName`,
@@ -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