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

修改查询
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-08-21 13:58:56 +08:00
parent 3a65046c48
commit 7542c20bcc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
View File

@ -278,7 +278,7 @@ namespace IRaCIS.Application.Contracts
public List<string> CurrentUserHospitalGroupList { get; set; } = new List<string>(); 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();
} }

10
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -54,6 +54,7 @@ using System.Threading.Channels;
using NPOI.HSSF.Record.Chart; using NPOI.HSSF.Record.Chart;
using IRaCIS.Core.Application.Helper.OtherTool; using IRaCIS.Core.Application.Helper.OtherTool;
using IRaCIS.Core.Infrastructure.Extention; using IRaCIS.Core.Infrastructure.Extention;
using DocumentFormat.OpenXml.Drawing.Charts;
namespace IRaCIS.Application.Services namespace IRaCIS.Application.Services
@ -63,6 +64,7 @@ namespace IRaCIS.Application.Services
IRepository<SubjectPatient> _subjectPatientRepository, IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository, IRepository<SubjectPatient> _subjectPatientRepository, IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
IRepository<Trial> _trialRepository, IRepository<Trial> _trialRepository,
IRepository<SCPPatient> _patientRepository, IRepository<SCPPatient> _patientRepository,
IRepository<HospitalGroup> _hospitalGroupRepository,
IRepository<SCPStudy> _studyRepository, IRepository<SCPStudy> _studyRepository,
IRepository<Subject> _subjectRepository, IRepository<Subject> _subjectRepository,
IRepository<SubjectVisit> _subjectVisitRepository, 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)); var pageList = await resultQuery.ToPagedListAsync(inQuery, nameof(PatientQueryView.PatientIdStr));
@ -669,6 +671,8 @@ namespace IRaCIS.Application.Services
if (isAdminOrOA) if (isAdminOrOA)
{ {
//不处理，默认看所有 //不处理，默认看所有
item.CurrentUserHospitalGroupList = allHospitalGroupList;
} }
else else
{ {
@ -790,11 +794,15 @@ namespace IRaCIS.Application.Services
var pageList = await query.ToPagedListAsync(inQuery, nameof(PatientStudySimpleView.StudyTime)); 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) foreach (var item in pageList.CurrentPageData)
{ {
if (isAdminOrOA) if (isAdminOrOA)
{ {
//不处理，默认看所有 //不处理，默认看所有
item.CurrentUserHospitalGroupList = allHospitalGroupList;
} }
else else
{ {