XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Test_IRC_Net10
hang 2026-08-13 15:02:23 +08:00
parent f3f24e43e3
commit bc03f00186
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
View File

@ -358,7 +358,8 @@ public class SiteSurverRejectedEventConsumer(
siteInfo.TrialSiteAliasName,//中心名称 siteInfo.TrialSiteAliasName,//中心名称
siteSurveyInfo.LatestBackReason, //驳回原因 siteSurveyInfo.LatestBackReason, //驳回原因
$"{baseUrl}/researchLogin?trialId={trialId}", //链接 $"{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); return (topicStr, htmlBodyStr);

22
IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
View File

@ -102,17 +102,17 @@ namespace IRaCIS.Core.Application.Service.Common
var fields = new List<(string FieldName, int excelIndex)>() var fields = new List<(string FieldName, int excelIndex)>()
{ {
("Parameters", 5), ("Parameters", 8),
("ManufacturerType", 6), ("ManufacturerType", 9),
("ScannerType", 7), ("ScannerType", 10),
("MagneticFieldStrengthType", 8), ("MagneticFieldStrengthType", 11),
("BodyCoilChannelCount", 9), ("BodyCoilChannelCount", 12),
("HasDedicatedPdfFatQuantificationSequence", 10), ("HasDedicatedPdfFatQuantificationSequence", 13),
("PdfFatQuantificationSequenceType", 11), ("PdfFatQuantificationSequenceType", 14),
("OtherSequenceSpecification", 11), ("OtherSequenceSpecification", 14),
("HasT2R2Correction", 12), ("HasT2R2Correction", 15),
("CanFullyExportPdfParameterMapsAndRawDicom", 13), ("CanFullyExportPdfParameterMapsAndRawDicom", 16),
("Note", 14), ("Note", 17),
}; };

5
IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
View File

@ -492,6 +492,11 @@ namespace IRaCIS.Core.Application.Contracts
public string TrialSiteName { get; set; } = String.Empty; public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { 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 public class SiteSurveyEquipmentQuery : PageInput

3
IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs
View File

@ -102,6 +102,9 @@ namespace IRaCIS.Core.Application.AutoMapper
CreateMap<SiteSurveyLog, SiteSurveyLogDTO>(); CreateMap<SiteSurveyLog, SiteSurveyLogDTO>();
CreateMap<TrialSiteEquipmentSurvey, SiteSurveyEquipmentDto>() 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.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteAliasName))
.ForMember(d => d.TrialSiteName, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteName)) .ForMember(d => d.TrialSiteName, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteName))
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteCode)); .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSiteSurvey.TrialSite.TrialSiteCode));