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();
}
}
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()
};