xxxx

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

@@ -157,13 +157,13 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public DateTime? LatestMsgTime { get; set; }
 
-        public string LatestReplyUser { get; set; } = String.Empty;
+        public string LatestReplyUserName { get; set; } = String.Empty;
 
         public DateTime? ClosedTime { get; set; }
 
         public bool IsClosed { get; set; }
         public DateTime? ReUploadedTime { get; set; }
-        public string CreateUser { get; set; } = String.Empty;
+        public string CreateUserName { get; set; } = String.Empty;
         public DateTime CreateTime { get; set; }
 
         public bool IsOverTime => IsClosed ? ClosedTime > DeadlineTime : DateTime.Now > DeadlineTime;
@@ -454,7 +454,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public Guid CreateUserId { get; set; }
 
-        public string CreateUser { get; set; } = String.Empty;
+        public string CreateUserName { get; set; } = String.Empty;
+        public string CreateUserFullName { get; set; } = String.Empty;
 
         public bool IsCurrentUser { get; set; }
 

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

@@ -114,7 +114,6 @@ namespace IRaCIS.Core.Application.Image.QA
                     qcChallenge.QCProcessEnum = trialConfig.QCProcessEnum;
                     qcChallenge.CurrentQCEnum = currentQCType;
                     qcChallenge.TrialId = trialId;
-                    qcChallenge.CreateUser = _userInfo.RealName;
                     qcChallenge.ChallengeCode = code + 1;
                     qcChallenge.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt;
 
@@ -255,7 +254,6 @@ namespace IRaCIS.Core.Application.Image.QA
 
             await _repository.AddAsync(qaReply);
 
-            qaReply.CreateUser = _userInfo.RealName;
             qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt;
 
             var dbQCChallenge = await _repository.FirstOrDefaultAsync<QCChallenge>(t => t.Id == qaDialogCommand.QCChallengeId);

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

@@ -184,10 +184,15 @@ namespace IRaCIS.Core.Application.Service
             //QC 质疑对话
             var currentUserId = Guid.Empty;
             CreateMap<QCChallengeDialog, QCChanllengeDialogDTO>()
+                .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
+                 .ForMember(d => d.CreateUserFullName, u => u.MapFrom(t => t.CreateUser.FullName))
+               
                 .ForMember(d => d.IsCurrentUser, u => u.MapFrom(s => s.CreateUserId == currentUserId));
             //质疑编号
             CreateMap<QCChallenge, QCChallengeWithUser>()
-                 .ForMember(d => d.LatestReplyUser, u => u.MapFrom(t => t.LatestReplyUser.LastName + t.Creator.FirstName))
+                 .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.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId ))
                 .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5")));