LastName FirstName 修改为FullName 精简代码

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -730,7 +730,6 @@
             <param name="formCollection"></param>
             <param name="subjectVisitId"></param>
             <param name="noneDicomStudyId"></param>
-            <param name="_hostEnvironment"></param>
             <returns></returns>
         </member>
         <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionConfigureService">
@@ -1394,12 +1393,6 @@
             <param name="closeReason"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.DealChallengeState(System.Guid)">
-            <summary>
-            访视级别统计 质疑最新的状态
-            </summary>
-            <param name="subjectVisitId"></param>
-        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.DeleteQCChallenge(System.Guid)">
             <summary>
             删除QC质疑记录

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Services
 
                                               ConfirmUserId = confirm.ConfirmUserId,
                                               ConfirmTime = confirm.ConfirmTime,
-                                              RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
+                                              RealName = trialUser.User.FullName,
                                               UserName = trialUser.User.UserName,
                                               UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
                                           };
@@ -180,7 +180,7 @@ namespace IRaCIS.Core.Application.Services
 
                                         ConfirmUserId = confirm.ConfirmUserId,
                                         ConfirmTime = confirm.ConfirmTime,
-                                        RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
+                                        RealName = trialUser.User.FullName,
                                         UserName = trialUser.User.UserName,
                                         UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
 
@@ -318,7 +318,7 @@ namespace IRaCIS.Core.Application.Services
 
                                     ConfirmUserId = confirm.ConfirmUserId,
                                     ConfirmTime = confirm.ConfirmTime,
-                                    RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
+                                    RealName = trialUser.User.FullName,
                                     UserName = trialUser.User.UserName,
                                     UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
 
@@ -351,7 +351,7 @@ namespace IRaCIS.Core.Application.Services
 
                                      ConfirmUserId = confirm.ConfirmUserId,
                                      ConfirmTime = confirm.ConfirmTime,
-                                     RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
+                                     RealName = trialUser.User.FullName,
                                      UserName = trialUser.User.UserName,
                                      UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
 
@@ -375,7 +375,7 @@ namespace IRaCIS.Core.Application.Services
         public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
         {
             return await _repository.Where<TrialUser>(t => t.TrialId == trialId)
-                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.LastName + " / " + t.User.FirstName, UserName = t.User.UserName })
+                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.FullName, UserName = t.User.UserName })
                    .ToListAsync();
         }
 
@@ -605,7 +605,7 @@ namespace IRaCIS.Core.Application.Services
                   {
                       UserId = t.UserId,
                       UserName = t.User.UserName,
-                      RealName = t.User.LastName + " / " + t.User.FirstName,
+                      RealName = t.User.FullName,
                       UserTypeShortName = t.User.UserTypeRole.UserTypeShortName,
                       TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.User.UserTypeId)),
                       TrialDocumentConfirmedCount = t.Trial.TrialDocumentList.SelectMany(u => u.TrialDocConfirmedUserList).Count(k => k.ConfirmUserId == t.UserId),

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

@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialDocUserTypeConfirmedUser, TrialDocumentUserConfirmView>()
                 .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))
-                .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.LastName + " / " + t.User.FirstName));
+                .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName));
 
             //CreateMap<SystemDocConfirmedUser, SystemDocumentUserConfirmView>()
             //   .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))

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

@@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         TrialSiteCode = t.TrialSite.TrialSiteCode,
 
-                        Uploader = t.Uploader.LastName + " / " + t.Uploader.LastName,
+                        Uploader = t.Uploader.FullName,
 
                         UploadTime = t.CreateTime
 
@@ -110,7 +110,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                      TrialSiteCode = t.TrialSite.TrialSiteCode,
 
-                     Uploader = t.CreateUser.LastName + " / " + t.CreateUser.LastName,
+                     Uploader = t.CreateUser.FullName,
 
                      UploadTime = t.CreateTime
 
@@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         TrialSiteCode = t.TrialSite.TrialSiteCode,
 
-                        Uploader = t.Uploader.LastName + " / " + t.Uploader.LastName,
+                        Uploader = t.Uploader.FullName,
 
                         UploadTime = t.CreateTime,
 
