diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs index 8273325f7..9a774aef9 100644 --- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs +++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs @@ -115,9 +115,9 @@ public static class DBContext_Ext } // 重传影像 - //CRC 申请 || PM审批的时候 + //CRC 申请 || PM审批的时候 if ((originRequestBackState == RequestBackStateEnum.NotRequest && subjectVisit.RequestBackState == RequestBackStateEnum.CRC_RequestBack) || - (originRequestBackState == RequestBackStateEnum.CRC_RequestBack && (subjectVisit.RequestBackState == RequestBackStateEnum.PM_AgressBack || subjectVisit.RequestBackState == RequestBackStateEnum.PM_NotAgree ))) + (originRequestBackState == RequestBackStateEnum.CRC_RequestBack && (subjectVisit.RequestBackState == RequestBackStateEnum.PM_AgressBack || subjectVisit.RequestBackState == RequestBackStateEnum.PM_NotAgree))) { subjectVisit.AddDomainEvent(new CheckReuploadEvent() { RequestBackState = subjectVisit.RequestBackState, SubjectVisitId = subjectVisit.Id }); } @@ -333,7 +333,7 @@ public static class DBContext_Ext var originReReadingApplyState = entry.Property(p => p.ReReadingApplyState).OriginalValue; - if (originReReadingApplyState == ReReadingApplyState.Default && (visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)) + if ((originReReadingApplyState != ReReadingApplyState.TrialGroupHaveApplyed && originReReadingApplyState != ReReadingApplyState.DocotorHaveApplyed) && (visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)) { var findSubjectVisit = new EnrollmentConfirmAndPD(); @@ -359,9 +359,10 @@ public static class DBContext_Ext } - visitTask.AddDomainEvent(new HaveReadVisitTaskReReading() { SubjectId=visitTask.SubjectId, VisitTaskId = visitTask.Id, ReReadingApplyState = visitTask.ReReadingApplyState }); - - + if (visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed) + { + visitTask.AddDomainEvent(new HaveReadVisitTaskReReading() { SubjectId = visitTask.SubjectId, VisitTaskId = visitTask.Id, ReReadingApplyState = visitTask.ReReadingApplyState }); + } } @@ -453,7 +454,7 @@ public static class DBContext_Ext if (spmApproveEnrollIdList.Count > 0) { - lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { TrialId= lastEnroll.TrialId, EnrollIdList = spmApproveEnrollIdList }); + lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { TrialId = lastEnroll.TrialId, EnrollIdList = spmApproveEnrollIdList }); eventStoreList.AddRange(GetStoreEvents(lastEnroll.DomainEvents)); }