diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 41d14d141..beeff70cb 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -919,10 +919,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common .Where(t => t.TrialEmailNoticeConfigId == entity.Id).Select(t => new { t.TrialEmailNoticeConfigId, t.EmailUserType, t.UserType }).ToList(); - if (_userInfo.RequestUrl == "TrialEmailNoticeConfig/getTrialEmailNoticeConfigList") - { - extraIdentification = "/Auto"; - } + await InsertInspection(entity, type, x => new InspectionConvertDTO() { @@ -1491,6 +1488,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common } #endregion + #region 中心调研 + + // 中心调研表 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteSurvey))) { @@ -1532,78 +1532,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common }); } + #endregion - // 既往手术史 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery))) - { - var type = GetEntityAuditOpt(item); - var entity = item.Entity as PreviousSurgery; - - await InsertInspection(entity, type, x => new InspectionConvertDTO() - { - IsDistinctionInterface = false, - - SubjectVisitId = x.SubjectVisitId, - - ObjectRelationParentId = x.SubjectVisitId, - - ObjectRelationParentId2 = x.ClinicalDataTrialSetId, - - }, new - { - Type = ClinicalFileType.PreviousSurgery - }); - } - - // 既往放疗史 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory))) - { - - var type = GetEntityAuditOpt(item); - - var entity = item.Entity as PreviousHistory; - - await InsertInspection(entity, type, x => new InspectionConvertDTO() - { - - - IsDistinctionInterface = false, - - SubjectVisitId = x.SubjectVisitId, - - ObjectRelationParentId2 = x.ClinicalDataTrialSetId, - - ObjectRelationParentId = x.SubjectVisitId, - }, new - { - Type = ClinicalFileType.PreviousHistory - }); - } - - // 其他治疗史 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther))) - { - var type = GetEntityAuditOpt(item); - - var entity = item.Entity as PreviousOther; - - await InsertInspection(entity, type, x => new InspectionConvertDTO() - { - - IsDistinctionInterface = false, - - SubjectVisitId = x.SubjectVisitId, - - ObjectRelationParentId2 = x.ClinicalDataTrialSetId, - - ObjectRelationParentId = x.SubjectVisitId, - }, new - { - Type = ClinicalFileType.PreviousOther - }); - } //系统 Qc 问题 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCQuestion))) @@ -1691,6 +1623,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common } + #region 项目参与人员 项目site + + // 项目中心 Site未稽查 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSite))) @@ -1760,6 +1695,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common }); } + #endregion // 受试者 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(Subject))) @@ -1902,6 +1838,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common ); } + #region Dicom 非Dicom 既往手术史..临床数据 + // Dicom foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomStudy))) { @@ -1952,6 +1890,78 @@ namespace IRaCIS.Core.Infra.EFCore.Common }); } + // 既往手术史 + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousSurgery))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as PreviousSurgery; + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + IsDistinctionInterface = false, + + SubjectVisitId = x.SubjectVisitId, + + ObjectRelationParentId = x.SubjectVisitId, + + ObjectRelationParentId2 = x.ClinicalDataTrialSetId, + + }, new + { + Type = ClinicalFileType.PreviousSurgery + }); + } + + // 既往放疗史 + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory))) + { + + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as PreviousHistory; + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + + + IsDistinctionInterface = false, + + SubjectVisitId = x.SubjectVisitId, + + ObjectRelationParentId2 = x.ClinicalDataTrialSetId, + + ObjectRelationParentId = x.SubjectVisitId, + }, new + { + Type = ClinicalFileType.PreviousHistory + }); + } + + // 其他治疗史 + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as PreviousOther; + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + + IsDistinctionInterface = false, + + SubjectVisitId = x.SubjectVisitId, + + ObjectRelationParentId2 = x.ClinicalDataTrialSetId, + + ObjectRelationParentId = x.SubjectVisitId, + }, new + { + Type = ClinicalFileType.PreviousOther + }); + } + + #endregion #region 阅片人入组