diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs b/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs index aa7f44b6b..f02d835e0 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs @@ -134,7 +134,7 @@ Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr inDto.DictionaryList.ForEach(x => { - var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode == x.DictionaryCode).FirstOrDefault(); + var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode.Equals(x.DictionaryCode,StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); result.Add(dic == null ? string.Empty : (inDto.IsEn_US ? dic.Value : dic.ValueCN)); }); diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs index 8f4b9aa44..dbdab6bce 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs @@ -261,6 +261,7 @@ public class ImageConsumer( { var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US; + inDto.SubjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisit.Id).Include(x => x.Subject).FirstNotNullAsync(); // 获取项目信息 var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inDto.TrialId); @@ -324,7 +325,7 @@ public class ImageConsumer( List dictionaryDtos = new List() { - new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString(), }, //是否加急 + new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急 }; if (inDto.Scenario == EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading) { @@ -332,7 +333,7 @@ public class ImageConsumer( } else { - dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackState", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果 + dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果 }