Compare commits
No commits in common. "fb76c5af6cfdd587812873282dabd6da6fc9f833" and "c95ea8c5472ad63d8deae0a2de1a0726505f3de9" have entirely different histories.
fb76c5af6c
...
c95ea8c547
|
@ -328,10 +328,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public CustomCalculateMark? CustomCalculateMark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// TrialId
|
||||
/// </summary>
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// IsDepend
|
||||
|
|
|
@ -76,36 +76,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
}
|
||||
}
|
||||
|
||||
// 修改为删除
|
||||
private List<Type> UpdateIsDelete
|
||||
{
|
||||
get
|
||||
{
|
||||
return new List<Type>()
|
||||
{
|
||||
typeof(TrialDocument)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public string GetEntityAuditOpt(EntityEntry entityEntry)
|
||||
public string GetEntityAuditOpt(EntityEntry entityEntry)
|
||||
{
|
||||
if (entityEntry.State == EntityState.Added)
|
||||
{
|
||||
return AuditOpt.Add;
|
||||
}
|
||||
else if (
|
||||
UpdateIsDelete.Contains(entityEntry.Entity.GetType())
|
||||
&& entityEntry.State == EntityState.Modified
|
||||
&& (bool)entityEntry.Entity.GetType().GetProperty(nameof(ISoftDelete.IsDeleted)).GetValue(entityEntry.Entity)
|
||||
|
||||
)
|
||||
{
|
||||
return AuditOpt.Deleted;
|
||||
}
|
||||
|
||||
else if (entityEntry.State == EntityState.Deleted ||
|
||||
else if (entityEntry.State == EntityState.Deleted ||
|
||||
(entityEntry.State == EntityState.Modified
|
||||
&& typeof(ISoftDelete).IsAssignableFrom(entityEntry.Entity.GetType())
|
||||
&& (bool)entityEntry.Entity.GetType().GetProperty(nameof(ISoftDelete.IsDeleted)).GetValue(entityEntry.Entity)
|
||||
|
@ -245,11 +224,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
//项目流程确认
|
||||
|| _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm"
|
||||
|
||||
//确认医学审核问题
|
||||
|| _userInfo.RequestUrl == "ReadingMedicineQuestion/ConfirmReadingMedicineQuestion"
|
||||
|
||||
//阅片单元 保存阅片规则
|
||||
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo"
|
||||
//阅片单元 保存阅片规则
|
||||
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo"
|
||||
|
||||
|| _userInfo.RequestUrl == "configTrialBasicInfo/TrialReadingInfoSign")
|
||||
{
|
||||
|
@ -471,14 +447,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
dependQuestionShowOrder = await _dbContext.ReadingQuestionSystem.Where(t => t.Id == entity.DependParentId).Select(t => t.ShowOrder).FirstOrDefaultAsync();
|
||||
}
|
||||
|
||||
|
||||
|
||||
await InsertInspection<ReadingTableQuestionTrial>(entity, type, x => new InspectionConvertDTO()
|
||||
await InsertInspection<ReadingTableQuestionTrial>(entity, type, x => new InspectionConvertDTO()
|
||||
{
|
||||
IsDistinctionInterface = false,
|
||||
|
||||
TrialId=x.TrialId,
|
||||
|
||||
TrialReadingCriterionId = entity.TrialCriterionId,
|
||||
|
||||
ObjectRelationParentId = x.TrialId,
|
||||
|
|
Loading…
Reference in New Issue