From 6b1886314fd18f34740c96bb4fd86046600dd2c0 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 16 五月 2024 17:08:36 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

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

diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index bdb8cfd..23b0adc 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">

--
Gitblit v1.9.3