diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index c1e5dcb1d..ff21905c1 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -244,7 +244,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common Name = systemDocument.Name, CreateTime = systemDocument.CreateTime, IsSigned = "是",// 是否签署 添加了就是签署了 - }, null, "UserSigned"); + }, null); } // 项目文件签署 @@ -264,7 +264,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common Name = trialDocument.Name, CreateTime = trialDocument.CreateTime, IsSigned = "是",// 是否签署 添加了就是签署了 - }, null, "UserSigned"); + }, null); } // 医生 @@ -875,7 +875,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common /// 实体对象 /// 实体名称 /// - public async Task InsertInspection(EntityEntry data, string type, Expression> expression = null, object otherItem = null, T entityData = null, string? entityTypeName = null) where T : class + public async Task InsertInspection(EntityEntry data, string type, Expression> expression = null, object otherItem = null, T entityData = null) where T : class { object entityobj = entityData == null ? data.Entity : entityData; DataInspection inspection = new DataInspection(); @@ -885,14 +885,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = entityobj as T; inspection = f(entity); } - if (entityTypeName == null) + + var entityTypeName = entityobj.GetType().Name; + + //文档签署这块,不区分系统和项目的 需要处理为同一个标识 + if (typeof(T) == typeof(TrialDocUserTypeConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser)) { - entityTypeName = entityobj.GetType().Name; - } - else - { - entityTypeName = "New/" + entityTypeName; + entityTypeName = "New/" + "UserSigned"; } + + inspection.Identification = $"{_userInfo.RequestUrl}/{ entityTypeName}/{type}"; #region 注释