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 getDiagnosis(String keyword) { QueryWrapper 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); }