病灶导表修改

IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs

@@ -165,7 +165,7 @@ public static class ExcelExportHelper
             }
 
             //中文替换项目术语
-            if (isEn_US == false)
+            if (isEn_US == false && data.TrialObjectNameList.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
 
@@ -415,7 +415,7 @@ public static class ExcelExportHelper
             }
 
             //中文替换项目术语
-            if (isEn_US == false)
+            if (isEn_US == false && data.TrialObjectNameList.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
 
@@ -526,6 +526,7 @@ public static class ExcelExportHelper
                     var name = dynamicColumnConfig.ColumnNameList[i - dynamicColunmStartIndex];
 
                     titelRow.GetCell(i).SetCellValue(name);
+                    templateRow.GetCell(i).SetCellValue("");
                 }
             }
 
@@ -538,7 +539,6 @@ public static class ExcelExportHelper
                 templateStream = memoryStream2;
             }
 
-
         }
 
         #endregion

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1854,7 +1854,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             if (criterion.CriterionType == CriterionType.OCT)
             {
-                list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions });
+                list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.OCT_ReadingLession_Export });
             }
 
             switch (criterion.ArbitrationRule)
@@ -1974,15 +1974,13 @@ namespace IRaCIS.Core.Application.Service.Common
                 //病灶明细表
                 export_Template = StaticData.Export.ReadingLession_Export;
 
-                if (criterion.CriterionType == CriterionType.OCT)
-                {
-                    export_Template = StaticData.Export.OCT_ReadingLession_Export;
-                }
             }
 
+
             //病灶明细表 需要单独处理
-            if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions)
+            if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions && inQuery.ReadingExportType != ExportResult.OCT_ReadingLession_Export)
             {
+                //其他可以统一处理
                 list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
                  new
                  {
@@ -1995,7 +1993,12 @@ namespace IRaCIS.Core.Application.Service.Common
             }
             else
             {
-                //其他可以统一处理
+                //病灶明细表
+                if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
+                {
+                    export_Template = StaticData.Export.OCT_ReadingLession_Export;
+                }
+
                 var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
                  new
                  {
@@ -2067,10 +2070,16 @@ namespace IRaCIS.Core.Application.Service.Common
                             //有三部分组成  外层问题+ 没有配置病灶编号和类型+ 动态的表格问题
                             var dynamicLessionInfoList = addLessionInfoList.Union(dynamicPartialLessionInfoList).Union(item.QuestionAnswerList).ToList();
 
-                            var cloneItem = item.Clone();
-                            cloneItem.QuestionAnswerList = dynamicLessionInfoList;
+                            //OCT 多个表格，但是只导出一个表格,有的问题答案就是空的
+                            if (dynamicLessionInfoList.Count > 0)
+                            {
+
+                                var cloneItem = item.Clone();
+                                cloneItem.QuestionAnswerList = dynamicLessionInfoList;
+
+                                list.Add(cloneItem);
+                            }
 
-                            list.Add(cloneItem);
                         }
                     }
                     else

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -276,7 +276,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingTableAnswerRowInfo, CommonLessionInfo>()
                  .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))
                  .ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
-                  .ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList));
+                 .ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))));
 
             CreateMap<ReadingTableQuestionAnswer, CommonLessionQuestionAnswerInfo>()
                  .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.Lesion.RowMark))

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -88,7 +88,7 @@ namespace IRaCIS.Application.Contracts
 
         public string CriterionName { get; set; } = string.Empty;
 
-        public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
+        public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } = new List<TrialObjectNameConfig>();
     }
 
     public class TrialModalitySelectDto

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

@@ -466,12 +466,17 @@ namespace IRaCIS.Core.Domain.Share
         DetailedTableOfInterReaderAnalysisResults = 6,
 
 
+        /// <summary>
+        /// 斑块表
+        /// </summary>
+        OCT_ReadingLession_Export = 7,
+
+
         //访视一致率
-        VisitJudgeRatio_Export = 7,
+        VisitJudgeRatio_Export = 17,
 
         //阅片期一致率
-        ReadingPeriodJudgeRatio_Export = 8,
-
+        ReadingPeriodJudgeRatio_Export = 18,
 
     }