IRaCIS.Core.API/appsettings.Test_HIR.json

@@ -42,7 +42,7 @@
     "IsNeedChangePassWord": true,
     // 密码有效期（天），到期后必须修改
     "ChangePassWordDays": 1000,
-    "OpenImageShare": true
+    "OpenImageShare": true,
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Uat_HIR.json

@@ -36,12 +36,20 @@
     "AutoLoginOutMinutes": 120,
     "AESKey": "HIR_System_AES_Key_Info",
     "CmoveIntervalMinutes": 1,
-    "CmoveInstanceIntervalMinutes": 1,
-    // 是否强制用户定期修改密码
-    "IsNeedChangePassWord": true,
-    // 密码有效期（天），到期后必须修改
-    "ChangePassWordDays": 1000,
-    "OpenImageShare": true
+    "CmoveInstanceIntervalMinutes": 1
+  },
+  "SystemHospitalConfig": {
+    "HospitalCode": "EI",
+    "HospitalLogoPath": "/System/GeneralDocuments/1716453306898_图片2.png",
+    "TrialKeepCount": 60,
+    "HospitalName": "上海展影医疗科技有限公司",
+    "HospitalAliasName": "展影医疗",
+    "Country": "中国",
+    "City": "上海",
+    "Province": "上海",
+    "Address": "上海市杨浦区国泰路复旦科技园",
+    "Phone": "021-60702575",
+    "IsCanConnectInternet": false
   },
   "SystemEmailSendConfig": {
     "Port": 465,
@@ -49,7 +57,6 @@
     "FromEmail": "test-study@extimaging.com",
     "FromName": "Test_HIR",
     "AuthorizationCode": "zhanying123",
-    "SiteUrl": "http://hir.test.extimaging.com/login",
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
+    "SiteUrl": "http://hir.test.extimaging.com/login"
   }
 }

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

@@ -134,7 +134,7 @@ namespace IRaCIS.Core.Application.Service
             var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hIRHospitalRepository), TimeSpan.FromDays(7));
             return await _trialRepository.AsQueryable()
                  //过滤医院，切换会有问题
-                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin, t => t.HospitalId == hospitalInfo.Id)
+                 .Where(t => t.HospitalId == hospitalInfo.Id)
 
                 //SuperAdmin  Admin  OP OA
                 .WhereIf(sap.Contains(_userInfo.UserTypeEnumInt), x => trialState.Contains(x.TrialStatusStr))

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -218,7 +218,7 @@ namespace IRaCIS.Application.Services
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialCode), t => t.TrialCode.Contains(inQuery.TrialCode))
 
                  //过滤医院，切换会有问题
-                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin, t => t.HospitalId == hospitalInfo.Id)
+                 .Where(t => t.HospitalId == hospitalInfo.Id)
                  //GA 要过滤课题组
                  .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA && hospitalGroupAdminIdList.Any(), t => hospitalGroupAdminIdList.Contains(t.HospitalGroupId))
                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OA

IRaCIS.Core.Application/TestService.cs

@@ -300,24 +300,6 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
-        [AllowAnonymous]
-        public async Task<IResponseOutput> NewUserHospitalGroup(
-    [FromServices] IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
-    [FromServices] IRepository<SCPStudy> _SCPStudyRepository, Guid hospitalGroupId)
-        {
-
-            var scpStudyIdList = _SCPStudyRepository.Where().Select(t => t.Id).ToList();
-
-            foreach (var item in scpStudyIdList)
-            {
-                await _SCPStudyHospitalGroupRepository.AddAsync(new SCPStudyHospitalGroup() { SCPStudyId = item, HospitalGroupId = hospitalGroupId });
-            }
-
-            await _SCPStudyRepository.SaveChangesAsync();
-
-            return ResponseOutput.Ok();
-        }
-
         /// <summary>
         /// 外部人员 中心调研人员维护
         /// </summary>