@@ -198,7 +198,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      SubjectCode = t.Subject.Code,
                      TrialSiteAliasName = t.TrialSite.TrialSiteAliasName,
                      TrialSiteCode = t.TrialSite.TrialSiteCode,
-                     Uploader = t.Uploader.LastName + " / " + t.Uploader.LastName,
+                     Uploader = t.Uploader.FullName,
                      UploadTime = t.CreateTime,
 
                      IP = t.IP,

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -232,7 +232,7 @@ namespace IRaCIS.Application.Services
                 }
             }
 
-            var list = await _userRepository.Where(t => t.EMail == email).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.LastName + " / " + t.FirstName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();
+            var list = await _userRepository.Where(t => t.EMail == email).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.FullName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();
 
 
 
@@ -342,7 +342,7 @@ namespace IRaCIS.Application.Services
         public async Task<PageOutput<UserListDTO>> GetUserList(UserListQueryDTO param)
         {
             var userQueryable = _userRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
-                  .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserName.Contains(param.UserName) || (t.LastName + ' ' + t.FirstName).Contains(param.UserName))
+                  .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserName.Contains(param.UserName) || (t.FullName).Contains(param.UserName))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.Phone), t => t.Phone.Contains(param.Phone))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName), t => t.OrganizationName.Contains(param.OrganizationName))
                   .WhereIf(param.UserType != null, t => t.UserTypeId == param.UserType)

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

@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Http;
 using IRaCIS.Core.Domain.Share;
 using SharpCompress.Archives;
 using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Infra.EFCore;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
@@ -100,8 +99,7 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpDelete("{noneDicomStudyId:guid}/{trialId:guid}")]
         public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId)
         {
-            if (_noneDicomStudyRepository.Where(t => t.Id == noneDicomStudyId)
+            if (_noneDicomStudyRepository.Where(t => t.Id == noneDicomStudyId).SelectMany(t => t.NoneDicomFileList).Count() > 0)
-                .Any(t => t.NoneDicomFileList.Count() > 0))
             {
                 return ResponseOutput.NotOk("先移除文件，才允许删除非Dicom");
             }
@@ -127,12 +125,6 @@ namespace IRaCIS.Core.Application.Contracts
 
             var success = await _noneDicomStudyFileRepository.BatchDeleteAsync(t => t.Id == noneDicomStudyFileId);
 
-            //如果既没有 dicom数据  也没有非dicom 文件  那么提交状态变更回去
-            if (await _repository.CountAsync<DicomStudy>(t => t.SubjectVisitId == subjectVisitId) == 0 && await _repository.CountAsync<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId) == 0)
-            {
-                await _repository.BatchUpdateAsync<SubjectVisit>(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, u => new SubjectVisit() { VisitExecuted = 0, SubmitState = SubmitStateEnum.None });
-            }
-
 
             var subvisit = await _repository.GetQueryable<SubjectVisit>().FirstOrDefaultAsync(x => x.Id == subjectVisitId);
 
@@ -218,7 +210,6 @@ namespace IRaCIS.Core.Application.Contracts
         /// <param name="formCollection"></param>
         /// <param name="subjectVisitId"></param>
         /// <param name="noneDicomStudyId"></param>
-        /// <param name="_hostEnvironment"></param>
         /// <returns></returns>
         //[DisableRequestSizeLimit]
         [RequestSizeLimit(1_073_741_824)]
@@ -287,7 +278,6 @@ namespace IRaCIS.Core.Application.Contracts
                 UploadStartTime = startTime,
                 UploadFinishedTime = DateTime.Now,
                 IP = _userInfo.IP,
-                //TotalMillisecondsInterval = (DateTime.Now - startTime).TotalMilliseconds,
                 TrialId = sv.TrialId,
                 SiteId = sv.SiteId,
                 SubjectId = sv.SubjectId,

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

@@ -1,9 +1,7 @@
 using IRaCIS.Core.Application.Contracts;
 using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Infrastructure.ExpressionExtend;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Application.Contracts.DTO;
-using IRaCIS.Core.Infra.EFCore;
 using System.Linq.Expressions;
 
 namespace IRaCIS.Core.Application.Image.QA
