diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index d767e1375..ecb34cf08 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1439,6 +1439,12 @@ + + + 获取第一次转变访视任务Id + + + @@ -7432,9 +7438,9 @@ 满足RECISTPD - + - 本次访视SOD增加不小于5mm + 本次访视SOD与触发iRECIST访视相比本次访视SOD增加不小于5mm diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index ce4efccb5..84dadffff 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -951,14 +951,57 @@ namespace IRaCIS.Core.Infra.EFCore.Common #region 热键 模板 个性化配置 + if (entitys.Any(x => x.Entity.GetType() == typeof(ShortcutKey))) + { + var type = AuditOpt.Add; + var list = entitys.Where(x => x.Entity.GetType() == typeof(ShortcutKey)).Select(t => t.Entity as ShortcutKey); - #endregion + + var firstEntity = list.FirstOrDefault(); + + var cloneEntity = firstEntity.Clone(); + + //保证Id 唯一 + cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.UserId.ToString(), firstEntity.CreateUserId.ToString()); + + await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() + { + + //byzhouhang + ObjectRelationParentId = x.UserId, + + IsDistinctionInterface = false, + }, new + { + ShortcutKeyList = list, + }); + } + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserWLTemplate))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as UserWLTemplate; + + var extraIdentification = string.Empty; + + + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + IsDistinctionInterface = false, + + ObjectRelationParentId = entity.UserId + }); + } + + + #endregion #region 附加评估 // 是否参与附加评估记录表 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation))) + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectCriteriaEvaluation))) { var type = GetEntityAuditOpt(item); @@ -2166,9 +2209,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as User; + var extraIdentification = string.Empty; + + //保存其他个性化配置 + if (_userInfo.RequestUrl == "UserWLTemplate/setAutoCutNextTask") + { + extraIdentification = "/Personalization"; + } + await InsertInspection(entity, type, x => new InspectionConvertDTO() { - IsDistinctionInterface = false + IsDistinctionInterface = false, + ExtraIndentification= extraIdentification }, new { UserRealName = entity.FullName,