From 7542c20bcc30435b2c4d1b0a0c0bd134a03a0a2d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 21 Aug 2025 13:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/DTO/PatientViewModel.cs              |  2 +-
 .../Service/Visit/PatientService.cs                    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
index 6c44d1ba3..cef6f9d52 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
@@ -278,7 +278,7 @@ namespace IRaCIS.Application.Contracts
 
         public List<string> CurrentUserHospitalGroupList { get; set; } = new List<string>();
 
-        public List<string> ViewHospitalGroupList => StudyHospitalGroupList.Except(CurrentUserHospitalGroupList).ToList();
+        public List<string> ViewHospitalGroupList => StudyHospitalGroupList.Intersect(CurrentUserHospitalGroupList).ToList();
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 81b4f4628..ac3eceb09 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -54,6 +54,7 @@ using System.Threading.Channels;
 using NPOI.HSSF.Record.Chart;
 using IRaCIS.Core.Application.Helper.OtherTool;
 using IRaCIS.Core.Infrastructure.Extention;
+using DocumentFormat.OpenXml.Drawing.Charts;
 
 
 namespace IRaCIS.Application.Services
@@ -63,6 +64,7 @@ namespace IRaCIS.Application.Services
         IRepository<SubjectPatient> _subjectPatientRepository, IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
          IRepository<Trial> _trialRepository,
          IRepository<SCPPatient> _patientRepository,
+           IRepository<HospitalGroup> _hospitalGroupRepository,
          IRepository<SCPStudy> _studyRepository,
          IRepository<Subject> _subjectRepository,
          IRepository<SubjectVisit> _subjectVisitRepository,
@@ -660,7 +662,7 @@ namespace IRaCIS.Application.Services
                               };
 
 
-
+            var allHospitalGroupList = _hospitalGroupRepository.Where(t => t.IsEnable).Select(t =>  t.Name).ToList();
 
             var pageList = await resultQuery.ToPagedListAsync(inQuery, nameof(PatientQueryView.PatientIdStr));
 
@@ -669,6 +671,8 @@ namespace IRaCIS.Application.Services
                 if (isAdminOrOA)
                 {
                     //不处理，默认看所有
+
+                    item.CurrentUserHospitalGroupList = allHospitalGroupList;
                 }
                 else
                 {
@@ -790,11 +794,15 @@ namespace IRaCIS.Application.Services
 
             var pageList = await query.ToPagedListAsync(inQuery, nameof(PatientStudySimpleView.StudyTime));
 
+            var allHospitalGroupList= _hospitalGroupRepository.Where(t=>t.IsEnable).Select(t=> new HospitalGroupInfo() { Id = t.Id, Code = t.Code, Name = t.Name }).ToList();
+
             foreach (var item in pageList.CurrentPageData)
             {
                 if (isAdminOrOA)
                 {
                     //不处理，默认看所有
+
+                    item.CurrentUserHospitalGroupList = allHospitalGroupList;
                 }
                 else
                 {