diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 68c615cb9..285332b0b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1089,9 +1089,7 @@ namespace IRaCIS.Application.Services .WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify) .Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).ProjectTo(_mapper.ConfigurationProvider, new { - isEn_Us = _userInfo.IsEn_Us - }).OrderBy(x => x.ShowOrder).ToListAsync(); var taskInfo = new VisitTaskDto(); if (inDto.TaskId != null) diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index dfa292f60..852a75965 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.GroupName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionName)) .ForMember(d => d.GroupEnName, opt => opt.MapFrom(src => src.GroupQuestin.QuestionEnName)); + CreateMap(); CreateMap(); @@ -39,6 +40,7 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.SystemClinicalQuestionId, opt => opt.MapFrom(src => src.Id)); CreateMap() @@ -47,6 +49,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.SystemTableQuestionId, u => u.MapFrom(s => s.Id)); CreateMap() @@ -57,6 +60,7 @@ namespace IRaCIS.Core.Application.Service // 预览 CreateMap(); + CreateMap(); CreateMap(); @@ -64,20 +68,23 @@ namespace IRaCIS.Core.Application.Service #endregion CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); - CreateMap().ReverseMap(); + CreateMap().ReverseMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap().ReverseMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); + CreateMap() + .ForMember(d => d.QuestionMark, u => u.MapFrom(s => s.ReadingTableQuestionTrial == null ? null : s.ReadingTableQuestionTrial.QuestionMark)); CreateMap(); @@ -134,25 +141,27 @@ namespace IRaCIS.Core.Application.Service .ForMember(t => t.TrialCriterionNameList, u => u.MapFrom(c => c.TrialClinicalDataSetCriteriaList.Where(x => CriterionIds.Contains(x.TrialReadingCriterionId)).Select(t => t.TrialReadingCriterion.CriterionName))) .ForMember(t => t.TrialCriterionIdList, u => u.MapFrom(c => c.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterion.Id))) - .ForMember(d => d.IsUsed, u => u.MapFrom(s => s.ReadingClinicalDataList.Count() > 0)); + .ForMember(d => d.IsUsed, u => u.MapFrom(s => s.ReadingClinicalDataList.Count() > 0)) + ; CreateMap(); //.ForMember(t=>t.SystemCriterionNameList,u=>u.MapFrom(c=>c.SystemClinicalDataCriterionList.Select(t=>t.SystemReadingCriterion.CriterionName))) //.ForMember(t => t.SystemCriterionIdList, u => u.MapFrom(c => c.SystemClinicalDataCriterionList.Select(t => t.SystemReadingCriterion.Id))); - CreateMap().ReverseMap(); + CreateMap().ReverseMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id)); + //.ForMember(dest => dest.Instance, opt => opt.Ignore()) //.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore()); @@ -176,52 +185,63 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark)) .ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString())) .ForMember(d => d.RowIndexNum, u => u.MapFrom(s => s.RowIndex)) - .ForMember(d => d.RowId, u => u.MapFrom(s => s.Id)); + .ForMember(d => d.RowId, u => u.MapFrom(s => s.Id)) + ; CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder)) .ForMember(d => d.QuestionMark, u => u.MapFrom(s => s.ReadingTableQuestionTrial.QuestionMark)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)) .ForMember(d => d.GroupName, u => u.MapFrom(s => isEn_Us ? s.GroupEnName : s.GroupName)) .ForMember(d => d.PageShowOrder, u => u.MapFrom(s => s.ReadingCriterionPage.ShowOrder)) .ForMember(d => d.PageName, u => u.MapFrom(s => s.ReadingCriterionPage.PageName)) .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.IsPublicPage, u => u.MapFrom(s => s.ReadingCriterionPage.IsPublicPage)); - CreateMap(); + + CreateMap() + ; CreateMap(); CreateMap() .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder)) .ForMember(d => d.CreateUser, u => u.Ignore()); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); - CreateMap(); + CreateMap().ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() .ForMember(d => d.CreateUser, u => u.Ignore()); - CreateMap(); + CreateMap() + ; CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id)); CreateMap() @@ -229,37 +249,48 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.ReadingQuestionSystemId, u => u.MapFrom(s => s.Id)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.MergeName, u => u.MapFrom(s => s.MergeRow == null ? string.Empty : s.MergeRow.ReadingQuestionTrial.OrderMark + s.MergeRow.RowIndex.GetLesionMark())) .ForMember(d => d.SplitName, u => u.MapFrom(s => s.SplitRow == null ? string.Empty : s.SplitRow.ReadingQuestionTrial.OrderMark + s.SplitRow.RowIndex.GetLesionMark())) .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial == null ? null : s.ReadingQuestionTrial.LesionType)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(dest => dest.DependParentQuestion, opt => opt.Ignore()) .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id)) .ForMember(d => d.SystemTableQuestionId, u => u.MapFrom(s => s.Id)); CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) + ; CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(dest => dest.ReadingQuestionTrialList, opt => opt.Ignore()) .ForMember(dest => dest.CreateUser, opt => opt.Ignore()) .ForMember(d => d.ReadingQuestionCriterionSystemId, u => u.MapFrom(s => s.Id)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionSystemList.Count())); //.ForMember(d => d.IsEnable, u => u.MapFrom(s => s.Dictionary.IsEnable)) //.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.Dictionary.ShowOrder)); CreateMap(); - CreateMap(); + + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(d => d.GroupName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupName : s.GroupInfo.GroupName)) .ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionSystem == null ? string.Empty : s.ParentReadingQuestionSystem.QuestionName)) .ForMember(d => d.ParentQuestionShowOrder, u => u.MapFrom(s => s.ParentReadingQuestionSystem.ShowOrder)) @@ -270,13 +301,17 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.RelevanceQuestionGenre, u => u.MapFrom(s => s.RelevanceReadingQuestionSystem.QuestionGenre)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionTrialList.Count())); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(d => d.GroupName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupName : s.GroupInfo.GroupName)) .ForMember(d => d.GroupEnName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupEnName : s.GroupInfo.GroupEnName)) .ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionTrial == null ? string.Empty : s.ParentReadingQuestionTrial.QuestionName)) @@ -290,6 +325,7 @@ namespace IRaCIS.Core.Application.Service #region IR阅片 CreateMap() + .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)) .ForMember(x => x.Id, y => y.MapFrom(z => z.Id)); @@ -299,15 +335,20 @@ namespace IRaCIS.Core.Application.Service #endregion #region 医学审核 - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(x => x.ParentShowOrder, y => y.MapFrom(n => n.ParentQuestion.ShowOrder)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap() + .ForMember(x => x.ParentShowOrder, y => y.MapFrom(n => n.ParentQuestion.ShowOrder)); CreateMap(); @@ -326,9 +367,11 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap(); - CreateMap().ReverseMap(); + CreateMap().ReverseMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap(); #endregion @@ -340,8 +383,10 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap().ReverseMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); + CreateMap().ReverseMap() + .ForMember(dest => dest.CreateUser, opt => opt.Ignore()); CreateMap().ReverseMap();