diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index c17a79cca..8767e26a1 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -276,7 +276,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? ClaimUserId { get; set; } - + public string? ClaimUserName { get; set; } public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent); public int UnReadTaskCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index f4d13a114..701eec96d 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -659,13 +659,14 @@ namespace IRaCIS.Core.Application.Service.Allocation .WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode) && t.IsAnalysisCreate)); - var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode, x.Subject.ClaimUserId }); + var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode, x.Subject.ClaimUserId ,x.Subject.ClaimUser.UserName }); var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView() { SubjectId = x.Key.SubjectId, SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode, ClaimUserId = x.Key.ClaimUserId, + ClaimUserName=x.Key.UserName, SuggesteFinishedTime = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Min(x => x.SuggesteFinishedTime), diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index d97656e2f..82d213ea8 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -231,12 +231,12 @@ namespace IRaCIS.Core.Domain.Models /// /// QC流程 0 不审,1 单审,2双审 /// - public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; + public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.NotAudit; /// /// 影像一致性核查 /// - public bool IsImageConsistencyVerification { get; set; } = true; + public bool IsImageConsistencyVerification { get; set; } = false; /// /// 影像导出 @@ -359,7 +359,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsDeclaration { get; set; } - public bool IsMedicalReview { get; set; } + public bool IsMedicalReview { get; set; } = false; public UserTypeEnum? EnrollConfirmDefaultUserType { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index c88126424..d1a4e131f 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -125,6 +125,8 @@ namespace IRaCIS.Core.Domain.Models public Guid? ClaimUserId { get; set; } + [JsonIgnore] + public User ClaimUser { get; set;} //鏄惁鍒嗛厤浜嗚鐗囧尰鐢 //public bool IsAssignDoctorUser{get;set;}