From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index e1e1bd3..89cc4fc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -52,6 +52,7 @@
         <result property="assessTime" column="assess_time"/>
         <result property="assessState" column="assess_state"/>
         <result property="assessannex" column="AssessAnnex"/>
+        <result property="donationcategory" column="donationcategory"/>
     </resultMap>
 
     <sql id="selectServiceMedicalevaluationVo">
@@ -193,6 +194,7 @@
         SELECT
         sb.TreatmentHospitalName,
         sb.TreatmentHospitalNo,
+        sb.DonationCategory as donationcategory,
         sb.DonorNo,
         sb.case_no,
         sb.Name,
@@ -206,11 +208,13 @@
         sb.id as infoID,
         sm.ID,
         sm.assessannex,
+        sm.assess_time,
         sm.assess_state
         FROM service_donatebaseinfo sb
         LEFT JOIN service_medicalevaluation sm ON sb.ID = sm.InfoID and sm.del_flag = 0
-        and sb.del_flag = 0
+        and sb.del_flag = 0 and sm.ID is not null
         <where>
+            sb.termination_case = 0
             <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
             <if test="caseNo != null and caseNo != ''">AND sm.case_no = #{caseNo}</if>
             <if test="donorno != null and donorno != ''">AND sm.DonorNo = #{donorno}</if>

--
Gitblit v1.9.3