diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 326b59a51..5d94651f3 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -112,7 +112,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common return string.Empty; } - + if (answerType == "upload") @@ -144,7 +144,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common transList.Add(item + string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty()); } - + } return string.Join(",", transList); @@ -1979,7 +1979,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(entity, type, x => new InspectionConvertDTO() { SubjectId = x.Id, - Reason= entity.SuspendReason, + Reason = entity.SuspendReason, TrialSiteId = x.TrialSiteId, //项目的信息 找离的最近的项目稽查信息 @@ -2447,6 +2447,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common Reason = reason, ExtraIndentification = extraIdentification, + SubjectVisitId = entity.SourceSubjectVisitId, + ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId, ObjectRelationParentId2 = entity.DoctorUserId, @@ -2477,7 +2479,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common break; case "Study/amendmentPatientInfo": - reason=entity.Reason; + reason = entity.Reason; break; } @@ -2578,7 +2580,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common if (entity.VisitTaskId != null) { extraIdentification = "/VisitTask"; - var obj = await _dbContext.VisitTask.FindAsync( entity.VisitTaskId); + var obj = await _dbContext.VisitTask.FindAsync(entity.VisitTaskId); armEnum = obj?.ArmEnum; subjectVisitId = obj.SourceSubjectVisitId; } @@ -2598,7 +2600,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { SubjectVisitId = subjectVisitId, //SubjectId = noneDicomStudy.SubjectId, - VisitTaskId= x.VisitTaskId, + VisitTaskId = x.VisitTaskId, ObjectRelationParentId = subjectVisitId, ObjectRelationParentId2 = x.NoneDicomStudyId, ObjectRelationParentId3 = x.OriginNoneDicomStudyId, @@ -2821,7 +2823,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common SubjectVisitId = x.IsVisit ? x.ReadingId : null, ObjectRelationParentId = entity.ClinicalDataTrialSetId, - AuditIdentification= extraIndentification, + AuditIdentification = extraIndentification, //ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null }, @@ -3655,7 +3657,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(entity, type, x => new InspectionConvertDTO() { - SubjectId= segmentation != null ? segmentation.SubjectId : null, + SubjectId = segmentation != null ? segmentation.SubjectId : null, SubjectVisitId = segmentation != null ? segmentation.SubjectVisitId : null, TrialReadingCriterionId = visitTask != null ? visitTask.TrialReadingCriterionId : null, }); @@ -3705,7 +3707,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common } else { - var questionAnswer= entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer) + var questionAnswer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer) .Where(x => x.VisitTaskId == entity.VisitTaskId && x.ReadingQuestionTrialId == entity.QuestionId).FirstOrDefault(); if (questionAnswer != null) @@ -3734,9 +3736,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common - var segmentation = await _dbContext.Segmentation.Where(x => x.Id == entity.SegmentationId).Include(x=>x.VisitTask).FirstOrDefaultAsync()?? new Segmentation() { }; + var segmentation = await _dbContext.Segmentation.Where(x => x.Id == entity.SegmentationId).Include(x => x.VisitTask).FirstOrDefaultAsync() ?? new Segmentation() { }; - var segment= await _dbContext.Segment.Where(x => x.Id == entity.SegmentId).FirstOrDefaultAsync()?? new Segment() { }; + var segment = await _dbContext.Segment.Where(x => x.Id == entity.SegmentId).FirstOrDefaultAsync() ?? new Segment() { }; var tableQuestionName = await _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync(); var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync(); @@ -3745,15 +3747,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common Guid? trialReadingCriterionId = null; if (segmentation.VisitTask != null) { - trialReadingCriterionId= segmentation.VisitTask.TrialReadingCriterionId; + trialReadingCriterionId = segmentation.VisitTask.TrialReadingCriterionId; } await InsertInspection(entity, type, x => new InspectionConvertDTO() { - TrialReadingCriterionId= trialReadingCriterionId, - },new + TrialReadingCriterionId = trialReadingCriterionId, + }, new { segmentation.SegmentationName, segmentation.SEGUrl, @@ -3783,11 +3785,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(entity, type, x => new InspectionConvertDTO() { - SelfDefineIdentification= selfDefineIdentification + type + SelfDefineIdentification = selfDefineIdentification + type }, new { - + }); } @@ -3799,9 +3801,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common var selfDefineIdentification = string.Empty; var answer = string.Empty; - Guid? questionId=Guid.Empty; + Guid? questionId = Guid.Empty; string tableQuestionName = string.Empty; - var rowMark= string.Empty; + var rowMark = string.Empty; if (entity.TableQuestionId == null) { switch (type) @@ -3835,15 +3837,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common break; } questionId = entity.QuestionId; - tableQuestionName= _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault(); + tableQuestionName = _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault(); answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer).Select(x => x.Answer).FirstOrDefault(); - rowMark= _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefault(); + rowMark = _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefault(); } - var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x => x.Entity as ReadingNoneDicomMark).FirstOrDefault(); + var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x => x.Entity as ReadingNoneDicomMark).FirstOrDefault(); if (mark == null) { mark = await _dbContext.ReadingNoneDicomMark.Where(x => x.Id == entity.NoneDicomMarkId).FirstOrDefaultAsync(); @@ -3852,7 +3854,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common var QuestionName = string.Empty; if (answer != null) { - QuestionName= _dbContext.ReadingQuestionTrial.Where(x => x.Id == questionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault(); + QuestionName = _dbContext.ReadingQuestionTrial.Where(x => x.Id == questionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault(); } await InsertInspection(entity, type, x => new InspectionConvertDTO() @@ -3861,12 +3863,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common }, new { - RowMark= rowMark, + RowMark = rowMark, TableQuestionName = tableQuestionName, - MarkName = mark==null|| type== "Deleted" ? string.Empty: mark.OrderMarkName, - PicturePath= mark == null ? string.Empty : mark.PicturePath, + MarkName = mark == null || type == "Deleted" ? string.Empty : mark.OrderMarkName, + PicturePath = mark == null ? string.Empty : mark.PicturePath, QuestionName = QuestionName, - QuestinonAnswer= answer + QuestinonAnswer = answer }); } @@ -4152,7 +4154,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //if (_userInfo.RequestUrl == " ReadingImageTask/splitLesion") var originalRowMark = string.Empty; - var mergeRowMark = string.Empty; + var mergeRowMark = string.Empty; if (entity.SplitRowId != null) { @@ -4203,7 +4205,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common }, new { OriginalRowMark = originalRowMark, - MergeRowMark= mergeRowMark, + MergeRowMark = mergeRowMark, //TableName = tableName, QuestionAnswerList = @@ -4481,7 +4483,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //var generalData = await GetInspectionGeneralDataAsync(inspection); var generalData = await GetInspectionGeneralGuidAsync(inspection); - + //不可少 因为稽查实体可能某些Id没有 MapEntityPropertyToAuditEntity(generalData, inspection); @@ -4546,7 +4548,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common inspection.EntityName = entityName; inspection.RealUrlAndEntity = _userInfo.RequestUrl + "/" + entityName + "/" + type; - inspection.Reason=inspection.Reason==string.Empty&&reason!=string.Empty?reason:inspection.Reason; + inspection.Reason = inspection.Reason == string.Empty && reason != string.Empty ? reason : inspection.Reason; await _dbContext.DataInspection.AddAsync(inspection);