XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin 可以看所有医院，不受默认医院影响

Test_HIR_Net8
hang 2025-09-11 14:09:21 +08:00
parent 5f71d7f1b2
commit 0a5164682f
6 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/appsettings.Test_HIR.json
View File

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

23
IRaCIS.Core.API/appsettings.Uat_HIR.json
View File

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

2
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -7210,7 +7210,7 @@
部位 部位
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.StudyCode"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitLesionInfo.StudyIdStr">
<summary> <summary>
检查号 检查号
</summary> </summary>

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

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

2
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

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

18
IRaCIS.Core.Application/TestService.cs
View File

@ -300,6 +300,24 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.Ok(); 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>
/// 外部人员 中心调研人员维护 /// 外部人员 中心调研人员维护
/// </summary> /// </summary>