用户增加工作语言，系统文档增加文档适用语言用户

IRaCIS.Core.Application/Auth/TokenService.cs

@@ -39,7 +39,8 @@ namespace IRaCIS.Core.Application.Auth
                 new Claim(JwtIRaCISClaimType.UserTypeShortName,user.UserTypeShortName),
                 new Claim(JwtIRaCISClaimType.PermissionStr,user.PermissionStr),
                 new Claim(JwtIRaCISClaimType.IsZhiZhun,user.IsZhiZhun.ToString()),
-                new Claim(JwtIRaCISClaimType.IsTestUser,user.IsTestUser.ToString())
+                new Claim(JwtIRaCISClaimType.IsTestUser,user.IsTestUser.ToString()),
+                 new Claim(JwtIRaCISClaimType.UserWorkLanguage,user.UserWorkLanguage.ToString())
             };
 
             ////创建令牌

IRaCIS.Core.Application/Auth/UserTokenInfo.cs

@@ -23,5 +23,7 @@ namespace IRaCIS.Core.Application.Auth
         public bool IsZhiZhun { get; set; }
 
         public string UserTypeShortName { get; set; } = string.Empty;
+
+        public UserWorkLanguage UserWorkLanguage { get; set; }
     }
 }

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9717,6 +9717,36 @@
             单位
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.ValueType">
+            <summary>
+            数值类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.CustomUnit">
+            <summary>
+            自定义单位
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.ValueType">
+            <summary>
+            数值类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.CustomUnit">
+            <summary>
+            自定义单位
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.SaveTableQuestionMarkInDto">
             <summary>
             保存表格问题标记

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -644,6 +644,12 @@ namespace IRaCIS.Core.Application.Service
                         saveItem.IsTestUser = true;
                     }
 
+
+                    //通过医生信息，设置工作语言
+                    var nation = _doctorTypeRepository.Where(t => t.Id == doctorId).Select(t => t.Nation).FirstOrDefault();
+                    saveItem.UserWorkLanguage = nation == DoctorNation.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
+
                     saveItem.UserCeateSource = UserCeateSource.ReviewerSelect;
                     saveItem.TrialId = trialId;
 

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -149,7 +149,7 @@ namespace IRaCIS.Application.Contracts
 
         public bool? AcceptingNewTrial { get; set; }//是否接受新的项目
         public bool? ActivelyReading { get; set; }// 是否接受新的读片任务
-        public int? Nation { get; set; }// 0-中国医生，2-美国医生，3-全部
+        public DoctorNation? Nation { get; set; }// 0-中国医生，2-美国医生，3-全部
     }
 
     /// <summary>

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -50,6 +50,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? OffLine { get; set; }
 
         public Guid? SystemDocumentId { get; set; }
+
     }
 
 
@@ -205,7 +206,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? EndCreateTime { get; set; }
 
-
+        public DocLanguageType? DocLanguageType { get; set; }
     }
 
     public class GetNextUnSignDocumentInDto
@@ -362,6 +363,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsPublish { get; set; } = false;
 
+        public DocLanguageType DocLanguageType { get; set; }
+
     }
 
 

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -42,6 +42,7 @@ namespace IRaCIS.Core.Application.Services
                            .WhereIf(inQuery.OffLine != null, t => t.OffLine == inQuery.OffLine)
                               .WhereIf(inQuery.FileName != null, t => t.FileName == inQuery.FileName)
                                     .WhereIf(inQuery.FileFormat != null, t => t.FileFormat == inQuery.FileFormat)
+                                    
                                         .ProjectTo<SystemDocumentAttachmentView>(_mapper.ConfigurationProvider);
 
             var pageList = await systemDocumentAttachmentQueryable.ToPagedListAsync(inQuery);
@@ -95,6 +96,7 @@ namespace IRaCIS.Core.Application.Services
                .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
                 .WhereIf(inQuery.UserTypeId != null, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId))
                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+               .WhereIf(inQuery.DocLanguageType != null, t => t.DocLanguageType == inQuery.DocLanguageType)
                .ProjectTo<SystemDocumentView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us, userId = _userInfo.UserRoleId });
 
             return await systemDocumentQueryable.ToPagedListAsync(inQuery);
