From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index e3cdc4d..bd323c2 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -414,9 +414,11 @@
SELECT sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
+ sd.id AS id,
sd.case_no AS caseNo,
sd.NAME AS NAME,
sd.RecordState AS recordstate,
+ sd.workflow AS workflow,
sd.Sex AS sex,
sd.Age AS age,
sd.BloodType AS bloodtype,
@@ -426,10 +428,8 @@
sd.coordinator_name AS coordinatorName,
sd.termination_case AS terminationCase,
sd.diagnosisname AS diagnosisname,
- sm.assess_first_time AS assessFirstTime,-- 绗竴娆¤瘎浼版椂闂�
- sm.assess_second_time AS assessSecondTime,-- 绗簩娆¤瘎浼版椂闂�
- sm.first_assess_state AS firstAssessState,-- 绗竴娆¤瘎浼扮粨璁�
- sm.second_assess_state AS secondAssessState,-- 绗簩娆¤瘎浼扮粨璁�
+ sm.assess_state AS assessState,-- 璇勪及鐘舵��
+ sm.assess_time AS assessTime,-- 璇勪及鏃堕棿
sr.SignDate AS signDate,-- 浜插睘纭鏃堕棿
se.expert_conclusion AS expertConclusion,-- 浼︾悊瀹℃煡涓撳缁撹
se.expert_time AS expertTime,-- 浼︾悊瀹℃煡涓撳缁撹鏃堕棿
@@ -452,7 +452,8 @@
<where>sd.del_flag = 0
<if test="name != null ">AND sd.Name >= #{name}</if>
<if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
- <if test="recordstate != null and recordstate != ''">and RecordState = #{recordstate}</if>
+ <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
+ <if test="workflow != null">and sd.workflow = #{workflow}</if>
</where>
ORDER BY sd.ReportTime DESC
--
Gitblit v1.9.3