From c0e343a34c4d56c949e9d039eabe1be014f4e34b Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Thu, 8 May 2025 16:52:32 +0800
Subject: [PATCH] dev

---
 .../server/service/social/SocialDiagnoseService.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java
index 5859cda..b322d4f 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java
@@ -84,15 +84,18 @@ public class SocialDiagnoseService extends BaseService {
      */
     public List<SocialDiagnose> getDiagnosis(String keyword) {
         QueryWrapper<SocialDiagnose> queryWrapper = new QueryWrapper<>();
-
+        queryWrapper.select("*,CHAR_LENGTH(name) as name_length");
         if (keyword != null && !keyword.isEmpty()) {
             String key = keyword.trim().toUpperCase();
+
             queryWrapper.and(wrapper -> wrapper.like("name", key)
                     .or().like("code", key)
                     .or().like("pinyin_full", key)
                     .or().like("pinyin_first", key));
         }
-        queryWrapper.orderByDesc("use_num","id");
+        queryWrapper.orderByDesc("use_num");
+        queryWrapper.orderByAsc("name_length");
+        queryWrapper.orderByDesc("id");
         queryWrapper.last("limit 60");
         return socialDiagnoseMapper.selectList(queryWrapper);
     }