diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 312c8212d..d76622b91 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2412,7 +2412,70 @@ namespace IRaCIS.Core.Infra.EFCore.Common #region 阅片期临床数据 + // CRC PM 临床数据 + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalData))) + { + var type = GetEntityAuditOpt(item); + var entity = item.Entity as ReadingClinicalData; + + var config = await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId); + + string extraIndentification = string.Empty; + + if (type != AuditOpt.Update) + { + switch (config.ClinicalDataLevel) + { + case ClinicalLevel.Subject: + case ClinicalLevel.SubjectVisit: + extraIndentification = "SubjectVisit"; + break; + case ClinicalLevel.Study: + extraIndentification = "Study"; + break; + case ClinicalLevel.ImageRead: + case ClinicalLevel.OncologyRead: + extraIndentification = "ImageRead"; + break; + } + } + + List urlList = new List() + { + "ReadingClinicalData/addOrUpdateReadingClinicalData", + "ReadingClinicalData/deleteReadingClinicalDataPDF", + }; + + if (type == AuditOpt.Update && urlList.Contains(_userInfo.RequestUrl)) + { + switch (config.ClinicalDataLevel) + { + case ClinicalLevel.ImageRead: + case ClinicalLevel.OncologyRead: + extraIndentification = "ImageRead"; + break; + default: + extraIndentification = "SubjectVisit"; + break; + } + } + + await InsertInspection(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO() + { + + IsDistinctionInterface = type == AuditOpt.Update ? true : false, + + SubjectVisitId = x.IsVisit ? x.ReadingId : null, + + ObjectRelationParentId = entity.ClinicalDataTrialSetId, + + //ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null + }, + new { FileCountViewStr = config?.ClinicalDataLevel == ClinicalLevel.Subject && config?.ClinicalUploadType == ClinicalUploadType.Table ? "NA" : entity.FileCount.ToString() }, + extraIndentification + ); + } //临床数据上传PDF @@ -2650,70 +2713,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common ); } - // CRC PM 临床数据 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalData))) - { - var type = GetEntityAuditOpt(item); - - var entity = item.Entity as ReadingClinicalData; - - var config = await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId); - - string extraIndentification = string.Empty; - - if (type != AuditOpt.Update) - { - switch (config.ClinicalDataLevel) - { - case ClinicalLevel.Subject: - case ClinicalLevel.SubjectVisit: - extraIndentification = "SubjectVisit"; - break; - case ClinicalLevel.Study: - extraIndentification = "Study"; - break; - case ClinicalLevel.ImageRead: - case ClinicalLevel.OncologyRead: - extraIndentification = "ImageRead"; - break; - } - } - - List urlList = new List() - { - "ReadingClinicalData/addOrUpdateReadingClinicalData", - "ReadingClinicalData/deleteReadingClinicalDataPDF", - }; - - if (type == AuditOpt.Update && urlList.Contains(_userInfo.RequestUrl )) - { - switch (config.ClinicalDataLevel) - { - case ClinicalLevel.ImageRead: - case ClinicalLevel.OncologyRead: - extraIndentification = "ImageRead"; - break; - default: - extraIndentification = "SubjectVisit"; - break; - } - } - - await InsertInspection(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO() - { - - IsDistinctionInterface = type == AuditOpt.Update ? true : false, - - SubjectVisitId = x.IsVisit ? x.ReadingId : null, - - ObjectRelationParentId = entity.ClinicalDataTrialSetId, - - //ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null - }, - new { FileCountViewStr = config?.ClinicalDataLevel == ClinicalLevel.Subject && config?.ClinicalUploadType == ClinicalUploadType.Table ? "NA" : entity.FileCount.ToString() }, - extraIndentification - ); - } + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingConsistentClinicalData))) {