IRC_NewDev
he 2024-06-05 17:13:13 +08:00
parent 907d0d39a1
commit 3f6ec5b7ea
2 changed files with 37 additions and 5 deletions

View File

@ -328,6 +328,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public CustomCalculateMark? CustomCalculateMark { get; set; }
/// <summary>
/// TrialId
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// IsDepend

View File

@ -76,6 +76,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
}
// 修改为删除
private List<Type> UpdateIsDelete
{
get
{
return new List<Type>()
{
typeof(TrialDocument)
};
}
}
public string GetEntityAuditOpt(EntityEntry entityEntry)
{
@ -83,6 +95,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
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 ||
(entityEntry.State == EntityState.Modified
@ -224,6 +245,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//项目流程确认
|| _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm"
//确认医学审核问题
|| _userInfo.RequestUrl == "ReadingMedicineQuestion/ConfirmReadingMedicineQuestion"
//阅片单元 保存阅片规则
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo"
@ -447,10 +471,14 @@ 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()
{
IsDistinctionInterface = false,
TrialId=x.TrialId,
TrialReadingCriterionId = entity.TrialCriterionId,
ObjectRelationParentId = x.TrialId,