Merge branch 'Uat_IRC_Net8' into Test_IRC_Net8

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -155,7 +155,7 @@ namespace IRaCIS.Core.Application.Contracts
         public async Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId)
         {
             return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId)
-                .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
+                .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).OrderBy(t=>t.CreateTime).ToListAsync();
         }
 
         [HttpGet("{subjectVisitId:guid}")]

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -222,6 +222,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public bool IsClosed { get; set; }
         public DateTime? ReUploadedTime { get; set; }
         public string CreateUserName { get; set; } = String.Empty;
+        public string CreateUserFullName { get; set; } = String.Empty;
+
         public DateTime CreateTime { get; set; }
 
         public bool IsOverTime => IsClosed ? ClosedTime > DeadlineTime : DateTime.Now > DeadlineTime;

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

@@ -608,10 +608,10 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.IsCurrentUser, u => u.MapFrom(s => s.CreateUserId == currentUserId));
             //质疑编号
             CreateMap<QCChallenge, QCChallengeWithUser>()
-                 .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName))
-                 .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
+                 .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.FullName))
+                 .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.FullName))
                  .ForMember(d => d.CurrentActionUserId, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUserId))
-                 .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.UserName))
+                 .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.FullName))
 
                  .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId))
                 .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => s.ChallengeCode))
@@ -623,10 +623,10 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<QCChallenge, ChallengeAndDialog>()
-                .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName))
-                 .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
+                .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.FullName))
+                 .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.FullName))
                  .ForMember(d => d.CurrentActionUserId, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUserId))
-                 .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.UserName))
+                 .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.FullName))
 
                  .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId))
                  .ForMember(d => d.DialogList, u => u.MapFrom(t => t.DialogList.OrderBy(t => t.CreateTime)))