@@ -286,9 +288,12 @@ namespace IRaCIS.Core.Application.Services
         {
 
             var isInternal = _userInfo.IsZhiZhun;
+            var workLanguage = _userInfo.UserWorkLanguage;
 
             var query = from sysDoc in _systemDocumentRepository.Where(t=>t.IsPublish)
-                        .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                      .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                      .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
+                     .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -351,12 +351,16 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
+            var workLanguage = _userInfo.UserWorkLanguage;
+
             #region 统一用户修改 
 
             var systemDocQuery =
                  from sysDoc in _systemDocumentRepository.Where(t => t.IsPublish).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
+                    .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                    .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
                  from trialUser in _trialIdentityUserRepository.AsQueryable(false)
                   .Where(t => t.TrialId == inQuery.TrialId && t.IdentityUserId == _userInfo.IdentityUserId
                   && t.TrialUserRoleList.Any(t => sysDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
@@ -584,6 +588,7 @@ namespace IRaCIS.Core.Application.Services
 
 
             var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
+
                        .Where(t => t.TrialId == inQuery.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
                        .Where(t => t.Trial.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
                        .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
@@ -591,7 +596,9 @@ namespace IRaCIS.Core.Application.Services
 
 
             var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
-                                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
+                      .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                      .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
+                      .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                       .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                       .CountAsync();
 
@@ -969,7 +976,7 @@ namespace IRaCIS.Core.Application.Services
                    IsSystemDoc = true,
                    SysDocUserSignType = sysDoc.DocUserSignType,
                    IsConfirmIdentityUserInner = identityUser.IsZhiZhun,
-                   IsPublish=sysDoc.IsPublish,
+                   IsPublish = sysDoc.IsPublish,
                    Id = sysDoc.Id,
                    CreateTime = sysDoc.CreateTime,
                    IsDeleted = sysDoc.IsDeleted,
@@ -1115,7 +1122,7 @@ namespace IRaCIS.Core.Application.Services
                     return ResponseOutput.NotOk(_localizer["TrialD_DuplicateFileInProject"]);
                 }
 
-                var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true,true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
+                var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
 
                 bool beforeIsPublish = document.IsPublish;
                 bool beforeIsDeleted = document.IsDeleted;

IRaCIS.Core.Application/Service/Financial/DTO/PaymentDetailModel.cs

@@ -105,7 +105,7 @@
         public string Reviewer { get; set; } = String.Empty;
         public DateTime BeginMonth { get; set; }
         public DateTime EndMonth { get; set; }
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
     public class MonthlyPaymentDTO
     {

IRaCIS.Core.Application/Service/Financial/DTO/PaymentModel.cs

@@ -59,7 +59,7 @@
     {
         public DateTime StatisticsDate { get; set; }
         public string KeyWord { get; set; } = String.Empty;
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
 
     public class MonthlyPaymentDetailQuery
@@ -162,7 +162,7 @@
         public DateTime BeginDate { get; set; }
         public DateTime EndDate { get; set; }
 
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
 
     public class TrialAnalysisQueryDTO

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

@@ -207,7 +207,7 @@ namespace IRaCIS.Application.Contracts
 
         public bool IsTestUser { get; set; }
 
-
+        public UserWorkLanguage UserWorkLanguage { get; set; }
     }
 
     /// <summary>
@@ -338,6 +338,8 @@ namespace IRaCIS.Application.Contracts
         public Guid? AuditRecordId { get; set; }
 
         public bool? IsAuditRecordUserSelect { get; set; }
+
+        public UserWorkLanguage? UserWorkLanguage { get; set; }
     }
 
     public class UserRoleInfoDTO

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -534,6 +534,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
                  .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == true, t => t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
                  .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == false, t => !t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
+                  .WhereIf(inQuery.UserWorkLanguage != null, t => t.UserWorkLanguage == inQuery.UserWorkLanguage)
                  .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
 
             var pageList = await userQueryable.ToPagedListAsync(inQuery);
@@ -1269,6 +1270,7 @@ namespace IRaCIS.Core.Application.Service
                 PermissionStr = t.UserTypeRole.PermissionStr,
                 UserName = t.IdentityUser.UserName,
                 UserTypeShortName = t.UserTypeRole.UserTypeShortName,
+                UserWorkLanguage=t.IdentityUser.UserWorkLanguage
             }).FirstOrDefaultAsync();
 
             await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true);

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -139,6 +139,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class SiteSurveyUserImportDto
     {
+        public string Country { get; set; }
         public string TrialSiteCode { get; set; } = string.Empty;
         public string FirstName { get; set; } = string.Empty;
         public string LastName { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -153,7 +153,7 @@ namespace IRaCIS.Core.Application.Contracts
                 if (inDto.TrialId != null)
                 {
                     isVirtual = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.TrialType != TrialType.OfficialTrial).FirstNotNullAsync();
-              
+
                     await _doctorRepository.BatchUpdateNoTrackingAsync(x => x.Id == dockerInfo.Id, y => new Doctor()
                     {
                         IsVirtual = isVirtual,
@@ -183,16 +183,16 @@ namespace IRaCIS.Core.Application.Contracts
                 {
                     EMail = inDto.EmailOrPhone,
                     IsVirtual = isVirtual,
-                    AcceptingNewTrial = inDto.TrialId == null? false:true,
+                    AcceptingNewTrial = inDto.TrialId == null ? false : true,
                     ActivelyReading = false,
                     ResumeStatus = ResumeStatusEnum.Pass,
-                    CooperateStatus = inDto.TrialId==null?  ContractorStatusEnum.Noncooperation: ContractorStatusEnum.Cooperation,
+                    CooperateStatus = inDto.TrialId == null ? ContractorStatusEnum.Noncooperation : ContractorStatusEnum.Cooperation,
 
                     ReviewStatus = ReviewerInformationConfirmStatus.ConfirmRefuse
                 };
 
                 doctor.Code = await _doctorRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
-                doctor.ReviewerCode= AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));
+                doctor.ReviewerCode = AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));
 
                 var info = await _doctorRepository.AddAsync(doctor, true);
 
@@ -246,7 +246,7 @@ namespace IRaCIS.Core.Application.Contracts
                         result.DoctorId = dockerInfo.Id;
                         result.ReviewStatus = dockerInfo.ReviewStatus;
 
-                        if(inDto.TrialId != null)
+                        if (inDto.TrialId != null)
                         {
                             var isVirtual = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.TrialType != TrialType.OfficialTrial).FirstNotNullAsync();
                             await _doctorRepository.BatchUpdateNoTrackingAsync(x => x.Id == dockerInfo.Id, y => new Doctor()
@@ -995,6 +995,10 @@ namespace IRaCIS.Core.Application.Contracts
                         generateUser.IsTestUser = true;
                     }
 
+                    //通过中心国家，设置工作语言
+                    var trialSiteCountry = _trialSiteRepository.Where(t => t.Id == trialSiteId).Select(t => t.Country).FirstOrDefault();
+                    generateUser.UserWorkLanguage = trialSiteCountry == StaticData.SiteCountry.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
                     generateUser.Id = NewId.NextSequentialGuid();
                     // 外部人员生成账号 都是外部的
                     generateUser.IsZhiZhun = false;
@@ -1187,7 +1191,7 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 var addUserRoleList = item.ToList();
 
-                var first = addUserRoleList.FirstOrDefault();
+                var first = addUserRoleList.First();
 
                 var userEmail = item.Key;
 
@@ -1238,6 +1242,10 @@ namespace IRaCIS.Core.Application.Contracts
                         generateUser.IsTestUser = true;
                     }
 