@@ -772,7 +770,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             return await _repository.Where<TrialUser>(t => t.TrialId == trialId && t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new QCChanllengeCreatorDto()
             {
-                CreatorRealName = t.User.LastName + " / " + t.User.FirstName,
+                CreatorRealName = t.User.FullName,
                 Creator = t.User.UserName,
                 CreateUserId = t.UserId
             }).ToListAsync();
@@ -789,7 +787,7 @@ namespace IRaCIS.Core.Application.Image.QA
         {
             return await _repository.Where<TrialUser>(t => t.TrialId == trialId && (t.User.UserTypeEnum == UserTypeEnum.IQC || t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator)).Select(t => new ParticipantDTO()
             {
-                HandleUserRealName = t.User.LastName + " / " + t.User.FirstName,
+                HandleUserRealName = t.User.FullName,
                 HandleUser = t.User.UserName,
                 HandleUserId = t.UserId
             }).ToListAsync();

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -44,7 +44,7 @@ namespace IRaCIS.Application.Services
                 .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName),
                     t => t.User.OrganizationName.Contains(param.OrganizationName))
                 .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName),
-                    t => (t.User.LastName + " / " + t.User.FirstName).Contains(param.UserRealName))
+                    t => (t.User.FullName).Contains(param.UserRealName))
                 .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             var no = 1;
@@ -71,7 +71,7 @@ namespace IRaCIS.Application.Services
 
                  .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
                 .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName), t => t.User.OrganizationName.Contains(param.OrganizationName))
-                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.User.LastName + " / " + t.User.FirstName).Contains(param.UserRealName))
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.User.FullName).Contains(param.UserRealName))
                 .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(param.PageIndex, param.PageSize, string.IsNullOrWhiteSpace(param.SortField) ? "UpdateTime" : param.SortField, param.Asc);
@@ -92,7 +92,7 @@ namespace IRaCIS.Application.Services
             var query = _trialUseRepository.Where(t => t.TrialId == param.TrialId)
                 .Where(t => t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator)
                  .WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
-                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.User.LastName + " / " + t.User.FirstName).Contains(param.UserRealName))
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.User.FullName).Contains(param.UserRealName))
                 .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { siteId = param.SiteId });
 
             return await query.ToPagedListAsync(param.PageIndex,
@@ -107,7 +107,7 @@ namespace IRaCIS.Application.Services
         {
             //之前已经选择的用户 不放在列表中，现在又要改回去 废弃
             var query = _repository.Where<User>(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin)
-                   .WhereIf(!string.IsNullOrWhiteSpace(trialUserQuery.UserRealName), t => (t.LastName + " / " + t.FirstName).Contains(trialUserQuery.UserRealName))
+                   .WhereIf(!string.IsNullOrWhiteSpace(trialUserQuery.UserRealName), t => (t.FullName).Contains(trialUserQuery.UserRealName))
                     .WhereIf(!string.IsNullOrWhiteSpace(trialUserQuery.UserName), t => t.UserName.Contains(trialUserQuery.UserName))
                    //.WhereIf(!string.IsNullOrWhiteSpace(trialUserQuery.OrganizationName), t => t.OrganizationName.Contains(trialUserQuery.OrganizationName))
                    .WhereIf(trialUserQuery.UserTypeEnum != null, t => t.UserTypeEnum == trialUserQuery.UserTypeEnum)

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs

@@ -53,7 +53,7 @@ namespace IRaCIS.Core.Application.Services
                     t => t.TrialSite.TrialSiteCode.Contains(param.TrialSiteCode))
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator,
                     t => t.UserId == _userInfo.Id)
-                .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => (t.User.LastName + " / " + t.User.FirstName).Contains(param.UserKeyInfo)
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => (t.User.FullName).Contains(param.UserKeyInfo)
                     || t.User.UserName.Contains(param.UserKeyInfo) || t.User.EMail.Contains(param.UserKeyInfo))
 
                 .ProjectTo<SiteUserExportDTO>(_mapper.ConfigurationProvider).ToListAsync();
@@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Services
                              .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
                              .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteCode.Contains(param.TrialSiteCode))
                              .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.Id))
-                             .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.LastName + " / " + k.User.FirstName).Contains(param.UserKeyInfo)
+                             .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.FullName).Contains(param.UserKeyInfo)
                              || k.User.UserName.Contains(param.UserKeyInfo) || k.User.EMail.Contains(param.UserKeyInfo)))
 
                              .ProjectTo<SiteStatDTO>(_mapper.ConfigurationProvider);
