From 5956d32c366798a8240b77c5de55912147ed19c3 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Sep 2023 15:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Institution/DTO/SiteModel.cs                  | 2 +-
 .../Service/Institution/SiteService.cs                    | 1 +
 IRaCIS.Core.Domain/Institution/Site.cs                    | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

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<SiteSelectDTO>(_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; }