From 7f2f54e5ae3d3bf09172e1520d8d9dfb556d57c4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:23:41 +0800
Subject: [PATCH] 功能调整

---
 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml |   11 +++++++----
 1 files changed, 7 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..ce4a5cc 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">
@@ -157,7 +157,8 @@
                0 state,
                #{model} model,
                #{sample} sample,
-               #{trees} tree
+               #{trees} tree,
+               id structure_item_parameter_id
         from structure_item_parameter
         where (
                       sample is NULL
@@ -193,7 +194,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>
@@ -233,7 +235,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