Compare commits
No commits in common. "5a1a710d5ae2d3850317fde307f7f828c26792ed" and "7693c72802bfba49dcc331a6fd56315bc814953c" have entirely different histories.
5a1a710d5a
...
7693c72802
|
|
@ -1920,14 +1920,11 @@ 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,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1979,11 +1976,9 @@ 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();
|
||||||
|
|
@ -1994,9 +1989,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
TrialId= trialid,
|
TrialId= trialid,
|
||||||
ObjectRelationParentId = x.VisitTaskId,
|
ObjectRelationParentId = x.VisitTaskId,
|
||||||
ExtraIndentification = extraIdentification
|
ExtraIndentification = extraIdentification
|
||||||
}, new
|
|
||||||
{
|
|
||||||
ArmEnum = armEnum,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue