From 287dd5d0bf4010a943b8c3d064950c20346056c3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 29 Jul 2026 11:47:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Properties/launchSettings.json | 9 +++++++++ .../IRaCIS.Core.Application.xml | 15 +++++++++++++++ .../Service/Common/Export/ExcelExportService.cs | 10 +++++----- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json index 3b79cdfad..9590f4425 100644 --- a/IRaCIS.Core.API/Properties/launchSettings.json +++ b/IRaCIS.Core.API/Properties/launchSettings.json @@ -34,6 +34,15 @@ }, "applicationUrl": "http://0.0.0.0:6100" }, + "IRaCIS.Uat_Rayplus": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Uat_Rayplus", + "ASPNETCORE_OpenSwagger": "true" + }, + "applicationUrl": "http://0.0.0.0:6100" + }, "IRaCIS.Test_IRC_PGSQL": { "commandName": "Project", "launchBrowser": true, diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 7b85b8c9d..6e76f3bf1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -9013,6 +9013,11 @@ 外弹力膜面积- 管腔面积 + + + 斑块破裂 + + 帧数 @@ -9063,6 +9068,16 @@ 脂质角度 + + + 斑块破裂 + + + + + 斑块愈合 + + 斑块编号 diff --git a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs index f0e24255c..d6c014b73 100644 --- a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs @@ -2930,7 +2930,7 @@ namespace IRaCIS.Core.Application.Service.Common arbitrationRule = criterion.ArbitrationRule, trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us - }).ToListAsync(); + }).AsSplitQuery().ToListAsync(); } //肿瘤标准 病灶明细表 按照病灶级别 (OCT 暂时不删除，先看是否能覆盖) @@ -2949,7 +2949,7 @@ namespace IRaCIS.Core.Application.Service.Common arbitrationRule = criterion.ArbitrationRule, trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us - }).ToListAsync(); + }).AsSplitQuery().ToListAsync(); } // 非肿瘤标准 包括自定义，以及系统非肿瘤 会配置到表格层级 问题名称是 表格名称_表格子问题名 @@ -2967,7 +2967,7 @@ namespace IRaCIS.Core.Application.Service.Common arbitrationRule = criterion.ArbitrationRule, trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us - }).ToListAsync(); + }).AsSplitQuery().ToListAsync(); } // CDISC 导出 只管到 外层问题层级 和阅片结果表是保持一致 @@ -2985,7 +2985,7 @@ namespace IRaCIS.Core.Application.Service.Common arbitrationRule = criterion.ArbitrationRule, trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us - }).ToListAsync(); + }).AsSplitQuery().ToListAsync(); } else { @@ -2997,7 +2997,7 @@ namespace IRaCIS.Core.Application.Service.Common arbitrationRule = criterion.ArbitrationRule, trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us - }).ToListAsync(); + }).AsSplitQuery().ToListAsync(); } } From 799c57912151e4946f8a06e598e32ce4e8011823 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 29 Jul 2026 15:08:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=20-ivus=20=E7=A9=BA?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=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/QC/QCListService.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index aa201f5ef..894d105ec 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -455,6 +455,15 @@ namespace IRaCIS.Core.Application.Image.QA } + var isFilterIVUSNoneDicom = false; + //ivus-在访视的时候visitTaskId==null 需要过滤掉空检查 ，但是在靶段标注的查看访视级别的时候不能过滤 + if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList) + .Where(t => (t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT) && t.IsConfirm).Distinct().Count() == 2 + ) + { + isFilterIVUSNoneDicom = true; + } + return new TrialVisitQADTO { IsSupportQCDownloadImage = isSupportQCImageDownload, @@ -467,7 +476,7 @@ namespace IRaCIS.Core.Application.Image.QA ExistsManual = (await _IReadingImageTaskService.GetManualList(new GetManualListInDto() { TrialId = sv.TrialId })).Count() > 0, SeriesList = temp.SeriesList, RelationInfo = await GetVisitQCSubjectInfo(subjectVisitId), - NoneDicomStudyList = await _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: true).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(), + NoneDicomStudyList = await _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: true).Where(t => isFilterIVUSNoneDicom ? t.Modality != "IVUS" : true).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(), SubjectClinicalData = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId) .ProjectTo(_mapper.ConfigurationProvider, new { subjectVisitId = subjectVisitId, token = _userInfo.UserToken }).FirstOrDefaultAsync() };