中心调研导表增加设备信息

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);

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();

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

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));