diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index dc8ad640..c7b472d5 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -259,51 +259,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
-            // 非Dicom
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy)))
-            {
-                var entity = item.Entity as NoneDicomStudy;
 
 
 
-                await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, null);
-
-                //var fileCount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync();
-
-
-                //await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, null, new
-                //{
-                //    FileCount = fileCount,
-                //});
-            }
-
-            //// 非Dicom文件
-            //if (entitys.Any(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)))
-            //{
-            //    var noneDicomStudyfile = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).Select(x => x.Entity).FirstOrDefault() as NoneDicomStudyFile;
-            //    var noneDicomStudy = await _dbContext.NoneDicomStudy.Where(x => x.Id == noneDicomStudyfile.NoneDicomStudyId).FirstOrDefaultAsync();
-            //    if (noneDicomStudy != null)
-            //    {
-            //        var filecount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == noneDicomStudyfile.NoneDicomStudyId).CountAsync();
-            //        var count = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).ToList().Count;
-            //        if (type == "Deleted")
-            //        {
-            //            filecount = filecount - count;
-            //        }
-            //        else
-            //        {
-            //            filecount = filecount + count;
-            //        }
-
-            //        await InsertInspection<NoneDicomStudy>(noneDicomStudy, type, null, new
-            //        {
-            //            FileCount = filecount,
-            //        });
-
-            //    }
-            //}
-
-
 
 
             // 既往手术史
@@ -734,6 +692,53 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 });
             }
 
+            // 非Dicom
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy)))
+            {
+                var entity = item.Entity as NoneDicomStudy;
+
+
+                await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, x => new InspectionConvertDTO()
+                {
+                     ObjectRelationParentId=x.SubjectVisitId,
+
+                });
+
+                //var fileCount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync();
+
+
+                //await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, null, new
+                //{
+                //    FileCount = fileCount,
+                //});
+            }
+
+            //// 非Dicom文件
+            //if (entitys.Any(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)))
+            //{
+            //    var noneDicomStudyfile = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).Select(x => x.Entity).FirstOrDefault() as NoneDicomStudyFile;
+            //    var noneDicomStudy = await _dbContext.NoneDicomStudy.Where(x => x.Id == noneDicomStudyfile.NoneDicomStudyId).FirstOrDefaultAsync();
+            //    if (noneDicomStudy != null)
+            //    {
+            //        var filecount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == noneDicomStudyfile.NoneDicomStudyId).CountAsync();
+            //        var count = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).ToList().Count;
+            //        if (type == "Deleted")
+            //        {
+            //            filecount = filecount - count;
+            //        }
+            //        else
+            //        {
+            //            filecount = filecount + count;
+            //        }
+
+            //        await InsertInspection<NoneDicomStudy>(noneDicomStudy, type, null, new
+            //        {
+            //            FileCount = filecount,
+            //        });
+
+            //    }
+            //}
+
             #region 阅片人入组
 
 
@@ -1172,13 +1177,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 if (generalData.TrialId == null || generalData.SiteId == null || generalData.SubjectId == null)
                 {
-                    var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectId = x.SubjectId, x.Subject.SiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId }).FirstOrDefaultAsync();
+                    var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new {  SubjectCode=x.Subject.Code,TrialSiteCode=x.Subject.TrialSite.TrialSiteCode, SubjectId = x.SubjectId, x.Subject.SiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId }).FirstOrDefaultAsync();
 
 
                     generalData.TrialId = info?.TrialId ?? generalData.TrialId;
                     generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId;
                     generalData.SiteId = info?.SiteId ?? generalData.SiteId;
                     generalData.SubjectVisitId = info?.SourceSubjectVisitId != null ? info?.SourceSubjectVisitId : (info?.ReadModuleSubjectVisitId != null ? info?.ReadModuleSubjectVisitId : null);
+
+                    //以后移除
+                    generalData.SiteCode = info.TrialSiteCode;
+                    generalData.SubjectCode = info.SubjectCode;
                 }
 
             }
@@ -1190,12 +1199,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 if (generalData.TrialId == null || generalData.SiteId == null || generalData.SubjectId == null)
                 {
                     var info = await _dbContext.SubjectVisit.Where(x => x.Id == generalData.SubjectVisitId).Select(x =>
-                  new { x.SubjectId, x.SiteId, x.TrialId }).FirstOrDefaultAsync();
+                  new { x.SubjectId, x.SiteId, x.TrialId  ,SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode }).FirstOrDefaultAsync();
 
 
                     generalData.TrialId = info?.TrialId ?? generalData.TrialId;
                     generalData.SiteId = info?.SiteId ?? generalData.SiteId;
                     generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId;
+
+
+                    //以后移除
+                    generalData.SiteCode = info.TrialSiteCode;
+                    generalData.SubjectCode = info.SubjectCode;
                 }
 
 
@@ -1206,10 +1220,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             {
                 if (generalData.TrialId == null || generalData.SiteId == null)
                 {
-                    var info = await _dbContext.Subject.Where(x => x.Id == generalData.SubjectId).Select(x => new { SubjectId = x.Id, x.SiteId, x.TrialId }).FirstOrDefaultAsync();
+                    var info = await _dbContext.Subject.Where(x => x.Id == generalData.SubjectId).Select(x => new { SubjectId = x.Id, x.SiteId, x.TrialId, SubjectCode = x.Code, TrialSiteCode = x.TrialSite.TrialSiteCode }).FirstOrDefaultAsync();
 
                     generalData.TrialId = info?.TrialId ?? generalData.TrialId;
                     generalData.SiteId = info?.SiteId ?? generalData.SiteId;
+
+                    //以后移除
+                    generalData.SiteCode = info.TrialSiteCode;
+                    generalData.SubjectCode = info.SubjectCode;
                 }