From 4d1e3beda6c4119ccfff6659d9033a1c0c93bdfe Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 28 Nov 2025 16:45:47 +0800 Subject: [PATCH] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8-30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 7593252ba..ad38c1c09 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2539,25 +2539,35 @@ 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"; - armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync(); + var obj = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => new { x.ArmEnum, x.SourceSubjectVisitId }).FirstOrDefaultAsync(); + armEnum = obj?.ArmEnum; + subjectVisitId = obj.SourceSubjectVisitId; } else if (entity.ImageLabelNoneDicomStudyId != null) { //默认R0 extraIdentification = "/VisitTask"; - } - //var noneDicomStudy = await _dbContext.NoneDicomStudy.FindAsync(entity.NoneDicomStudyId); + subjectVisitId = await _dbContext.NoneDicomStudy.Where(x => x.Id == entity.ImageLabelNoneDicomStudyId).Select(t => t.SubjectVisitId).FirstOrDefaultAsync(); + } + else + { + subjectVisitId = (await _dbContext.NoneDicomStudy.FindAsync(entity.NoneDicomStudyId))?.SubjectVisitId; + } await InsertInspection(item.Entity as NoneDicomStudyFile, type, x => new InspectionConvertDTO() { - //SubjectVisitId = noneDicomStudy.SubjectVisitId, + SubjectVisitId = subjectVisitId, //SubjectId = noneDicomStudy.SubjectId, - ObjectRelationParentId = x.VisitTaskId, + VisitTaskId= x.VisitTaskId, + ObjectRelationParentId = subjectVisitId, ObjectRelationParentId2 = x.NoneDicomStudyId, ObjectRelationParentId3 = x.OriginNoneDicomStudyId, ExtraIndentification = extraIdentification