+                    //通过中心国家，设置工作语言
+
+                    generateUser.UserWorkLanguage = first.Country == StaticData.SiteCountry.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
                     generateUser.Id = NewId.NextSequentialGuid();
 
                     // 外部人员生成账号 都是外部的

IRaCIS.Core.Application/Service/Stat/DTO/StatisticsViewModel.cs

@@ -142,7 +142,7 @@
         public int StatType { get; set; }
 
         //医生付费类型  CN  US
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
 
         //public AttendedReviewerType? AttendedReviewerType { get; set; }
     }

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs

@@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string UserKeyInfo { get; set; } = String.Empty;
 
+
+        public string? Country { get; set; }
+
     }
 
     public class SiteCRCExportQueryDTO
@@ -43,6 +46,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string TrialSiteAliasName { get; set; } = String.Empty;
 
+        public string Country { get; set; }
+
         public bool IsDeleted { get; set; } = true;
 
     }
@@ -62,6 +67,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string TrialSiteCode { get; set; } = String.Empty;
 
+        public string Country { get; set; }
+
         public bool IsDeleted { get; set; }
 
     }
@@ -119,6 +126,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public string SiteName { get; set; } = String.Empty;
 
         public string AliasName { get; set; } = string.Empty;
+
+        public string Country { get; set; }
     }
 
     public class TrialSiteScreeningDTO

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -441,6 +441,8 @@ namespace IRaCIS.Application.Contracts
 
         public Guid TrialSiteId { get; set; }
 
