diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4d3773668..d9e4c1fcf 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -4201,6 +4201,11 @@
病灶类型
+
+
+ 病灶类型
+
+
器官类型
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 3c1a16444..766167d69 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -174,13 +174,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
});
}
-
-
-
-
-
-
-
//质疑
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallenge)))
{
@@ -373,6 +366,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
});
}
+ #endregion
#region 已修改
@@ -385,9 +379,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
var entity = item.Entity as PreviousSurgery;
- //var subjectvisit = await _dbContext.SubjectVisit.Where(x => x.Id == entity.SubjectVisitId).FirstOrDefaultAsync();
- //subjectvisit = subjectvisit ?? new SubjectVisit();
-
await InsertInspection(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
@@ -396,29 +387,28 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId = x.SubjectVisitId,
+ ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
+
}, new
{
Type = ClinicalFileType.PreviousSurgery
- }) ;
+ });
}
// 既往放疗史
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousHistory)))
{
var entity = item.Entity as PreviousHistory;
- //var subjectvisit = await _dbContext.SubjectVisit.Where(x => x.Id == entity.SubjectVisitId).FirstOrDefaultAsync();
- //subjectvisit = subjectvisit ?? new SubjectVisit();
+
await InsertInspection(entity, type, x => new InspectionConvertDTO()
{
- //SiteId = subjectvisit.SiteId,
- //SubjectVisitName = subjectvisit.VisitName,
- //TrialId = subjectvisit.TrialId,
- //SubjectId = subjectvisit.SubjectId,
+
IsDistinctionInterface = false,
SubjectVisitId = x.SubjectVisitId,
+ ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
ObjectRelationParentId = x.SubjectVisitId,
}, new
@@ -431,20 +421,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther)))
{
var entity = item.Entity as PreviousOther;
- //var subjectvisit = await _dbContext.SubjectVisit.Where(x => x.Id == entity.SubjectVisitId).FirstOrDefaultAsync();
- //subjectvisit = subjectvisit ?? new SubjectVisit();
+
await InsertInspection(entity, type, x => new InspectionConvertDTO()
{
- //SiteId = subjectvisit.SiteId,
- //SubjectVisitName = subjectvisit.VisitName,
- //TrialId = subjectvisit.TrialId,
- //SubjectId = subjectvisit.SubjectId,
-
IsDistinctionInterface = false,
SubjectVisitId = x.SubjectVisitId,
+ ObjectRelationParentId2 = x.ClinicalDataTrialSetId,
+
ObjectRelationParentId = x.SubjectVisitId,
}, new
{
@@ -467,7 +453,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
IsDistinctionInterface = false
- }, new { ParentName = parentName }) ;
+ }, new { ParentName = parentName });
}
// 项目QC问题
@@ -482,7 +468,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId = x.TrialId,
IsDistinctionInterface = false
}, new
- {
+ {
ParentName = parentName
});
}
@@ -513,32 +499,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
});
}
- //系统 医学审核问题
- foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineSystemQuestion)))
- {
- var entity = item.Entity as ReadingMedicineSystemQuestion;
-
- await InsertInspection(entity, type, x => new InspectionConvertDTO()
- {
- IsDistinctionInterface = false,
- });
- }
-
- //项目医学审核问题
- foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineTrialQuestion)))
- {
- var entity = item.Entity as ReadingMedicineTrialQuestion;
-
- await InsertInspection(entity, type, x => new InspectionConvertDTO()
- {
- IsDistinctionInterface = false,
- ObjectRelationParentId = x.TrialId
-
- });
- }
-
-
-
// 项目文档
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialDocument)))
{
@@ -568,6 +528,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
+ //系统 医学审核问题
+ foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineSystemQuestion)))
+ {
+ var entity = item.Entity as ReadingMedicineSystemQuestion;
+
+ await InsertInspection(entity, type, x => new InspectionConvertDTO()
+ {
+ IsDistinctionInterface = false,
+ });
+ }
+
+ //项目医学审核问题
+ foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingMedicineTrialQuestion)))
+ {
+ var entity = item.Entity as ReadingMedicineTrialQuestion;
+
+ await InsertInspection(entity, type, x => new InspectionConvertDTO()
+ {
+ IsDistinctionInterface = false,
+ ObjectRelationParentId = x.TrialId
+
+ });
+ }
+
// 签名模板
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemBasicData)))
@@ -603,7 +587,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
- // 项目中心
+ // 项目中心 Site未稽查
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSite)))
{
var entity = item.Entity as TrialSite;
@@ -724,6 +708,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisit)))
{
var entity = item.Entity as SubjectVisit;
+
+
string reason = string.Empty;
if (_userInfo.RequestUrl.ToLower() == "qcoperation/setcheckpass")
@@ -844,7 +830,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new
{
- //子层级只需要记录自己这边的信息就好了
+ //子层级只需要记录自己这边的信息就好了 只有删除 和添加 没有更新(如果是删除，再添加，删除不会走稽查逻辑，业务代码已控制)
ReadingCategoryList = type == AuditOpt.Deleted ? null : list.Select(t => t.ReadingCategory).ToList(),
});
}
@@ -854,7 +840,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#region 阅片期临床数据
- //阅片期临床数据
//系统临床数据配置
@@ -869,7 +854,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
});
}
-
+
//项目临床数据配置
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataTrialSet)))
@@ -891,7 +876,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO()
{
- IsDistinctionInterface= type == AuditOpt.Update?true:false,
+ IsDistinctionInterface = type == AuditOpt.Update ? true : false,
SubjectVisitId = x.IsVisit ? x.ReadingId : null,
@@ -963,11 +948,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
- #endregion
-
-
-
-
#endregion
@@ -1092,6 +1072,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#endregion
+
+
+
+
}
///