From bb9499352faae20bb2c898f3f6078f7a4e9ceef2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:17:19 +0800
Subject: [PATCH] 检验项目数据导入;检验模板调整

---
 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index d4e6bab..1efe402 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -56,6 +56,7 @@
             inspection_item_classify,
             inspection_item_subclass,
             laboratory,
+            son_laboratory,
             unit,
             price,
             man_hour,
@@ -68,15 +69,16 @@
             value_type,
             method,
             man_day,
-            bsm
+            bsm,
+            template_id
         from structure_item_parameter
         where id = #{id}
     </select>
     <select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
         select inspection_item,
-               inspection_item_classify,
                inspection_item_subclass,
                laboratory,
+               son_laboratory,
                unit,
                price,
                man_hour,
@@ -90,8 +92,17 @@
                method,
                man_day,
                sample,
-               bsm
-        from structure_item_parameter
-        where sample = #{sample}
+               bsm,
+               template_id,
+               dic
+        from structure_item_parameter sp
+        left join structure_test_object sto on sto.id = sp.sample
+        where sto.specimen_name = #{sampleType}
+    </select>
+    <select id="getStandardMethodListBySample" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+        select sm.code,sm.name,sm.remark from standard_method sm
+        left join structure_test_object sto on sm.structure_test_object_id = sto.id
+        where sto.specimen_name = #{sampleType}
+        and is_use = 1
     </select>
 </mapper>

--
Gitblit v1.9.3