日常生活活动能力查询排序

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -693,14 +693,16 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public Map taskReportFractionDtlQueryList() {
-        List<ChTaskReportFractionDtl> chTaskReportFractionDtls = chTaskReportFractionDtlMapper.selectList(null);
+        LambdaQueryWrapper<ChTaskReportFractionDtl> lwq = new LambdaQueryWrapper<>();
+        lwq.orderBy(true,true,ChTaskReportFractionDtl::getTaskReportNum);
+        List<ChTaskReportFractionDtl> chTaskReportFractionDtls = chTaskReportFractionDtlMapper.selectList(lwq);
 
-        Map<String, Object> typeHashMap = new HashMap<>();
+        Map<String, Object> typeHashMap = new LinkedHashMap<>();
         for (ChTaskReportFractionDtl chTaskReportFractionDtl : chTaskReportFractionDtls) {
             String taskReportType = chTaskReportFractionDtl.getTaskReportType();
             if(!typeHashMap.containsKey(taskReportType)){
                 List<ChTaskReportFractionDtl> typeList =  chTaskReportFractionDtls.stream().filter(c-> c.getTaskReportType().equals(taskReportType)).collect(Collectors.toList());
-                Map<String, Object> hashMap = new HashMap<>();
+                Map<String, Object> hashMap = new LinkedHashMap<>();
                 for (ChTaskReportFractionDtl chTaskReportFraction:typeList) {
                     String taskReportProxy = chTaskReportFraction.getTaskReportProxy();
                     if(!hashMap.containsKey(taskReportProxy)){