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

uat-ivus-oct-再次修改11

Uat_IRC_Net8
hang 2025-12-16 15:24:16 +08:00
parent ac1eaf51eb
commit 25cf2555d4
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
View File

@ -47,6 +47,8 @@ namespace IRaCIS.Core.Application.Contracts
//质控过程中并且不是IQC时，可以看到删除的（不需要忽略过滤器） 质控中iqc 也需要看到删除的 //质控过程中并且不是IQC时，可以看到删除的（不需要忽略过滤器） 质控中iqc 也需要看到删除的
var isViewDelete = !isQCFinished; var isViewDelete = !isQCFinished;
var isFilterIVUSNoneDicom = false;
IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default; IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
if (visitTaskId == null || visitTaskId == Guid.Empty) if (visitTaskId == null || visitTaskId == Guid.Empty)
{ {
@ -71,6 +73,12 @@ namespace IRaCIS.Core.Application.Contracts
} }
if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
.Where(t => t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT).Distinct().Count() == 2
)
{
isFilterIVUSNoneDicom = true;
}
} }
else else
{ {
@ -97,13 +105,7 @@ namespace IRaCIS.Core.Application.Contracts
} }
var isFilterIVUSNoneDicom = false;
if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
.Where(t => t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT).Distinct().Count() == 2
)
{
isFilterIVUSNoneDicom = true;
}
var list = await noneDicomStudyQueryable.Where(t => isFilterIVUSNoneDicom ? t.Modality != "IVUS" : true) var list = await noneDicomStudyQueryable.Where(t => isFilterIVUSNoneDicom ? t.Modality != "IVUS" : true)
.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync(); .OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();

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

@ -770,7 +770,9 @@ namespace IRaCIS.Core.Application.Services
#region 非Dicom 检查查询 #region 非Dicom 检查查询
var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId && x.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip))) var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId)
//iVUS 存在空检查
.WhereIf(taskInfo.CriterionType != CriterionType.IVUS, x => x.NoneDicomFileList.Any(t => !t.FileType.Contains(StaticData.FileType.Zip)))
.Where(t => t.IsReading) .Where(t => t.IsReading)
.WhereIf(taskInfo.IsImageFilter, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|")) .WhereIf(taskInfo.IsImageFilter, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
.ToListAsync(); .ToListAsync();