From c566a703eb530b76a701f6b0cf2025c5b022a006 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 14 Jun 2024 16:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9trialSitte=20Id=20=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/_MapConfig.cs | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 3e51612bf..84956b604 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -23,9 +23,9 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - - CreateMap () + + CreateMap() .ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum)) .ForMember(d => d.IsImageConsistencyVerification, u => u.MapFrom(s => s.Trial.IsImageConsistencyVerification)) .ReverseMap(); @@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service CreateMap().ForMember(d => d.Id, u => u.MapFrom(s => s.TrialId)); - + CreateMap(); @@ -66,15 +66,15 @@ namespace IRaCIS.Core.Application.Service var userTypeEnumInt = 0; var isEn_Us = false; CreateMap() - .ForMember(x=>x.CriterionList,y=>y.MapFrom(z=>z.TrialReadingCriterionList.Where(n=>n.IsConfirm).Select(m=>m.CriterionName))) + .ForMember(x => x.CriterionList, y => y.MapFrom(z => z.TrialReadingCriterionList.Where(n => n.IsConfirm).Select(m => m.CriterionName))) .ForMember(d => d.DictionaryList, u => u.MapFrom(s => s.TrialDicList.Select(t => t.Dictionary).OrderBy(t => t.ShowOrder))) //.ForMember(d => d.Code, u => u.MapFrom(s => s.TrialCode)) .ForMember(d => d.Sponsor, u => u.MapFrom(s => s.Sponsor.SponsorName)) - .ForMember(d => d.Phase, u => u.MapFrom(s => isEn_Us? s.Phase.Value: s.Phase.ValueCN)) + .ForMember(d => d.Phase, u => u.MapFrom(s => isEn_Us ? s.Phase.Value : s.Phase.ValueCN)) //.ForMember(d => d.DeclarationType, u => u.MapFrom(s => s.DeclarationType.MappedValue)) - .ForMember(d => d.IndicationType, u => u.MapFrom(s => isEn_Us ? s.IndicationType.Value:s.IndicationType.ValueCN)) + .ForMember(d => d.IndicationType, u => u.MapFrom(s => isEn_Us ? s.IndicationType.Value : s.IndicationType.ValueCN)) .ForMember(d => d.CRO, u => u.MapFrom(s => s.CRO.CROName)) - .ForMember(d => d.ReviewMode, u => u.MapFrom(s => isEn_Us ? s.ReviewMode.Value:s.ReviewMode.ValueCN)) + .ForMember(d => d.ReviewMode, u => u.MapFrom(s => isEn_Us ? s.ReviewMode.Value : s.ReviewMode.ValueCN)) //.ForMember(d => d.ReviewType, u => u.MapFrom(s => s.ReviewType.Value)) .ForMember(d => d.IsLocked, u => u.MapFrom(s => s.WorkloadList.Any(u => u.DataFrom == (int)WorkLoadFromStatus.FinalConfirm))) //.ForMember(d => d.SiteCount, u => u.MapFrom(s => userTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator ? s.TrialSiteUserList.Count(k => k.UserId == userId) : s.TrialSiteList.Count())) @@ -108,32 +108,32 @@ namespace IRaCIS.Core.Application.Service CreateMap() - .ForMember(d => d.HospitalName, u => u.MapFrom(s => isEn_Us? s.Hospital.HospitalName:s.Hospital.HospitalNameCN)); + .ForMember(d => d.HospitalName, u => u.MapFrom(s => isEn_Us ? s.Hospital.HospitalName : s.Hospital.HospitalNameCN)); //trial site 选择列表 subjectVisit pannel 模式添加的时候 CreateMap() .ForMember(d => d.IsSelect, u => u.MapFrom(s => s.TrialSiteList.Any(k => k.TrialId == trialId))) - .ForMember(d => d.SiteName, u => u.MapFrom(c=> isEn_Us?c.SiteName:c.SiteNameCN)); + .ForMember(d => d.SiteName, u => u.MapFrom(c => isEn_Us ? c.SiteName : c.SiteNameCN)); #region 项目 stie pannel #region site 也有country hospital 也有 注意区分 CreateMap() - //.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode)) - //.ForMember(d => d.City, u => u.MapFrom(s => s.Site.City)) - //.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country)) - //.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName)) + //.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode)) + //.ForMember(d => d.City, u => u.MapFrom(s => s.Site.City)) + //.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country)) + //.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName)) - //.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName)) - //.ForMember(d => d.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone)) - //.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone)) - //.ForMember(d => d.Address, u => u.MapFrom(s => s.Site.Address)) - //.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName)) - + //.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName)) + //.ForMember(d => d.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone)) + //.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone)) + //.ForMember(d => d.Address, u => u.MapFrom(s => s.Site.Address)) + //.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName)) + .ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id)) .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count())) .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count())) .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count())) @@ -170,10 +170,10 @@ namespace IRaCIS.Core.Application.Service CreateMap().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id)) - .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v =>v.IsConfirm).OrderBy(x=>x.ShowOrder).Select(r => r.Id))) + .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.Id))) .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName))) .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id))) - .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName:r.ClinicalDataSetName))) + .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName : r.ClinicalDataSetName))) //.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId))) ; CreateMap(); @@ -191,7 +191,7 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap(); - CreateMap ().ForMember(t=>t.TrialId,u=>u.MapFrom(c=>c.Id)); + CreateMap().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id)); CreateMap(); @@ -262,7 +262,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(t => t.ParentQuestionName, u => u.MapFrom(c => c.ParentReadingQuestionTrial.QuestionName)) .ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder)) .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder)); - + 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)) @@ -317,7 +317,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(t => t.WaitSignCount, u => u.MapFrom(c => userTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? 0 - : c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId && t.ConfirmTime!=null)).Count()) + : c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId && t.ConfirmTime != null)).Count()) );