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

修改GA课题组管理员查询下拉框
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-08-29 16:37:01 +08:00
parent d769d43d23
commit be5fc58ef7
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13604,7 +13604,7 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.HospitalGroupService.GetGAUserList(System.Guid)">
<member name="M:IRaCIS.Core.Application.Service.HospitalGroupService.GetGAUserList(System.Guid,System.Boolean)">
<summary>
GA用户列表
</summary>

6
IRaCIS.Core.Application/Service/Visit/DTO/HospitalGroupViewModel.cs
View File

@ -62,7 +62,13 @@ public class HospitalGroupQuery : PageInput
}
public class UserHospitalGroupAdminInfo : HospitalGroupAdminUserInfo
{
public bool IsUserDisabled { get; set; }
public bool IsGACurrentHospitalDisabled { get; set; }
public bool IsGARoleDisabled { get; set; }
}
public class HospitalGroupAdminUserInfo
{

8
IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
View File

@ -24,11 +24,11 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
/// </summary>
/// <returns></returns>
public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList(Guid hospitalGroupId)
public async Task<List<UserHospitalGroupAdminInfo>> GetGAUserList(Guid hospitalGroupId, bool isAdd)
{
var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false)
&& t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId && t.IsDisabled == false))
.ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA /*&& t.IsUserRoleDisabled == false*/)
&& t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId /*&& t.IsDisabled == false*/) /*&& t.Status==UserStateEnum.Enable*/)
.ProjectTo<UserHospitalGroupAdminInfo>(_mapper.ConfigurationProvider, new { hostpitalGroupId = hospitalGroupId }).ToListAsync();
return list;
}

8
IRaCIS.Core.Application/Service/Visit/_MapConfig.cs
View File

@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<HospitalGroup, HospitalGroupView>()
.ForMember(d => d.GAUserList, u => u.MapFrom(s => s.IdentityUserList.Where(t=>t.IsManager).Select(t => t.IdentityUser)))
.ForMember(d => d.GAUserList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => t.IdentityUser)))
.ForMember(d => d.IdentityUserIdList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => t.IdentityUserId)));
@ -215,6 +215,12 @@ namespace IRaCIS.Core.Application.Service
CreateMap<IdentityUser, HospitalGroupAdminUserInfo>();
var hostpitalGroupId = Guid.Empty;
CreateMap<IdentityUser, UserHospitalGroupAdminInfo>()
.ForMember(d => d.IsGARoleDisabled, u => u.MapFrom(s => s.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled)))
.ForMember(d => d.IsUserDisabled, u => u.MapFrom(s => s.Status == UserStateEnum.Disable))
.ForMember(d => d.IsGACurrentHospitalDisabled, u => u.MapFrom(s => s.IdentityUserHospitalGroupList.Any(t => t.IsDisabled && t.HospitalGroupId == hostpitalGroupId)));