From 57b7e3f65c2fd19b4fe5a7e4d2baeb76c44b301d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 24 Jul 2025 11:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85=E7=89=87=E5=AF=BC=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs      | 28 +++++++++++++++----
 .../Service/QC/_MapConfig.cs                  |  3 +-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index dbf2c065a..368ed5700 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/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
@@ -3630,11 +3648,11 @@ namespace IRaCIS.Core.Application.Service.Common
                             VisitName = qa.SubjectVisit.VisitName,
                             CurrentQCEnum = qa.CurrentQCEnum,
 
-                            AuditTime = qa.CurrentQCEnum==CurrentQC.First?qa.SubjectVisit.PreliminaryAuditTime: (qa.CurrentQCEnum == CurrentQC.Second ? qa.SubjectVisit.ReviewAuditTime: qa.UpdateTime) ,
-                            AuditUserName = qa.CurrentQCEnum == CurrentQC.First ? qa.SubjectVisit.PreliminaryAuditUser.UserName : (qa.CurrentQCEnum == CurrentQC.Second ? qa.SubjectVisit.ReviewAuditUser.UserName : u.UserName) ,
+                            AuditTime = qa.CurrentQCEnum == CurrentQC.First ? qa.SubjectVisit.PreliminaryAuditTime : (qa.CurrentQCEnum == CurrentQC.Second ? qa.SubjectVisit.ReviewAuditTime : qa.UpdateTime),
+                            AuditUserName = qa.CurrentQCEnum == CurrentQC.First ? qa.SubjectVisit.PreliminaryAuditUser.UserName : (qa.CurrentQCEnum == CurrentQC.Second ? qa.SubjectVisit.ReviewAuditUser.UserName : u.UserName),
                             AuditUserFullName = qa.CurrentQCEnum == CurrentQC.First ? qa.SubjectVisit.PreliminaryAuditUser.FullName : (qa.CurrentQCEnum == CurrentQC.Second ? qa.SubjectVisit.ReviewAuditUser.FullName : u.FullName),
 
-                            QuestionId=qa.TrialQCQuestionConfigure.Id,
+                            QuestionId = qa.TrialQCQuestionConfigure.Id,
                             QuesitonName = qa.TrialQCQuestionConfigure.QuestionName,
                             ShowOrder = qa.TrialQCQuestionConfigure.ShowOrder,
                             Answer = qa.Answer,
@@ -3657,7 +3675,7 @@ namespace IRaCIS.Core.Application.Service.Common
                      AuditUserName = g.Select(t => t.AuditUserName).First(),
                      AuditUserFullName = g.Select(t => t.AuditUserFullName).First(),
 
-                     QuestionAnswerList = g.Select(t => new QCQuestionAnswerExport() { Answer = t.Answer, QuestionName = t.QuesitonName, ShowOrder = t.ShowOrder ,QuestionId=t.QuestionId}).OrderBy(t => t.ShowOrder).ToList()
+                     QuestionAnswerList = g.Select(t => new QCQuestionAnswerExport() { Answer = t.Answer, QuestionName = t.QuesitonName, ShowOrder = t.ShowOrder, QuestionId = t.QuestionId }).OrderBy(t => t.ShowOrder).ToList()
 
 
                  }).OrderBy(t => t.TrialSiteCode).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToList();
@@ -3669,7 +3687,7 @@ namespace IRaCIS.Core.Application.Service.Common
             exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
 
 
-            var columNameList = _trialQCQuestionRepository.Where(t=>t.TrialId==trialId).OrderBy(t=>t.ShowOrder).Select(t=>new {t.QuestionName,t.Id}).ToList();
+            var columNameList = _trialQCQuestionRepository.Where(t => t.TrialId == trialId).OrderBy(t => t.ShowOrder).Select(t => new { t.QuestionName, t.Id }).ToList();
 
 
             var dynamicColumnConfig = new DynamicColumnConfig()
diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 3212a2882..971964947 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/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,
                 })))
                ;