医学审核失效
parent
c8d1e2fb6b
commit
be54e8c2c4
|
@ -444,6 +444,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
//保证Id 唯一
|
||||
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.CriterionId.ToString(), firstEntity.ParentCode.ToString());
|
||||
|
||||
|
||||
var extraIdentification = string.Empty;
|
||||
|
||||
//系统标准
|
||||
if (cloneEntity.IsSystemCriterion)
|
||||
{
|
||||
extraIdentification = $"/{cloneEntity.ParentCode}";
|
||||
}
|
||||
|
||||
|
||||
await InsertInspection<ReadingCriterionDictionary>(cloneEntity, type, x => new InspectionConvertDTO()
|
||||
{
|
||||
|
||||
|
@ -452,7 +462,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
TrialReadingCriterionId = x.IsSystemCriterion == false ? x.CriterionId : null,
|
||||
|
||||
//不显示区分接口 通过是否是系统字典 以及字典Code 区分
|
||||
IsDistinctionInterface=false
|
||||
IsDistinctionInterface = false,
|
||||
ExtraIndentification=extraIdentification
|
||||
|
||||
},
|
||||
new
|
||||
|
@ -539,13 +550,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
|
||||
var entity = item.Entity as TaskMedicalReview;
|
||||
|
||||
var extraIdentification = string.Empty;
|
||||
|
||||
//失效的时候 不区分标识
|
||||
if (_dbContext.Entry(entity).Property(t => t.IsInvalid).IsModified == true && entity.IsInvalid==true)
|
||||
{
|
||||
extraIdentification = $"/Invalid";
|
||||
}
|
||||
|
||||
await InsertInspection<TaskMedicalReview>(entity, type, x => new InspectionConvertDTO()
|
||||
{
|
||||
VisitTaskId = entity.VisitTaskId,
|
||||
|
||||
ObjectRelationParentId = entity.VisitTaskId,
|
||||
|
||||
ObjectRelationParentId2 = entity.MedicalManagerUserId
|
||||
ObjectRelationParentId2 = entity.MedicalManagerUserId,
|
||||
|
||||
ExtraIndentification = extraIdentification,
|
||||
|
||||
IsDistinctionInterface= (type==AuditOpt.Add || extraIdentification !=String.Empty)?false:true
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -2550,17 +2573,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
|
||||
break;
|
||||
|
||||
//系统 项目公用
|
||||
case nameof(ReadingCriterionDictionary):
|
||||
////系统 项目公用
|
||||
//case nameof(ReadingCriterionDictionary):
|
||||
|
||||
var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
|
||||
// var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
|
||||
|
||||
if (readingCriterionDictionary.IsSystemCriterion)
|
||||
{
|
||||
type = $"{type}/{readingCriterionDictionary.ParentCode}";
|
||||
}
|
||||
// if (readingCriterionDictionary.IsSystemCriterion)
|
||||
// {
|
||||
// type = $"{type}/{readingCriterionDictionary.ParentCode}";
|
||||
// }
|
||||
|
||||
break;
|
||||
// break;
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue