合并

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

@@ -1591,13 +1591,19 @@ namespace IRaCIS.Core.Application.Service.Common
             //评估病灶明细
             DetailedOfEvaluatedLesion = 3,
 
+            //阅片结果
             CommonReading_Export = 4,
+
+            //阅片结果明细
             CommonReadingDetail_Export = 5,
 
+            //裁判阅片明细
             CommonJudgeReadingDetail_Export = 6,
 
+            //访视一致率
             VisitJudgeRatio_Export = 7,
 
+            //阅片期一致率
             ReadingPeriodJudgeRatio_Export = 8,
 
         }
@@ -2214,7 +2220,11 @@ namespace IRaCIS.Core.Application.Service.Common
 
                         var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
 
-                        findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
+                        if (findItem != null)
+                        {
+                            findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
+                        }
+
                     }
 
                     if (item.IsBaseline == true)
@@ -2239,7 +2249,10 @@ namespace IRaCIS.Core.Application.Service.Common
 
                         var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
 
-                        findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
+                        if (findItem != null)
+                        {
+                            findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
+                        }
                     }
 
                     if (item.IsBaseline == true)