一致性分析自定义阅片导表修改

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

@@ -2215,6 +2215,24 @@ namespace IRaCIS.Core.Application.Service.Common
             else if (criterion.CriterionType == CriterionType.PCWG3)
             {
 
+            }
+            else if (criterion.CriterionType == CriterionType.SelfDefine)
+            {
+                //自定义的又问题名称重复  所以统一加上组名
+
+                //有重复的就加，没有重复的就不加
+                if (list.Any(t => t.QuestionAnswerList.Select(t => t.QuestionName).Count() != t.QuestionAnswerList.Select(t => t.QuestionName).Distinct().Count()))
+                {
+                    foreach (var item in list)
+                    {
+                        foreach (var qs in item.QuestionAnswerList)
+                        {
+                            qs.QuestionName = qs.Group + "_" + qs.QuestionName;
+                        }
+                    }
+                }
+
+
             }
 
             #endregion

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

@@ -249,7 +249,8 @@ namespace IRaCIS.Core.Application.Service
                     QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
                     QuestionId = c.ReadingQuestionTrial.Id,
                     TranslateDicName = c.ReadingQuestionTrial.DictionaryCode,
-                    CDISCCode = c.ReadingQuestionTrial.CDISCCode
+                    CDISCCode = c.ReadingQuestionTrial.CDISCCode,
+                    Group= isEn_Us ? c.ReadingQuestionTrial.GroupEnName : c.ReadingQuestionTrial.GroupName,
                 })))
                ;