IRaCIS.Core.Application/Service/Institution/HospitalService.cs

@@ -60,7 +60,10 @@ namespace IRaCIS.Application.Services
                 //---该医院下已经注册有医生，不可以删除。
                 return ResponseOutput.NotOk(_localizer["Hospital_HasDoctors"]);
             }
-
+            //if (_userRepository.Find().Any(t => t.OrganizationId == hospitalId))
+            //{
+            //    return ResponseOutput.NotOk("该医院下存在用户，暂时无法删除。");
+            //}
 
             var success = await _hospitalRepository.BatchDeleteNoTrackingAsync(x => x.Id == hospitalId);
 

IRaCIS.Core.Application/Service/Institution/SiteService.cs

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

IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs

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

IRaCIS.Core.Domain/Institution/Site.cs

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