diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index 33be29056..a3cd5fa36 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -234,6 +234,8 @@ namespace IRaCIS.Application.Contracts public int? UserCount { get; set; } public string TrialSiteCode { get; set; } = String.Empty; + + public string TrialSiteName { get; set; } = String.Empty; public string TrialSiteAliasName { get; set; } = String.Empty; public bool IsDeleted { get; set; } @@ -246,21 +248,16 @@ namespace IRaCIS.Application.Contracts public DateTime CreateTime { get; set; } - public string Site { get; set; } = String.Empty; - - public string SiteCode { get; set; } = String.Empty; - - - public string Hospital { get; set; } = String.Empty; - public string City { get; set; } = String.Empty; - public string Country { get; set; } = String.Empty; - - public string DirectorName { get; set; } = String.Empty; - public string DirectorPhone { get; set; } = String.Empty; - public string ContactName { get; set; } = String.Empty; - public string ContactPhone { get; set; } = String.Empty; - - public string Address { get; set; } = String.Empty; + //public string Site { get; set; } = String.Empty; + //public string SiteCode { get; set; } = String.Empty; + //public string Hospital { get; set; } = String.Empty; + //public string City { get; set; } = String.Empty; + //public string Country { get; set; } = String.Empty; + //public string DirectorName { get; set; } = String.Empty; + //public string DirectorPhone { get; set; } = String.Empty; + //public string ContactName { get; set; } = String.Empty; + //public string ContactPhone { get; set; } = String.Empty; + //public string Address { get; set; } = String.Empty; public List UserNameList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 3355f2d4a..75f369c99 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -120,17 +120,17 @@ namespace IRaCIS.Core.Application.Service #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)) @@ -148,8 +148,8 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.Id, u => u.MapFrom(s => s.Id)) .ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id)) .ForMember(d => d.UpdateTime, u => u.MapFrom(s => s.UpdateTime)) - .ForMember(d => d.Site, u => u.MapFrom(s => isEn_Us ?s.Site.SiteName:s.Site.SiteNameCN)) - .ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName)) + //.ForMember(d => d.Site, u => u.MapFrom(s => isEn_Us ?s.Site.SiteName:s.Site.SiteNameCN)) + //.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName)) .ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count())) .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count())) .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count()))