From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/resources/mapper/StandardMethodMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
index 739d2d4..82bfa6c 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -13,6 +13,7 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="needSearchNew" column="need_search_new" jdbcType="INTEGER"/>
</resultMap>
<select id="selectStandardMethodList" resultType="com.ruoyi.basic.pojo.StandardMethod">
@@ -21,7 +22,6 @@
sm.code,
sm.name,
sm.structure_test_object_id,
- sto.specimen_name sample_type,
sm.remark,
u1.name create_user_name,
sm.create_time,
@@ -31,11 +31,15 @@
sm.field,
sm.name_en,
sm.is_use,
- sm.qualification_id
+ sm.need_search_new,
+ sm.qualification_id,
+ COALESCE((SELECT GROUP_CONCAT(l.laboratory_name ORDER BY COALESCE(l.sort, 0), l.id SEPARATOR '銆�')
+ FROM standard_method_industry smi JOIN laboratory l ON l.id = smi.industry_id
+ WHERE smi.standard_method_id = sm.id), '') industry_names,
+ (SELECT COUNT(*) FROM standard_method_attachment sma WHERE sma.standard_method_id = sm.id) attachment_count
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
where sm.code != '鎶�鏈姹�'
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -57,6 +61,7 @@
sm.field,
sm.name_en,
sm.is_use,
+ sm.need_search_new,
sm.qualification_id
from standard_method sm
left join user u1 on sm.create_user = u1.id
@@ -64,4 +69,49 @@
left join structure_test_object sto on sm.structure_test_object_id = sto.id
where sm.id = #{id}
</select>
+
+ <select id="selectStandardMethodLists" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ select id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
+ </select>
+
+ <select id="selectStandardMethodLists3" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ select id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
+ </select>
+ <select id="selectStandardMethodListsByIndustry" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ select sm.id, sm.code, sm.name, sm.remark
+ from standard_method sm
+ inner join standard_method_industry smi on smi.standard_method_id = sm.id
+ inner join laboratory l on l.id = smi.industry_id
+ where sm.is_use = 1
+ and sm.is_product = 1
+ and l.laboratory_name = #{industry}
+ order by sm.id
+ </select>
+ <select id="selectListEnum" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ select id,code,name from standard_method
+ where is_product = 1
+ and is_use = 1
+ </select>
+ <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ select id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and (
+ structure_test_object_id is null
+ OR structure_test_object_id = ''
+ OR structure_test_object_id = '[]'
+ )
+ </select>
+ <select id="getStandardMethodId" resultType="java.lang.Integer">
+ select id from standard_method where code = #{code}
+ </select>
</mapper>
--
Gitblit v1.9.3