diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f32435817..c9f285961 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1613,11 +1613,21 @@ 文件名称 - + 阅片人是否认同 + + + 不同意重阅原因 + + + + + 是否申请重阅 + + 是否有问题 @@ -1633,16 +1643,6 @@ 审核建议 - - - 不同意重阅原因 - - - - - 是否申请重阅 - - 是否关闭 @@ -2506,9 +2506,9 @@ - + - IR 申请重阅 + IR发送消息 diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs index a7407c4e9..75e0a8756 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs @@ -20,8 +20,6 @@ namespace IRaCIS.Core.Application.ViewModel public UserSimpleInfo AnalysisDoctorUser { get; set; } - public UserSimpleInfo CompareDoctorUser { get; set; } - public int? GeneratedSubjectCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index dfd5039f7..6061a2206 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -275,7 +275,7 @@ namespace IRaCIS.Core.Application.Service { var query = from enroll in _repository.Where(t => t.TrialId == trialId) join user in _repository.Where() on enroll.DoctorId equals user.DoctorId - join taskConsistentRule in _repository.Where(t=>t.TrialId==addOrEdit.TrialId) on user.Id equals taskConsistentRule.AnalysisDoctorUserId into c + join taskConsistentRule in _repository.Where(t=>t.TrialId== trialId) on user.Id equals taskConsistentRule.AnalysisDoctorUserId into c from taskConsistentRule in c.DefaultIfEmpty() select new { @@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service { var verifyExp1 = new EntityVerifyExp() { - VerifyExp = t => t.AnalysisDoctorUserId == addOrEdit.AnalysisDoctorUserId && t.TrialId == addOrEdit.TrialId, + VerifyExp = t => t.AnalysisDoctorUserId == doctor.DoctorUserId && t.TrialId == trialId, VerifyMsg = "已有该医生配置,不允许继续增加" }; @@ -308,7 +308,7 @@ namespace IRaCIS.Core.Application.Service } else { - await _taskConsistentRuleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == addOrEdit.TrialId, c => new TaskConsistentRule() + await _taskConsistentRuleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId, c => new TaskConsistentRule() { PlanSubjectCount = c.PlanSubjectCount, PlanVisitCount = c.PlanVisitCount,