XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-29 10:38:42 +08:00
parent 11fa028cd4 5a1a710d5a
commit cb6271daef
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -1920,11 +1920,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TaskStudy))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TaskStudy)))
{ {
var entity = item.Entity as TaskStudy;
var type = GetEntityAuditOpt(item); var type = GetEntityAuditOpt(item);
var armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync();
await InsertInspection<TaskStudy>(item.Entity as TaskStudy, type, x => new InspectionConvertDTO() await InsertInspection<TaskStudy>(item.Entity as TaskStudy, type, x => new InspectionConvertDTO()
{ {
ObjectRelationParentId = x.VisitTaskId ObjectRelationParentId = x.VisitTaskId,
},new {
ArmEnum= armEnum,
}); });
} }
@ -1976,9 +1979,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var extraIdentification = string.Empty; var extraIdentification = string.Empty;
Arm armEnum = Arm.SingleReadingArm;
if (entity.VisitTaskId!=null) if (entity.VisitTaskId!=null)
{ {
extraIdentification = "/VisitTask"; extraIdentification = "/VisitTask";
armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync();
} }
var trialid = await _dbContext.NoneDicomStudy.Where(x => x.Id == entity.NoneDicomStudyId).Select(x => x.TrialId).FirstOrDefaultAsync(); var trialid = await _dbContext.NoneDicomStudy.Where(x => x.Id == entity.NoneDicomStudyId).Select(x => x.TrialId).FirstOrDefaultAsync();
@ -1989,6 +1994,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TrialId= trialid, TrialId= trialid,
ObjectRelationParentId = x.VisitTaskId, ObjectRelationParentId = x.VisitTaskId,
ExtraIndentification = extraIdentification ExtraIndentification = extraIdentification
}, new
{
ArmEnum = armEnum,
}); });
} }