From ecaf6326139d524e71c96b7fa459f452f8498065 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 28 四月 2024 07:33:12 +0800
Subject: [PATCH] 标准库刷新检验项目

---
 inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index f3e6d1d..a344ea9 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -15,11 +15,6 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,code,name,
-        remark,standard_tree_id,create_user,
-        create_time,update_user,update_time
-    </sql>
     <select id="selectStandardMethodById" resultType="java.util.Map">
         select code, name, remark
         from standard_method
@@ -31,22 +26,12 @@
         where id = #{id}
     </select>
     <select id="selectStandardMethodLists" resultType="com.yuanchu.mom.pojo.StandardMethodList">
-        select sml.id, code, sml.name,sml.remark, sml.create_time, u.name create_user_name
-        from standard_method_list sml
-        left join user u on u.id = sml.create_user
-        where factory = #{data1}
-        <if test="data2 != null">
-            and laboratory = #{data2}
-        </if>
-        <if test="data3 != null">
-            and sample_type = #{data3}
-        </if>
-        <if test="data4 != null">
-            and sample = #{data4}
-        </if>
-        <if test="data5 != null">
-            and model = #{data5}
-        </if>
+        select sm.id, sm.code, sm.name,sm.remark
+        from standard_method sm
+        left join structure_test_object sto on sto.id = sm.structure_test_object_id
+        where sm.is_use = 1
+        and sm.is_product = 1
+        and sto.specimen_name = #{sampleType}
     </select>
     <select id="selectParameterList" resultType="standardProductList">
         select
@@ -66,8 +51,28 @@
                value_type,
                method,
                man_day,
-               bsm
+               bsm,
+               template_id,
+               son_laboratory
         from structure_item_parameter
         where method = #{code}
     </select>
+    <select id="selectStandardMethodLists2" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+        select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
+        from standard_method_list sml
+        left join user u on u.id = sml.create_user
+        where factory = #{data1}
+        <if test="data2 != null">
+            and laboratory = #{data2}
+        </if>
+        <if test="data3 != null">
+            and sample_type = #{data3}
+        </if>
+        <if test="data4 != null">
+            and sample = #{data4}
+        </if>
+        <if test="data5 != null">
+            and model = #{data5}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3