diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 2c0fd99fc..d96d2b1bd 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -119,6 +119,9 @@ namespace IRaCIS.Application.Services if (visitPlan.Id == Guid.Empty || visitPlan.Id == null)//add { + var trial = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == visitPlan.TrialId)).IfNullThrowException(); + + trial.VisitPlanConfirmed = false; if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && (t.VisitName == visitPlan.VisitName || t.VisitNum == visitPlan.VisitNum), true)) { diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index d76cab378..5aa6c9fa2 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -82,6 +82,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common typeof(TrialUser), typeof(TrialSiteSurvey), typeof(TrialSiteUser), + typeof(VisitStage), typeof(TrialSite) }; } @@ -132,7 +133,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common type = type + (entity.ParentId == null ? "/parent" : string.Empty); await InsertInspection(item, type, x => new DataInspection() { - VisitStageId = x.Id, + GeneralId = x.Id, }); } @@ -184,9 +185,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common // 访视计划 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(VisitStage))) { + var entity = item.Entity as VisitStage; + + + var VisitPlanStatus =await this._dbContext.Trial.Where(x => x.Id == entity.TrialId).Select(x => x.VisitPlanConfirmed).FirstOrDefaultAsync(); + if (type == "Add") + { + VisitPlanStatus = false; + } await InsertInspection(item, type, x => new DataInspection() { VisitStageId = x.Id, + GeneralId=x.Id, + },new { + VisitPlanStatus= VisitPlanStatus, }); }