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

hospital修改 需要迁移
continuous-integration/drone/push Build is passing Details

Uat_Study
hang 2023-11-30 10:26:39 +08:00
parent b44a9ecc63
commit 9a70193e7a
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Institution/SiteService.cs
View File

@ -31,8 +31,8 @@ namespace IRaCIS.Application.Services
.WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName))
.WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City))
.WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country))
.WhereIf(!string.IsNullOrWhiteSpace(searchModel.Province), t => t.Country.Contains(searchModel.Province)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Province), t => t.Province.Contains(searchModel.Province))
.ProjectTo<SiteSelectDTO>(_mapper.ConfigurationProvider); .ProjectTo<SiteSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us });
return await siteQueryable.ToPagedListAsync(searchModel.PageIndex, searchModel.PageSize, string.IsNullOrWhiteSpace(searchModel.SortField) ? "SiteName" : searchModel.SortField, searchModel.Asc); return await siteQueryable.ToPagedListAsync(searchModel.PageIndex, searchModel.PageSize, string.IsNullOrWhiteSpace(searchModel.SortField) ? "SiteName" : searchModel.SortField, searchModel.Asc);
@ -76,11 +76,6 @@ namespace IRaCIS.Application.Services
} }
} }
/// <summary> 删除研究中心 </summary> /// <summary> 删除研究中心 </summary>

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

@ -108,7 +108,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.IsSelect, u => u.MapFrom(t => t.UserTrials.Any(t => t.TrialId == trialId))); .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.UserTrials.Any(t => t.TrialId == trialId)));
CreateMap<Site, SiteSelectDTO>() CreateMap<Site, SiteSelectDTO>()
.ForMember(d => d.HospitalName, u => u.MapFrom(s => s.Hospital.HospitalName)); .ForMember(d => d.HospitalName, u => u.MapFrom(s => isEn_Us? s.Hospital.HospitalName:s.Hospital.HospitalNameCN));
//trial site 选择列表 subjectVisit pannel 模式添加的时候 //trial site 选择列表 subjectVisit pannel 模式添加的时候

1
IRaCIS.Core.Domain/Institution/Site.cs
View File

@ -8,6 +8,7 @@ namespace IRaCIS.Core.Domain.Models
public partial class Site : Entity, IAuditUpdate, IAuditAdd public partial class Site : Entity, IAuditUpdate, IAuditAdd
{ {
[JsonIgnore] [JsonIgnore]
[ForeignKey("HospitalId")]
public Hospital Hospital { get; set; } public Hospital Hospital { get; set; }
public string SiteName { get; set; } = string.Empty; public string SiteName { get; set; } = string.Empty;
public string SiteNameCN{ get; set; } = string.Empty; public string SiteNameCN{ get; set; } = string.Empty;