修改稽查

Uat_Study
hang 2022-05-24 17:30:49 +08:00
parent 8c8e6da3a2
commit 87e1e1d09f
1 changed files with 11 additions and 9 deletions

View File

@ -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
/// <param name="entityData">实体对象</param>
/// <param name="entityTypeName">实体名称</param>
/// <returns></returns>
public async Task InsertInspection<T>(EntityEntry data, string type, Expression<Func<T, DataInspection>> expression = null, object otherItem = null, T entityData = null, string? entityTypeName = null) where T : class
public async Task InsertInspection<T>(EntityEntry data, string type, Expression<Func<T, DataInspection>> 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 注释