diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 8065d1c34..e1e0d223b 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -164,7 +164,6 @@ namespace IRaCIS.Core.Application.Contracts public string SubjectCode { get; set; } = String.Empty; public QCChanllengeReuploadEnum? ReuploadEnum { get; set; } - public ChallengeStateEnum? ChallengeState { get; set; } public bool? IsUrgent { get; set; } public Guid? SubjectId { get; set; } public Guid? SiteId { get; set; } @@ -176,7 +175,7 @@ namespace IRaCIS.Core.Application.Contracts public class QCCRCChallengeViewModel { - + public Guid? PreliminaryAuditUserId { get; set; } public bool IsBaseLine { get; set; } public bool IsUrgent { get; set; } public Guid? ClinicalDataSignUserId { get; set; } @@ -186,7 +185,6 @@ namespace IRaCIS.Core.Application.Contracts //public string CreatorFirstName { get; set; } //public string CreatorLastName { get; set; } public string BlindName { get; set; } = String.Empty; - public string Creator { get; set; } = String.Empty; //public string ReplyerRealName { get; set; } @@ -207,13 +205,15 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? ClosedTime { get; set; } - public string ClosedUser { get; set; } = String.Empty; + public string PreliminaryAuditUserName { get; set; } + + //public string ClosedUserUserName { get; set; } = String.Empty; public DateTime? CreateTime { get; set; } public Guid CreateUserId { get; set; } - public string CreateUser { get; set; } = String.Empty; + public string CreateUserName { get; set; } = String.Empty; //public bool NeedReUpload { get; set; } public QCChanllengeReuploadEnum ReuploadEnum { get; set; } @@ -236,7 +236,7 @@ namespace IRaCIS.Core.Application.Contracts public Guid LatestReplyUserId { get; set; } - public string LatestReplyUser { get; set; } = String.Empty; + public string LatestReplyUserName { get; set; } = String.Empty; public string Content { get; set; } = string.Empty; @@ -370,11 +370,11 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? SubmitTime { get; set; } - public string CurrentActionUser { get; set; } = String.Empty; - public string PreliminaryAuditUser { get; set; } = String.Empty; + public string CurrentActionUserName { get; set; } = String.Empty; + public string PreliminaryAuditUserName { get; set; } = String.Empty; - public string ReviewAuditUser { get; set; } = String.Empty; + public string ReviewAuditUserName { get; set; } = String.Empty; public DateTime? ReviewAuditTime { get; set; } public DateTime? PreliminaryAuditTime { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 9475a5257..7810467c1 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -165,7 +165,7 @@ namespace IRaCIS.Core.Application.Image.QA var svExpression = GetQCChallengeFilter(challengeQuery.VisitPlanArray); var query2 = _repository.Where(x => x.TrialId == challengeQuery.TrialId) - .WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState) + //.WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState) .WhereIf(challengeQuery.ReuploadEnum != null, t => t.ReuploadEnum == challengeQuery.ReuploadEnum) .WhereIf(challengeQuery.IsClosed != null, t => t.IsClosed == challengeQuery.IsClosed) .WhereIf(challengeQuery.SiteId != null, t => t.SubjectVisit.SiteId == challengeQuery.SiteId) @@ -255,7 +255,7 @@ namespace IRaCIS.Core.Application.Image.QA var svExpression = GetQCChallengeFilter(challengeQuery.VisitPlanArray); var query = _repository.Where(x => x.TrialId == challengeQuery.TrialId) - .WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState) + //.WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState) .WhereIf(challengeQuery.ReuploadEnum != null, t => t.ReuploadEnum == challengeQuery.ReuploadEnum) .WhereIf(challengeQuery.IsClosed != null, t => t.IsClosed == challengeQuery.IsClosed) .WhereIf(challengeQuery.SiteId != null, t => t.SubjectVisit.SiteId == challengeQuery.SiteId) diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 4b5833c84..5c6c9f61e 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -113,9 +113,9 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum)) .ForMember(d => d.SubjectStatus, u => u.MapFrom(s => s.Subject.Status)) .ForMember(d => d.StudyCount, u => u.MapFrom(s => s.StudyList.Count())) - .ForMember(d => d.CurrentActionUser, u => u.MapFrom(s => s.CurrentActionUser.LastName + " / " + s.CurrentActionUser.FirstName)) - .ForMember(d => d.PreliminaryAuditUser, u => u.MapFrom(s => s.PreliminaryAuditUser.LastName + " / " + s.PreliminaryAuditUser.FirstName)) - .ForMember(d => d.ReviewAuditUser, u => u.MapFrom(s => s.ReviewAuditUser.LastName + " / " + s.ReviewAuditUser.FirstName)) + .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(s => s.CurrentActionUser.UserName)) + .ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.PreliminaryAuditUser.UserName)) + .ForMember(d => d.ReviewAuditUserName, u => u.MapFrom(s => s.ReviewAuditUser.UserName)) .ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() : false)) .ForMember(d => d.DicomStudyCount, u => u.MapFrom(t => t.StudyList.Count())) .ForMember(d => d.NoneDicomStudyCount, u => u.MapFrom(t => t.NoneDicomStudyList.Count(t => t.NoneDicomFileList.Any()))); @@ -193,6 +193,8 @@ namespace IRaCIS.Core.Application.Service //CRC 质疑列表 CreateMap() + .ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUser.UserName)) + .ForMember(d => d.PreliminaryAuditUserId, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUserId)) .ForMember(d => d.SiteId, u => u.MapFrom(s => s.SubjectVisit.SiteId)) .ForMember(d => d.AuditState, u => u.MapFrom(s => s.SubjectVisit.AuditState)) .ForMember(d => d.IsUrgent, u => u.MapFrom(s => s.SubjectVisit.IsUrgent)) @@ -204,10 +206,10 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.RequestBackState, u => u.MapFrom(s => s.SubjectVisit.RequestBackState)) .ForMember(d => d.VisitNum, u => u.MapFrom(s => s.SubjectVisit.VisitNum)) .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName)) - .ForMember(d => d.Creator, u => u.MapFrom(s => s.Creator.UserName)) + //.ForMember(d => d.ClosedUserUserName, u => u.MapFrom(s => s.ClosedUser.UserName)) .ForMember(d => d.IsQCConfirmedReupload, u => u.MapFrom(s => s.SubjectVisit.IsQCConfirmedReupload)) - .ForMember(d => d.CreateUser, u => u.MapFrom(s => s.Creator.LastName + s.Creator.FirstName)) - .ForMember(d => d.LatestReplyUser, u => u.MapFrom(t => t.LatestReplyUser.LastName + t.Creator.FirstName)) + .ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.Creator.UserName)) + .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName)) .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5"))); //排序的时候有坑 把这个带到sql 中去了 //.AfterMap((src, dest) => dest.ChallengeCode = "Q" + src.ChallengeCode.ToString("D5"));//实测没有效果 diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index c6f22c664..d74ebd50a 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -56,6 +56,8 @@ namespace IRaCIS.Core.Domain.Models public string ClosedUser { get; set; } = string.Empty; + + public QCChallengeCloseEnum CloseResonEnum { get; set;} public string Content { get; set; } = string.Empty;