+        public string Country { get; set; }
+
         public string TrialSiteCode { get; set; } = String.Empty;
 
         public string TrialSiteName { get; set; } = String.Empty;

IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<IResponseOutput> DeleteSiteCRC(Guid id, bool isDelete);
         Task<IResponseOutput> DeleteTrialSite(Guid id);
         Task<PageOutput<SiteStatDTO>> GetSiteCRCList(SiteCrcQueryDTO param);
-        Task<(PageOutput<SiteStatSimpleDTO>,object)> GetSiteCRCSimpleList(SiteCrcQueryDTO param);
+        Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>> > GetSiteCRCSimpleList(SiteCrcQueryDTO param);
         Task<PageOutput<TrialSiteScreeningDTO>> GetTrialSiteScreeningList(TrialSiteQuery trialSiteQuery);
         Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId);
     }

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

@@ -17,6 +17,7 @@ using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Application.Contracts;
 using MassTransit;
+using System.Globalization;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -271,6 +272,11 @@ namespace IRaCIS.Core.Application.Service
                         generateUser.IsTestUser = true;
                     }
 
+                    //外部人员语言类型，根据PM创建时界面语言决定
+                    var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+                    generateUser.UserWorkLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
+
                     // 外部人员生成账号 都是外部的
                     generateUser.IsZhiZhun = false;
 

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

@@ -101,7 +101,7 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary>[new] setting页面Site列表，和getSiteCRCList对比 没有统计数据，增加了一些site信息 </summary>
         [HttpPost]
-        public async Task<(PageOutput<SiteStatSimpleDTO>,object)> GetSiteCRCSimpleList(SiteCrcQueryDTO inQuery)
+        public async Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>>> GetSiteCRCSimpleList(SiteCrcQueryDTO inQuery)
         {
 
             var trialinfo = await _trialRepository.Where(x => x.Id == inQuery.TrialId).FirstNotNullAsync();
@@ -110,6 +110,7 @@ namespace IRaCIS.Core.Application.Services
                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SiteName), t => t.TrialSiteName.Contains(inQuery.SiteName) || t.TrialSiteAliasName.Contains(inQuery.TrialSiteAliasName))
                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(inQuery.TrialSiteAliasName))
                              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteCode), t => t.TrialSiteCode.Contains(inQuery.TrialSiteCode))
+                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Country), t => t.Country.Contains(inQuery.Country))
                             .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.UserRoleId))
                              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserKeyInfo), t => t.CRCUserList.Any(k => (k.UserRole.FullName).Contains(inQuery.UserKeyInfo)
                              || k.UserRole.IdentityUser.UserName.Contains(inQuery.UserKeyInfo) || k.UserRole.IdentityUser.EMail.Contains(inQuery.UserKeyInfo)))
@@ -119,8 +120,9 @@ namespace IRaCIS.Core.Application.Services
 
             var result = await siteStatQuery.ToPagedListAsync(inQuery);
 
-            return (result,new {
-                IsPACSConnectAndIsTrialPACSConfirmed = trialinfo.IsPACSConnect&&trialinfo.IsTrialPACSConfirmed,
+            return ResponseOutput.Ok(result, new
+            {
+                IsPACSConnectAndIsTrialPACSConfirmed = trialinfo.IsPACSConnect && trialinfo.IsTrialPACSConfirmed,
             });
         }
 
@@ -150,8 +152,8 @@ namespace IRaCIS.Core.Application.Services
         {
             var list = _siteRepository
             .WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.SiteName.Contains(siteName) || t.SiteNameCN.Contains(siteName) || t.AliasName.Contains(siteName))
-            .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.SiteName : t.SiteNameCN, AliasName = t.AliasName }).ToList()
-                 .OrderBy(x=>x.SiteName)
+            .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.SiteName : t.SiteNameCN, AliasName = t.AliasName, Country = t.Country }).ToList()
+                 .OrderBy(x => x.SiteName)
                  .ToList();
 
             return list;