diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c03729d73..efc0014e2 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1512,6 +1512,71 @@ 创建时间 + + + 阅片人是否认同 + + + + + 是否有问题 + + + + + 质询问题 + + + + + 审核建议 + + + + + 不同意重阅原因 + + + + + 是否申请重阅 + + + + + 是否是当前用户 + + + + + 阅片人是否认同 + + + + + 是否有问题 + + + + + 质询问题 + + + + + 审核建议 + + + + + 不同意重阅原因 + + + + + 是否申请重阅 + + 是否关闭 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 6294e8521..954d16325 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -217,9 +217,9 @@ namespace IRaCIS.Application.Services foreach (var item in trialCriterionList) { - var thistrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList(); + var thisTrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList(); - var query = systemQuestionList.GroupJoin(thistrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new + var query = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new { a, trialQuestion = b @@ -228,7 +228,7 @@ namespace IRaCIS.Application.Services Id=n.Id, }); - var needAddQuestionList = systemQuestionList.GroupJoin(thistrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y }) + var needAddQuestionList = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y }) .SelectMany( a => a.trial.DefaultIfEmpty(), (c,d) => new ReadingQuestionTrial diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs index 934662746..9d42fc1ee 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs @@ -28,11 +28,11 @@ namespace IRaCIS.Core.Domain.Models /// /// 对话内容 /// - public string Content { get; set; } - + public string Content { get; set; } = string.Empty; + /// - /// 用户角色 - /// + /// 用户角色 + /// public string UserTypeShortName { get; set; } ///