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-28 17:04:45 +08:00
parent b7c85d6b56
commit fdbdda71eb
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,16 @@ public class HospitalGroupAddOrEdit
public string CallingAE { get; set; } public string CallingAE { get; set; }
public List<Guid> IdentityUserIdList { get; set; } public List<GAIdentityUserInfo> IdentityUserList { get; set; }
}
public class GAIdentityUserInfo
{
public Guid IdentityUserId { get; set; }
public bool IsDisabled { get; set; }
} }
public class HospitalGroupQuery : PageInput public class HospitalGroupQuery : PageInput

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

@ -96,7 +96,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
var addEntity = _mapper.Map<HospitalGroup>(addOrEditHospitalGroup); var addEntity = _mapper.Map<HospitalGroup>(addOrEditHospitalGroup);
addEntity.IdentityUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, IsManager = true }).ToList(); addEntity.IdentityUserList = addOrEditHospitalGroup.IdentityUserList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t.IdentityUserId, IsManager = true, IsDisabled = t.IsDisabled }).ToList();
var newEntity = await _hospitalGroupRepository.AddAsync(addEntity, true, verifyExp1); var newEntity = await _hospitalGroupRepository.AddAsync(addEntity, true, verifyExp1);
@ -110,7 +110,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
//_mapper.Map(addOrEditHospitalGroup, find); //_mapper.Map(addOrEditHospitalGroup, find);
var adminUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true }).ToList(); var adminUserList = addOrEditHospitalGroup.IdentityUserList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t.IdentityUserId, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true, IsDisabled = t.IsDisabled }).ToList();
await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList); await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList);
var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, true, false, verifyExp1); var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, true, false, verifyExp1);

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

@ -207,7 +207,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<HospitalGroup, HospitalGroupView>() 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.IdentityUser.Id))); .ForMember(d => d.IdentityUserList, u => u.MapFrom(s => s.IdentityUserList.Where(t => t.IsManager).Select(t => new GAIdentityUserInfo() { IdentityUserId = t.IdentityUser.Id, IsDisabled = t.IsDisabled })));
CreateMap<HospitalGroup, HospitalGroupAddOrEdit>().ReverseMap(); CreateMap<HospitalGroup, HospitalGroupAddOrEdit>().ReverseMap();