修改导出类别

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9266,6 +9266,11 @@
             表格问题类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CustomCalculateMark">
             <summary>
             自定义计算标记
@@ -9379,6 +9384,11 @@
             数值类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.QuestionClassify">
             <summary>
             问题分类
@@ -9807,11 +9817,21 @@
             问题英文分组
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ExportIdentification">
             <summary>
             导出标识
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyAlgorithms">
             <summary>
             分类算法
@@ -10187,6 +10207,11 @@
             图片数量
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportIdentification">
             <summary>
             导出标识
@@ -10402,6 +10427,11 @@
             Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ClassifyType">
+            <summary>
+            分类问题类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ExportIdentification">
             <summary>
             导出标识

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:

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -441,6 +441,17 @@ namespace IRaCIS.Core.Domain.Share
         /// 组间一致性分析结果表
         /// </summary>
         DetailedTableOfInterReaderAnalysisResults = 6,
+
+
+
+        //访视一致率
+        VisitJudgeRatio_Export = 10,
+
+        //阅片期一致率
+        ReadingPeriodJudgeRatio_Export = 11,
+
+
+
     }