XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

IRC_NewDev
he 2024-06-05 17:13:13 +08:00
parent 907d0d39a1
commit 3f6ec5b7ea
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

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

38
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -76,15 +76,36 @@ 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) if (entityEntry.State == EntityState.Added)
{ {
return AuditOpt.Add; 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)
else if (entityEntry.State == EntityState.Deleted || )
{
return AuditOpt.Deleted;
}
else if (entityEntry.State == EntityState.Deleted ||
(entityEntry.State == EntityState.Modified (entityEntry.State == EntityState.Modified
&& typeof(ISoftDelete).IsAssignableFrom(entityEntry.Entity.GetType()) && typeof(ISoftDelete).IsAssignableFrom(entityEntry.Entity.GetType())
&& (bool)entityEntry.Entity.GetType().GetProperty(nameof(ISoftDelete.IsDeleted)).GetValue(entityEntry.Entity) && (bool)entityEntry.Entity.GetType().GetProperty(nameof(ISoftDelete.IsDeleted)).GetValue(entityEntry.Entity)
@ -224,8 +245,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//项目流程确认 //项目流程确认
|| _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm" || _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm"
//阅片单元 保存阅片规则 //确认医学审核问题
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo" || _userInfo.RequestUrl == "ReadingMedicineQuestion/ConfirmReadingMedicineQuestion"
//阅片单元 保存阅片规则
|| _userInfo.RequestUrl == "TrialConfig/setCriterionReadingInfo"
|| _userInfo.RequestUrl == "configTrialBasicInfo/TrialReadingInfoSign") || _userInfo.RequestUrl == "configTrialBasicInfo/TrialReadingInfoSign")
{ {
@ -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(); 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, IsDistinctionInterface = false,
TrialId=x.TrialId,
TrialReadingCriterionId = entity.TrialCriterionId, TrialReadingCriterionId = entity.TrialCriterionId,
ObjectRelationParentId = x.TrialId, ObjectRelationParentId = x.TrialId,