From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能:支持数据填充,发现单元格合并bug,发现模板重复

---
 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index bbb7fcb..6bb36b0 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -25,6 +25,8 @@
         select sm.id,
         sm.code,
         sm.name,
+        sm.structure_test_object_id,
+        sto.specimen_name sample_type,
         sm.remark,
         u1.name create_user_name,
         sm.create_time,
@@ -33,6 +35,7 @@
         from standard_method sm
         left join user u1 on sm.create_user = u1.id
         left join user u2 on sm.update_user = u2.id
+        left join structure_test_object sto on sm.structure_test_object_id = sto.id
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}

--
Gitblit v1.9.3