From 9948ea8df32aaa1b0f4ce78054bbad847afc6846 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 13 Aug 2026 15:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Consumer/SiteSurverEmailConsumer.cs       |  3 +-
 .../Common/Export/ExcelExportService.cs       | 28 +++++++++----------
 .../DTO/TrialSiteSurveyViewModel.cs           |  5 ++++
 .../Service/SiteSurvey/_MapConfig.cs          |  3 ++
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
index 83d8e0eed..ec9a855e9 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
@@ -358,7 +358,8 @@ public class SiteSurverRejectedEventConsumer(
                     siteInfo.TrialSiteAliasName,//中心名称
                     siteSurveyInfo.LatestBackReason,  //驳回原因
                     $"{baseUrl}/researchLogin?trialId={trialId}",  //链接
-                       (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
+                       (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none"),
+                       trialInfo.LinkVerificationCode.IsNullOrEmpty()? trialInfo.ResearchProgramNo: trialInfo.LinkVerificationCode
                         );
 
                     return (topicStr, htmlBodyStr);
diff --git a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
index 6ec1759e7..b5d9c719f 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
@@ -99,21 +99,21 @@ namespace IRaCIS.Core.Application.Service.Common
             var config = JsonConvert.DeserializeObject<TrialExtraConfig>(siteSurveryConfig) ?? new TrialExtraConfig();
 
 
-            var fields = new List<(string FieldName, int excelIndex)>()
-                {
+             var fields = new List<(string FieldName, int excelIndex)>()
+                 {
 
-                   ("Parameters", 5),
-                   ("ManufacturerType", 6),
-                   ("ScannerType", 7),
-                   ("MagneticFieldStrengthType", 8),
-                   ("BodyCoilChannelCount", 9),
-                   ("HasDedicatedPdfFatQuantificationSequence", 10),
-                   ("PdfFatQuantificationSequenceType", 11),
-                   ("OtherSequenceSpecification", 11),
-                   ("HasT2R2Correction", 12),
-                   ("CanFullyExportPdfParameterMapsAndRawDicom", 13),
-                   ("Note", 14),
-                };
+                    ("Parameters", 8),
+                    ("ManufacturerType", 9),
+                    ("ScannerType", 10),
+                    ("MagneticFieldStrengthType", 11),
+                    ("BodyCoilChannelCount", 12),
+                    ("HasDedicatedPdfFatQuantificationSequence", 13),
+                    ("PdfFatQuantificationSequenceType", 14),
+                    ("OtherSequenceSpecification", 14),
+                    ("HasT2R2Correction", 15),
+                    ("CanFullyExportPdfParameterMapsAndRawDicom", 16),
+                    ("Note", 17),
+                 };
 
 
             var viewNameList = config.EquipmentControlFieldList.Where(t => t.IsView == true).Select(t => t.FiledName).ToList();
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
index cb542cd50..3a0948654 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
@@ -492,6 +492,11 @@ namespace IRaCIS.Core.Application.Contracts
         public string TrialSiteName { get; set; } = String.Empty;
 
         public string TrialSiteAliasName { get; set; } = String.Empty;
+
+
+        public string UserName { get; set; } = string.Empty;
+        public string Phone { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
     }
 
     public class SiteSurveyEquipmentQuery : PageInput
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs b/IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs
index 48913a0bf..a15587eb9 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs
@@ -102,6 +102,9 @@ namespace IRaCIS.Core.Application.AutoMapper
             CreateMap<SiteSurveyLog, SiteSurveyLogDTO>();
 
             CreateMap<TrialSiteEquipmentSurvey, SiteSurveyEquipmentDto>()
+              .ForMember(d => d.Email, u => u.MapFrom(s => s.TrialSiteSurvey.Email))
+             .ForMember(d => d.Phone, u => u.MapFrom(s => s.TrialSiteSurvey.Phone))
+             .ForMember(d => d.UserName, u => u.MapFrom(s => s.TrialSiteSurvey.UserName))
              .ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteAliasName))
              .ForMember(d => d.TrialSiteName, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteName))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteCode));