Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -701,14 +701,14 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path));
 
             CreateMap<NoneDicomStudy, NoneDicomStudyView>()
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? s.NoneDicomFileList.Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.FileType).ThenBy(t => t.FileName) : s.NoneDicomFileList.OrderBy(t => t.FileType).ThenBy(t => t.FileName)))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? s.NoneDicomFileList.Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName) : s.NoneDicomFileList.OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
             Guid? visiTaskId = null;
             CreateMap<NoneDicomStudy, TaskDicomStudyView>()
                 .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ?
-                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.FileType).ThenBy(t=>t.FileName)
-                : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).OrderBy(t => t.FileType).ThenBy(t => t.FileName)))
+                s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).Where(t => !t.FileType.Contains(StaticData.FileType.Zip)).OrderBy(t => t.CreateTime).ThenBy(t=>t.FileName)
+                : s.TaskNoneDicomFileList.Where(t => visiTaskId != null ? t.VisitTaskId == visiTaskId : true).OrderBy(t => t.CreateTime).ThenBy(t => t.FileName)))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
 
         }

irc_api.drone.yml

@@ -10,7 +10,7 @@ clone:
   disable: true
 
 server:
-  host: 47.117.164.182
+  host: 101.132.253.119
   user: root
   password:
     from_secret: test_ssh_pwd