XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改入组稽查

Test.EIImageViewer
hang 2022-08-24 11:38:57 +08:00
parent 5fd1737ffc
commit d86e2aac70
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,9 +697,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as Enroll; var entity = item.Entity as Enroll;
var doctor = await _dbContext.Doctor.FirstOrDefaultAsync(x => x.Id == entity.DoctorId); var doctor = await _dbContext.Doctor.FirstOrDefaultAsync(x => x.Id == entity.DoctorId);
var readingCategoryList = await _dbContext.EnrollReadingCategory.Where(x => x.EnrollId == entity.Id).Select(t=>t.ReadingCategory).ToListAsync();
await InsertInspection<Enroll>(item.Entity as Enroll, type, x => new InspectionConvertDTO() await InsertInspection<Enroll>(item.Entity as Enroll, type, x => new InspectionConvertDTO()
{ {
GeneralId = x.Id, ObjectRelationParentId = x.TrialId
}, new }, new
{ {
//父层级的数据 暂时没有记录稽查 所以这里必须查 //父层级的数据 暂时没有记录稽查 所以这里必须查
@ -708,11 +709,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
Email = doctor.EMail, Email = doctor.EMail,
IsUploadedACKSOW = entity.AttachmentId != Guid.Empty IsUploadedACKSOW = entity.AttachmentId != Guid.Empty,
ReadingCategoryList=readingCategoryList
}); });
} }
//独立阅片人 状态修改 上传SoW //独立阅片人 状态修改 上传SoW 子对象稽查记录到父对象 要求 记录的数据一致
if (entitys.Any(x => x.Entity.GetType() == typeof(EnrollReadingCategory))) if (entitys.Any(x => x.Entity.GetType() == typeof(EnrollReadingCategory)))
{ {
@ -723,6 +725,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<Enroll>(enroll, type, x => new InspectionConvertDTO() await InsertInspection<Enroll>(enroll, type, x => new InspectionConvertDTO()
{ {
GeneralId = enroll.Id, GeneralId = enroll.Id,
ObjectRelationParentId = x.TrialId
}, new }, new
{ {
//父层级的数据 暂时没有记录稽查 所以这里必须查 //父层级的数据 暂时没有记录稽查 所以这里必须查
@ -1077,7 +1080,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
inspection.IsSign = true; inspection.IsSign = true;
} }
var entityName= entityObj.GetType().Name; var entityName = entityObj.GetType().Name;
inspection.JsonDetail = new InspectionJsonDetail inspection.JsonDetail = new InspectionJsonDetail
{ {
@ -1091,7 +1094,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//Data 仅仅记录稽查实体的信息 CommonData 存放关联数据的信息(特殊情况下会单独赋值) //Data 仅仅记录稽查实体的信息 CommonData 存放关联数据的信息(特殊情况下会单独赋值)
//后期通过关联 就不需要把 OtherItem 并入到Data中 //后期通过关联 就不需要把 OtherItem 并入到Data中
Data = AddJsonItem(entityObj, otherItem) , Data = AddJsonItem(entityObj, otherItem),
//准确来讲 此处称之为 RelationData 更贴合 //准确来讲 此处称之为 RelationData 更贴合
CommonData = AddJsonItem(generalData, otherItem) CommonData = AddJsonItem(generalData, otherItem)