From 67d8c0d3f7023d1b3849db242fe8b3c28edb7963 Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Wed, 15 Apr 2026 18:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/RegLisReportMapper.xml       | 1 +
 .../src/main/resources/mapper/RegTransitSampleMapper.xml   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml
index 4c675ae..16945fd 100644
--- a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml
+++ b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml
@@ -16,6 +16,7 @@
         <if test="brlyname != null and brlyname != ''"> and brlyname = #{brlyname}</if>
         <if test="yljg != null and yljg != ''"> and yljg = #{yljg}</if>
         <if test="barcode_zt != null and barcode_zt !=''">and barcode_zt = #{barcode_zt}</if>
+        order by barcode_zt
     </select>
 
     <select id="getLisReportDetail" resultType="map">
diff --git a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
index 4506f6f..c55c357 100644
--- a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
+++ b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
@@ -20,7 +20,12 @@
             <if test="DateType == '采样时间'">and (a.AffirmTime between #{DateStart} and #{DateEnd}) </if>
             <if test="DateType == '送出时间'">and (a.SendPackTime between #{DateStart} and #{DateEnd}) </if>
             <if test="DateType == '签收时间'">and (a.SignInTime between #{DateStart} and #{DateEnd}) </if>
-        order by a.patname
+        order by
+        <if test="DateType == '登记时间'">a.OrderTime desc,</if>
+        <if test="DateType == '采样时间'">a.AffirmTime desc,</if>
+        <if test="DateType == '送出时间'">a.SendPackTime desc,</if>
+        <if test="DateType == '签收时间'">a.SignInTime desc,</if>
+            a.patname
     </select>
 
     <select id="getRegTransitSampleDetail" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail">