From 652d90af98e6843823af1d12baa1d9b9588f7d00 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 21 Aug 2025 16:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9GA=20=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs | 2 +-
 IRaCIS.Core.Application/Service/Visit/PatientService.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
index 0a84cf4e1..a7e06532c 100644
--- a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
@@ -26,7 +26,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
 
     public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList()
     {
-        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA)).ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
+        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false)).ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
         return list;
     }
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 76c076cfd..2aaf06f69 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -64,7 +64,7 @@ namespace IRaCIS.Application.Services
         IRepository<SubjectPatient> _subjectPatientRepository, IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
          IRepository<Trial> _trialRepository,
          IRepository<SCPPatient> _patientRepository,
-           IRepository<HospitalGroup> _hospitalGroupRepository,
+         IRepository<HospitalGroup> _hospitalGroupRepository,
          IRepository<SCPStudy> _studyRepository,
          IRepository<Subject> _subjectRepository,
          IRepository<SubjectVisit> _subjectVisitRepository,