From cb1bb7eb7cc4b47f9415471ae7569a710337823a Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 12 十月 2026 15:57:14 +0800
Subject: [PATCH] 医学评估基础信息作废显示异常 患者死亡信息作废显示异常

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index ab03a42..f6ff6ea 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -202,6 +202,7 @@
         sb.TreatmentHospitalName,
         sb.TreatmentHospitalNo,
         sb.DonationCategory as donationcategory,
+        sb.InpatientNo AS inpatientno,
         sb.DonorNo,
         sb.case_no,
         sb.Name,
@@ -221,9 +222,9 @@
         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 sm.ID is not null
+         and sm.ID is not null
         <where>
-            sb.termination_case = 0
+            sb.termination_case = 0 and sb.del_flag = 0
             <if test="infoid != null">AND sb.ID = #{infoid}</if>
             <if test="inpatientno != null">AND sb.InpatientNo = #{inpatientno}</if>
             <if test="currentMedicalInstitution != null">AND sb.current_medical_institution = #{currentMedicalInstitution}</if>

--
Gitblit v1.9.3