diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 0b1c8e5f..d9d2805f 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -479,6 +479,7 @@ namespace IRaCIS.Core.Application.Service ; + var query = subjectQuery.Select(t => new DoctorSelfConsistentSubjectView() { TrialId = t.TrialId, diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs index 0bf325a0..08eaaee1 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs @@ -13,16 +13,18 @@ namespace IRaCIS.Core.Application.Triggers /// public class SubjectVisitCheckPassedTrigger : IBeforeSaveTrigger { - + private readonly IVisitTaskHelpeService _visitTaskHelpeService; + private readonly IRepository _subjectRepository; - public SubjectVisitCheckPassedTrigger( + + public SubjectVisitCheckPassedTrigger(IRepository subjectRepository, IVisitTaskHelpeService visitTaskHelpeService) { - - + + _subjectRepository = subjectRepository; _visitTaskHelpeService = visitTaskHelpeService; } @@ -39,6 +41,11 @@ namespace IRaCIS.Core.Application.Triggers // 一致性核查通过 生成读片任务 if (context.UnmodifiedEntity?.CheckState != subjectVisit.CheckState && subjectVisit.CheckState == CheckStateEnum.CVPassed) { + //退回或者重阅的任务一致性核查通过了 此时设置Subject 重阅影响状态 + if (context.Entity.IsPMBackOrReReading == true) + { + await _subjectRepository.UpdatePartialFromQueryAsync(t => t.Id == context.Entity.SubjectId, u => new Subject() { IsReReadingOrBackInfluenceAnalysis = false }); + } context.Entity.IsPMBackOrReReading = false;