From c26bd5ad3067fbb0734cb77113cd06dc6b6acec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Tue, 1 Apr 2025 10:24:06 +0800
Subject: [PATCH] update

---
 .../entrustment/service/impl/EntrustmentServiceImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index 4a91666..d7aa2fe 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -3438,7 +3438,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                         .or()
                         .like("c.case_name", keywords))
                 .eq("status", status)
-                .orderByDesc("accept_no")
+                .orderByDesc("CAST(SUBSTRING_INDEX(accept_no, '-', 1) AS UNSIGNED)",   // 按年份降序
+                        "CAST(SUBSTRING_INDEX(accept_no, '-', -1) AS UNSIGNED)") // 按流水号降序
         );
 
         List<EntrustmentVO> records = voPage.getRecords();
@@ -3447,12 +3448,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService
                     .list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
                             .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustmentVO.getId())
-                            .orderByAsc(EntrustmentIdentificationMaterial::getAcceptNo));
+                            .orderByDesc(EntrustmentIdentificationMaterial::getAcceptNo)); // 确保材料也按正确顺序排列
             entrustmentVO.setMaterialList(materialList);
         }
         return voPage;
     }
 
+
     /**
      * 判断是否已经生成好了检材照片，如果生成了，返回给前端true 如果没有就返回false
      *