diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 33cbda861..56df4f4dc 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -156,7 +156,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var extraIdentification = string.Empty; - if(_dbContext.Entry(entity).Property(t=>t.IsMustGlobalReading).IsModified == true) + if (_dbContext.Entry(entity).Property(t => t.IsMustGlobalReading).IsModified == true) { extraIdentification = $"/IsGlobalReading"; } @@ -169,7 +169,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(entity, type, x => new InspectionConvertDTO() { IsDistinctionInterface = /*type == AuditOpt.Update ? true :*/ false, - ExtraIndentification= extraIdentification + ExtraIndentification = extraIdentification }); } @@ -428,33 +428,44 @@ namespace IRaCIS.Core.Infra.EFCore.Common //if (_userInfo.RequestUrl == "ReadingQuestion/setCriterionDictionary") //{ - var type = AuditOpt.Add; + var type = AuditOpt.Add; - var list = entitys.Where(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary)).Select(t => t.Entity as ReadingCriterionDictionary).ToList(); + var list = entitys.Where(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary)).Select(t => t.Entity as ReadingCriterionDictionary).ToList(); - var firstEntity = list.First(); + var firstEntity = list.First(); - var cloneEntity = firstEntity.Clone(); + var cloneEntity = firstEntity.Clone(); - //查询出字典的Value ValueCN Des 保存 - var dicIdList = list.Select(t => t.DictionaryId).ToList(); - var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, t.Value, t.ValueCN, t.Description, t.ShowOrder }).ToListAsync(); + //查询出字典的Value ValueCN Des 保存 + var dicIdList = list.Select(t => t.DictionaryId).ToList(); + var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, t.Value, t.ValueCN, t.Description, t.ShowOrder }).ToListAsync(); - //保证Id 唯一 - cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.CriterionId.ToString(), firstEntity.ParentCode.ToString()); + //保证Id 唯一 + cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.CriterionId.ToString(), firstEntity.ParentCode.ToString()); - await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() - { - ObjectRelationParentId = x.CriterionId, + var extraIdentification = string.Empty; - TrialReadingCriterionId = x.IsSystemCriterion == false ? x.CriterionId : null, + //系统标准 + if (cloneEntity.IsSystemCriterion) + { + extraIdentification = $"/{cloneEntity.ParentCode}"; + } - //不显示区分接口 通过是否是系统字典 以及字典Code 区分 - IsDistinctionInterface=false - }, + await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() + { + + ObjectRelationParentId = x.CriterionId, + + TrialReadingCriterionId = x.IsSystemCriterion == false ? x.CriterionId : null, + + //不显示区分接口 通过是否是系统字典 以及字典Code 区分 + IsDistinctionInterface = false, + ExtraIndentification=extraIdentification + + }, new { SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) => @@ -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(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 }); } @@ -575,7 +598,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //byzhouhang ObjectRelationParentId = x.TaskMedicalReviewId, - IsDistinctionInterface=false, + IsDistinctionInterface = false, }, new { QuestionAnswerList = list.Join(questionNameList, t => t.ReadingMedicineQuestionId, u => u.ReadingMedicineQuestionId, (t, u) => new { t.Answer, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList(), @@ -593,7 +616,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(entity, type, x => new InspectionConvertDTO() { - IsDistinctionInterface=false, + IsDistinctionInterface = false, VisitTaskId = entity.VisitTaskId, ObjectRelationParentId = entity.TaskMedicalReviewId, @@ -2056,7 +2079,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id; inspection.GeneralId = generalId; - inspection.Identification = await GetInspectionRecordIdentificationAsync(inspection, entityObj, type, inspection.IsDistinctionInterface)+inspection.ExtraIndentification; + inspection.Identification = await GetInspectionRecordIdentificationAsync(inspection, entityObj, type, inspection.IsDistinctionInterface) + inspection.ExtraIndentification; //将实体对象属性 映射到稽查实体 MapEntityPropertyToAuditEntity(entityObj, inspection); @@ -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; }