From 762c419bb29a48557b7bf18cc3bf9c84309bc90e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 06 六月 2024 15:52:48 +0800
Subject: [PATCH] 增加检验项分类
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index bdb8cfd..982cc12 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -59,7 +59,7 @@
left join standard_tree st on st.laboratory = l.laboratory_name
and st.sample_type = sto.specimen_name
and st.sample = p.name
- order by l.id,CAST(sto.code AS DECIMAL),st.id
+ order by l.id,CAST(sto.code AS DECIMAL),p.id,ISNULL(st.id),st.id
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -137,6 +137,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -157,7 +159,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -173,6 +176,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -193,7 +198,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
</select>
@@ -213,6 +219,8 @@
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
+ inspection_item_class,
+ inspection_item_class_en,
method,
son_laboratory,
unit,
@@ -233,7 +241,8 @@
0 state,
#{model} model,
#{sample} sample,
- #{trees} tree
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
--
Gitblit v1.9.3