XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询接口
continuous-integration/drone/push Build is failing Details

IRC_NewDev
hang 2024-06-06 17:15:03 +08:00
parent 8e104e133f
commit e5fcb75b9f
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
View File

@ -234,6 +234,8 @@ namespace IRaCIS.Application.Contracts
public int? UserCount { get; set; } public int? UserCount { get; set; }
public string TrialSiteCode { get; set; } = String.Empty; public string TrialSiteCode { get; set; } = String.Empty;
public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { get; set; } = String.Empty; public string TrialSiteAliasName { get; set; } = String.Empty;
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
@ -246,21 +248,16 @@ namespace IRaCIS.Application.Contracts
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
public string Site { get; set; } = String.Empty; //public string Site { get; set; } = String.Empty;
//public string SiteCode { 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 Hospital { get; set; } = String.Empty; //public string DirectorName { get; set; } = String.Empty;
public string City { get; set; } = String.Empty; //public string DirectorPhone { get; set; } = String.Empty;
public string Country { get; set; } = String.Empty; //public string ContactName { get; set; } = String.Empty;
//public string ContactPhone { get; set; } = String.Empty;
public string DirectorName { get; set; } = String.Empty; //public string Address { 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<string> UserNameList { get; set; } = new List<string>(); public List<string> UserNameList { get; set; } = new List<string>();

22
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -120,17 +120,17 @@ namespace IRaCIS.Core.Application.Service
#region site 也有country hospital 也有 注意区分 #region site 也有country hospital 也有 注意区分
CreateMap<TrialSite, SiteStatDTO>() CreateMap<TrialSite, SiteStatDTO>()
.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode)) //.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.City, u => u.MapFrom(s => s.Site.City))
.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country)) //.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.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName)) //.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.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone))
.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone)) //.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.Address, u => u.MapFrom(s => s.Site.Address))
.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName)) //.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.Id, u => u.MapFrom(s => s.Id))
.ForMember(d => d.TrialSiteId, 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.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.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.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
.ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count())) .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.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count()))
.ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count())) .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count()))