@@ -162,7 +162,7 @@ namespace IRaCIS.Core.Application.Services
                             .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
                              .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode), t => t.TrialSiteCode.Contains(param.TrialSiteCode))
                             .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.Id))
-                             .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.LastName + " / " + k.User.FirstName).Contains(param.UserKeyInfo)
+                             .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => t.CRCUserList.Any(k => (k.User.FullName).Contains(param.UserKeyInfo)
                              || k.User.UserName.Contains(param.UserKeyInfo) || k.User.EMail.Contains(param.UserKeyInfo)))
 
                             .ProjectTo<SiteStatSimpleDTO>(_mapper.ConfigurationProvider);

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

@@ -62,13 +62,13 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TrialUser, TrialMaintenanceDTO>().IncludeMembers(t => t.User)
-            .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.LastName + " / " + s.User.FirstName))
+            .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
             .ForMember(t => t.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName));
             CreateMap<User, TrialMaintenanceDTO>();
 
             var siteId = Guid.Empty;
             CreateMap<TrialUser, AssginSiteCRCListDTO>().IncludeMembers(t => t.User)
-              .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.LastName + " / " + s.User.FirstName))
+              .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
               .ForMember(d => d.SiteId, u => u.MapFrom(t => siteId))
               .ForMember(d => d.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName))
               .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.SiteList.Any(k => k.SiteId == siteId)));
@@ -76,7 +76,7 @@ namespace IRaCIS.Core.Application.Service
 
             var trialId = Guid.Empty;
             CreateMap<User, TrialUserScreeningDTO>()
-             .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.LastName + " / " + s.FirstName))
+             .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.FullName))
               .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName))
               .ForMember(d => d.UserId, u => u.MapFrom(s => s.Id))
               .ForMember(d => d.TrialId, u => u.MapFrom(s => trialId))
@@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Service
             
 
            .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
-           .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.User.LastName + " / " + u.User.FirstName)));
+           .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.User.FullName)));
             #endregion
 
 
@@ -124,14 +124,14 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName))
               .ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
               .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
-              .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t=>t.IsDeleted==false).Select(u=>u.User.LastName+" / "+u.User.FirstName)));
+              .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t=>t.IsDeleted==false).Select(u=>u.User.FullName)));
             CreateMap<Site, SiteStatSimpleDTO>();
 
 
 
             CreateMap<TrialSiteUser, UserTrialDTO>().IncludeMembers(t => t.User)
                 .ForMember(d => d.UserType, u => u.MapFrom(s => s.User.UserTypeRole.UserTypeShortName))
-                .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.LastName + " / " + s.User.FirstName));
+                .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName));
             CreateMap<User, UserTrialDTO>();
 
 
@@ -166,7 +166,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<SignDTO, TrialSign>();
 
             CreateMap<TrialStateChange, TrialStateChangeDTO>()
-                 .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.LastName +" / "+c.User.FirstName))
+                 .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.FullName))
                  .ForMember(t => t.UserName, u => u.MapFrom(c => c.User.UserName));
 
 
@@ -181,7 +181,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialUserPreparation, TrialUserPreparationView>()
                 
-                .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.LastName + " / " + c.User.FirstName))
+                .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.FullName))
                 .ForMember(t => t.UserName, u => u.MapFrom(c => c.User.UserName))
                 .ForMember(t => t.UserTypeShortName, u => u.MapFrom(c => c.User.UserTypeRole.UserTypeShortName));
 
@@ -214,7 +214,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialSiteUser, SiteUserExportDTO>().IncludeMembers(t=>t.User)
                  .ForMember(t => t.TrialSiteCode, u => u.MapFrom(c => c.TrialSite.TrialSiteCode))
                  .ForMember(t => t.TrialSiteAliasName, u => u.MapFrom(c => c.TrialSite.TrialSiteAliasName))
-                .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.LastName + " / " + c.User.FirstName))
+                .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.FullName))
                 .ForMember(t => t.UserType, u => u.MapFrom(c => c.User.UserTypeRole.UserTypeShortName));
             CreateMap<User, SiteUserExportDTO>();