IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -2539,35 +2539,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var extraIdentification = string.Empty;
 
-
+                Arm armEnum = Arm.SingleReadingArm;
-                Guid? subjectVisitId = null;
-
-                Arm? armEnum = Arm.SingleReadingArm;
                 if (entity.VisitTaskId != null)
                 {
                     extraIdentification = "/VisitTask";
-                    var obj = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => new { x.ArmEnum, x.SourceSubjectVisitId }).FirstOrDefaultAsync();
+                    armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync();
-                    armEnum = obj?.ArmEnum;
-                    subjectVisitId = obj.SourceSubjectVisitId;
                 }
-                else if (entity.ImageLabelNoneDicomStudyId != null)
-                {
-                    //默认R0
-                    extraIdentification = "/VisitTask";
 
-                    subjectVisitId = await _dbContext.NoneDicomStudy.Where(x => x.Id == entity.ImageLabelNoneDicomStudyId).Select(t => t.SubjectVisitId).FirstOrDefaultAsync();
+                //var noneDicomStudy = await _dbContext.NoneDicomStudy.FindAsync(entity.NoneDicomStudyId);
-                }
-                else
-                {
-                    subjectVisitId = (await _dbContext.NoneDicomStudy.FindAsync(entity.NoneDicomStudyId))?.SubjectVisitId;
-                }
 
                 await InsertInspection<NoneDicomStudyFile>(item.Entity as NoneDicomStudyFile, type, x => new InspectionConvertDTO()
                 {
-                    SubjectVisitId = subjectVisitId,
+                    //SubjectVisitId = noneDicomStudy.SubjectVisitId,
                     //SubjectId = noneDicomStudy.SubjectId,
-                    VisitTaskId= x.VisitTaskId,
+                    ObjectRelationParentId = x.VisitTaskId,
-                    ObjectRelationParentId = subjectVisitId,
                     ObjectRelationParentId2 = x.NoneDicomStudyId,
                     ObjectRelationParentId3 = x.OriginNoneDicomStudyId,
                     ExtraIndentification = extraIdentification