Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8

IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs

@@ -267,6 +267,7 @@ namespace IRaCIS.Application.Contracts
         public DateTime? BeginPushTime { get; set; }
         public DateTime? EndPushTime { get; set; }
 
+        public List<Guid> HospitalGroupIdList { get; set; } = new List<Guid>();
 
         public List<Guid> PatientHospitalGroupTagIdList { get; set; } = new List<Guid>();
 

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -642,8 +642,12 @@ namespace IRaCIS.Application.Services
                     .Where(t => t.IsDisabled == false && t.HospitalGroup.IsEnable).Select(t => t.HospitalGroupId).ToList();
             }
 
+
+
+
             #region new ok
             var query = _patientRepository.Where(t => isAdminOrOA ? true : t.SCPStudyList.Any(c => c.HospitalGroupList.Any(c => currentUserHospitalGroupIdList.Contains(c.HospitalGroupId))))
+             .WhereIf(inQuery.HospitalGroupIdList.Any(), t => t.SCPStudyList.Any(c => c.HospitalGroupList.Any(c => inQuery.HospitalGroupIdList.Contains(c.HospitalGroupId))))
              .WhereIf(inQuery.PatientHospitalGroupTagIdList.Any(), t => t.PatientHospitalGroupTagList.Any(k => inQuery.PatientHospitalGroupTagIdList.Contains(k.HospitalGroupTagId)))
              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientIdStr), t => t.PatientIdStr.Contains(inQuery.PatientIdStr))
              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientName), t => t.PatientName.Contains(inQuery.PatientName))
@@ -840,7 +844,7 @@ namespace IRaCIS.Application.Services
                             SCPStudyId = scpStudy.Id,
                             SeriesCount = scpStudy.SeriesCount,
                             StudyTime = scpStudy.StudyTime,
-                            StudyIdStr=scpStudy.StudyId,
+                            StudyIdStr = scpStudy.StudyId,
 
                             HospitalGroupList = scpStudy.HospitalGroupList.Select(t => new SCPStudyHospitalGroupInfo()
                             {