From 2ac995bf398a7c7152a63580d395e140e916010d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 23 Oct 2024 17:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=B1=BB?=
=?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 30 +++++++++++++
.../Service/Common/ExcelExportService.cs | 43 +++++++++++--------
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 11 +++++
3 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2fbc28375..f7ba62681 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -9266,6 +9266,11 @@
表格问题类型
+
+
+ 分类问题类型
+
+
自定义计算标记
@@ -9379,6 +9384,11 @@
数值类型
+
+
+ 分类问题类型
+
+
问题分类
@@ -9807,11 +9817,21 @@
问题英文分组
+
+
+ 分类问题类型
+
+
导出标识
+
+
+ 分类问题类型
+
+
分类算法
@@ -10187,6 +10207,11 @@
图片数量
+
+
+ 分类问题类型
+
+
导出标识
@@ -10402,6 +10427,11 @@
Id
+
+
+ 分类问题类型
+
+
导出标识
diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index e8d3d1f1c..d9f17216e 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -1577,35 +1577,38 @@ namespace IRaCIS.Core.Application.Service.Common
public string FileName { get; set; }
- public ExportCatogory ExportCatogory { get; set; }
+ public ExportResult ExportCatogory { get; set; }
}
public enum ExportCatogory
{
- // 整体肿瘤评估
- OverallTumorEvaluation = 1,
+ //// 整体肿瘤评估
+ //OverallTumorEvaluation = 1,
- //肿瘤疗效评估
- EvaluationOfTumorEfficacy = 2,
+ ////肿瘤疗效评估
+ //EvaluationOfTumorEfficacy = 2,
+
+ ////评估病灶明细
+ //DetailedOfEvaluatedLesion = 3,
+
+ //阅片结果
+ CommonReading_Export = 1,
+
+ //阅片结果明细
+ CommonReadingDetail_Export = 2,
//评估病灶明细
DetailedOfEvaluatedLesion = 3,
- //阅片结果
- CommonReading_Export = 4,
-
- //阅片结果明细
- CommonReadingDetail_Export = 5,
-
//裁判阅片明细
- CommonJudgeReadingDetail_Export = 6,
+ CommonJudgeReadingDetail_Export = 4,
//访视一致率
- VisitJudgeRatio_Export = 7,
+ VisitJudgeRatio_Export = 5,
//阅片期一致率
- ReadingPeriodJudgeRatio_Export = 8,
+ ReadingPeriodJudgeRatio_Export = 6,
}
@@ -1935,11 +1938,13 @@ namespace IRaCIS.Core.Application.Service.Common
var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync();
- list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReading_Export, ExportCatogory = ExportCatogory.CommonReading_Export });
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReading_Export, ExportCatogory = ExportResult.TableOfAssessmentResults });
- list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReadingDetail_Export, ExportCatogory = ExportCatogory.CommonReadingDetail_Export });
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReadingDetail_Export, ExportCatogory = ExportResult.DetailedTableOfAssessmentResults });
- list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonJudgeReadingDetail_Export, ExportCatogory = ExportCatogory.CommonJudgeReadingDetail_Export });
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonJudgeReadingDetail_Export, ExportCatogory = ExportResult.DetailedTableOfAdjudicationResults });
+
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions });
switch (criterion.ArbitrationRule)
{
@@ -1947,11 +1952,11 @@ namespace IRaCIS.Core.Application.Service.Common
break;
case ArbitrationRule.Visit:
- list.Add(new ExportDocumentDes() { Code = StaticData.Export.VisitJudgeRatio_Export, ExportCatogory = ExportCatogory.VisitJudgeRatio_Export });
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.VisitJudgeRatio_Export, ExportCatogory = ExportResult.VisitJudgeRatio_Export });
break;
case ArbitrationRule.Reading:
- list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingPeriodJudgeRatio_Export, ExportCatogory = ExportCatogory.ReadingPeriodJudgeRatio_Export });
+ list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingPeriodJudgeRatio_Export, ExportCatogory = ExportResult.ReadingPeriodJudgeRatio_Export });
break;
case ArbitrationRule.NA:
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 682af1fd8..bc761779e 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -441,6 +441,17 @@ namespace IRaCIS.Core.Domain.Share
/// 组间一致性分析结果表
///
DetailedTableOfInterReaderAnalysisResults = 6,
+
+
+
+ //访视一致率
+ VisitJudgeRatio_Export = 10,
+
+ //阅片期一致率
+ ReadingPeriodJudgeRatio_Export = 11,
+
+
+
}