diff --git a/IRaCIS.Core.Application/Service/Institution/DTO/SiteModel.cs b/IRaCIS.Core.Application/Service/Institution/DTO/SiteModel.cs index 43f027200..0675dad98 100644 --- a/IRaCIS.Core.Application/Service/Institution/DTO/SiteModel.cs +++ b/IRaCIS.Core.Application/Service/Institution/DTO/SiteModel.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Application.Contracts { public Guid? Id { get; set; } public string SiteName { get; set; } = String.Empty; - + public string SiteNameCN { get; set; } = String.Empty; public int Code { get; set; } public string SiteCode { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/Institution/SiteService.cs b/IRaCIS.Core.Application/Service/Institution/SiteService.cs index 2f3cc4391..3ccc8139f 100644 --- a/IRaCIS.Core.Application/Service/Institution/SiteService.cs +++ b/IRaCIS.Core.Application/Service/Institution/SiteService.cs @@ -31,6 +31,7 @@ namespace IRaCIS.Application.Services .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.Country), t => t.Country.Contains(searchModel.Country)) + .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Province), t => t.Country.Contains(searchModel.Province)) .ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 7465935fa..feeeaa044 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -9,15 +9,15 @@ namespace IRaCIS.Core.Domain.Models { [JsonIgnore] public Hospital Hospital { get; set; } - public string SiteName { get; set; } - + public string SiteName { get; set; } = string.Empty; + public string SiteNameCN{ get; set; } = string.Empty; public string AliasName { get; set; } = string.Empty; public string SiteCode { get; set; } public int Code { get; set; } - public string City { get; set; } - public string Country { get; set; } + public string City { get; set; } = string.Empty; + public string Country { get; set; } = string.Empty; public Guid? HospitalId { get; set; } public int State { get; set; }