IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs

@@ -161,9 +161,8 @@ public static class SendEmailHelper
 
         if (sMTPEmailConfig.ToMailAddressList.Count == 0)
         {
-            return;
             //---没有收件人
-            //throw new ArgumentException(I18n.T("SendEmail_NoRecipient"));
+            throw new ArgumentException(I18n.T("SendEmail_NoRecipient"));
         }
         else
         {

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2340,7 +2340,7 @@
             <param name="sendFileRelativePath"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.DealEnrollAnswer(System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CriterionType,System.Guid,IRaCIS.Core.Domain.Models.UserWorkLanguage)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.DealEnrollAnswer(System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CriterionType,System.Guid)">
             <summary>
             获取入组结果
             </summary>
@@ -2348,10 +2348,9 @@
             <param name="subjectVisitId"></param>
             <param name="criterionType"></param>
             <param name="trialReadingCriterionId"></param>
-            <param name="userWorkLanguage"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.TranslatePdStateAsync(System.Guid,IRaCIS.Core.Domain.Share.ReadingCategory,IRaCIS.Core.Domain.Share.CriterionType,IRaCIS.Core.Domain.Models.UserWorkLanguage,System.Nullable{System.Boolean})">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.TranslatePdStateAsync(System.Guid,IRaCIS.Core.Domain.Share.ReadingCategory,IRaCIS.Core.Domain.Share.CriterionType,System.Nullable{System.Boolean})">
             <summary>
             获取PD 结果
             </summary>
@@ -2359,7 +2358,6 @@
             <param name="readingCategory"> 任务类型</param>
             <param name="criterionType">标准类型</param>
             <param name="IsGlobalGenerate">  是否是全局产生（区分裁判任务）</param>
-            <param name="userWorkLanguage"></param>
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>

IRaCIS.Core.Application/Service/Document/EmailSendService.cs

@@ -62,18 +62,10 @@ namespace IRaCIS.Core.Application.Service
 
             }).FirstNotNullAsync();
 
-            //找到当前收件人语言
+            var isEn_us = _userInfo.IsEn_Us;
-            var workLanguageList = _trialUserRoleRepository.Where(t => t.TrialId == taskInfo.TrialId && t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => t.UserRole.IdentityUser.UserWorkLanguage).Distinct().ToList();
-
-            foreach (var workLanguage in workLanguageList)
-            {
-                //设置工作语言
-                var isEn_us = workLanguage == UserWorkLanguage.US;
 
             var resultStr = isEn_us ? (result == true ? "Yes" : "No") : (result == true ? "是" : "否");
 
-
-
             if (isEnrollment == true)
             {
                 Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
@@ -105,7 +97,6 @@ namespace IRaCIS.Core.Application.Service
                 await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
             }
 
-            }
 
         }
 
@@ -142,12 +133,8 @@ namespace IRaCIS.Core.Application.Service
 
                 var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
 
-                //设置工作语言
-                var workLanguage = isEn_us ? UserWorkLanguage.US : UserWorkLanguage.CN;
-
-
                 //处理替换公司名
-                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr, workLanguage);
+                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr);
 
 
                 sendEmailConfig.TopicDescription = topicStr;
@@ -163,10 +150,10 @@ namespace IRaCIS.Core.Application.Service
 
                 var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();
 
-                var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
+                var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();
 
-                //过滤当前语言
+
-                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum)).Where(t=>t.UserWorkLanguage==workLanguage)
+                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
                    .ToList();
 
                 //收件人 有CRC  CRA  ， CRC  CRA的账户要按照中心发送
@@ -204,6 +191,11 @@ namespace IRaCIS.Core.Application.Service
                     sendEmailConfig.HtmlBodyStr = htmlBodyStr.Replace(EmailNamePlaceholder, string.Join(isEn_us ? ", " : "、", toUserList.Select(t => t.FullName).ToList()));
                 }
 
+                if (toUserList.Count == 0)
+                {
+                    //---没有收件人，无法发送邮件
+                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
+                }
 
 
                 if (trialEmailConfig.FromEmail.Contains("@") && !string.IsNullOrEmpty(trialEmailConfig.FromEmail))
@@ -243,7 +235,20 @@ namespace IRaCIS.Core.Application.Service
                     }
                 }
 
+                //邮件附件  这里是原格式发送，不是PDF
 
+                //if (trialEmailConfig.AttachCNPath != string.Empty && trialEmailConfig.AttachPath != string.Empty)
+                //{
+                //    var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us? trialEmailConfig.AttachName: trialEmailConfig.AttachNameCN);
+
+                //    //先预先生成了邮件，发送预先生成的邮件
+                //    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
+                //    {
+                //        FileName = $"{attachPrefix}_{Path.GetFileName(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}",
+
+                //        FileStream = File.OpenRead(phyPath),
+                //    });
+                //}
 
                 return (trialEmailConfig, sendEmailConfig);
 

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -24,7 +24,6 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Spire.Doc;
 using System.Linq.Dynamic.Core;
-using System.Runtime;
 using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.Application.Service
@@ -195,15 +194,7 @@ namespace IRaCIS.Core.Application.Service
         /// <exception cref="BusinessValidationFailedException"></exception>
         public async Task<string> BaseBusinessScenarioSendEmailAsync(Guid visitTaskId, bool? isHandSend, EmailStoreSendMode emailStoreMode, string sendFileRelativePath)
         {
-
+            var isEn_us = _userInfo.IsEn_Us;
-            //简单处理，找到该中心的语言 设置工作语言
-
-            var country = _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => t.Subject.TrialSite.Country).First();
-
-            var isEn_us = country == StaticData.SiteCountry.US;
-
-            var workLanguage = isEn_us ? UserWorkLanguage.US : UserWorkLanguage.CN;
-
             EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
 
             var enrollReplace = "";
@@ -339,7 +330,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_Enroll_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
-                    enrollReplace = isEn_us ? findItem.Value : findItem.ValueCN;
+                    enrollReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
 
                     //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
 
@@ -357,7 +348,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         bool isEnroll = false;
 
-                        (answer, isEnroll) = await DealEnrollAnswer(visitTaskId, (Guid)taskInfo.SourceSubjectVisitId, taskInfo.CriterionType, taskInfo.TrialReadingCriterionId, workLanguage);
+                        (answer, isEnroll) = await DealEnrollAnswer(visitTaskId, (Guid)taskInfo.SourceSubjectVisitId, taskInfo.CriterionType, taskInfo.TrialReadingCriterionId);
 
                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
                     }
@@ -366,7 +357,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_PD_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
-                    PdReplace = isEn_us ? findItem.Value : findItem.ValueCN;
+                    PdReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
 
                     //有序
 
@@ -393,7 +384,7 @@ namespace IRaCIS.Core.Application.Service
                                 if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
                                 {
 
-                                    answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType, workLanguage);
+                                    answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
 
 
                                     isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
@@ -403,7 +394,7 @@ namespace IRaCIS.Core.Application.Service
                                 else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
                                 {
                                     var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First()!.JudgeResultTaskId!.Value;
-                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType, workLanguage);
+                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
 
                                     isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
 
@@ -440,7 +431,7 @@ namespace IRaCIS.Core.Application.Service
                                     if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Global) == 2)
                                     {
 
-                                        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType, workLanguage);
+                                        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
 
                                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
                                     }
@@ -449,7 +440,7 @@ namespace IRaCIS.Core.Application.Service
                                     {
 
                                         var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId!.Value;
-                                        answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType, workLanguage);
+                                        answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType);
 
                                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
 
@@ -622,7 +613,7 @@ namespace IRaCIS.Core.Application.Service
                     //先预先生成了邮件，发送预先生成的邮件
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(isEn_us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
+                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
 
                         FileStream = File.OpenRead(phyPath),
                     });
@@ -648,7 +639,7 @@ namespace IRaCIS.Core.Application.Service
 
                 };
 
-                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
+                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
 
                 //获取从word 到 PDF的路径
                 var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.TrialSiteId, taskInfo.SubjectId, true);
@@ -738,7 +729,7 @@ namespace IRaCIS.Core.Application.Service
                     pdfMemoryStream.Seek(0, SeekOrigin.Begin);
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(isEn_us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
+                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
 
                         FileStream = pdfMemoryStream
                     });
@@ -1076,14 +1067,11 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="subjectVisitId"></param>
         /// <param name="criterionType"></param>
         /// <param name="trialReadingCriterionId"></param>
-        /// <param name="userWorkLanguage"></param>
         /// <returns></returns>
-        private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId, UserWorkLanguage userWorkLanguage)
+        private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId)
         {
 
-            var isEn_us = userWorkLanguage == UserWorkLanguage.US;
+            var enrollAnswer = _userInfo.IsEn_Us ? "No" : "否";
-
-            var enrollAnswer = isEn_us ? "No" : "否";
             var isEnroll = false;
 
             switch (criterionType)
@@ -1100,7 +1088,7 @@ namespace IRaCIS.Core.Application.Service
                     if (await _readingTableQuestionAnswerRepository.Where().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
                x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
                     {
-                        enrollAnswer = isEn_us ? "Yes" : "是";
+                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
                         isEnroll = true;
                     }
 
@@ -1114,7 +1102,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
                     bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1);
                     if (exists)
                     {
-                        enrollAnswer = isEn_us ? "Yes" : "是";
+                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
                         isEnroll = true;
                     }
 
@@ -1180,10 +1168,9 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
         /// <param name="readingCategory"> 任务类型</param>
         /// <param name="criterionType">标准类型</param>
         /// <param name="IsGlobalGenerate">  是否是全局产生（区分裁判任务）</param>
-        /// <param name="userWorkLanguage"></param>
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
-        private async Task<string> TranslatePdStateAsync(Guid visitTaskId, ReadingCategory readingCategory, CriterionType criterionType, UserWorkLanguage userWorkLanguage, bool? IsGlobalGenerate = null )
+        private async Task<string> TranslatePdStateAsync(Guid visitTaskId, ReadingCategory readingCategory, CriterionType criterionType, bool? IsGlobalGenerate = null)
         {
 
             var answer = string.Empty;
@@ -1374,7 +1361,6 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
                 throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidTaskTypeForEmailSending"]);
             }
 
-            var isEn_us = userWorkLanguage == UserWorkLanguage.US;
 
             switch (criterionType)
             {
@@ -1386,11 +1372,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == OverallAssessment.PD.GetEnumInt())
                     {
-                        answer = isEn_us ? "Yes" : "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = isEn_us ? "No" : "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
 
                     break;
@@ -1398,11 +1384,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == OverallAssessment.iCPD.GetEnumInt())
                     {
-                        answer = isEn_us ? "Yes" : "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = isEn_us ? "No" : "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
 
                     break;
@@ -1410,11 +1396,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == CTMRIOverallAssessment.PD.GetEnumInt())
                     {
-                        answer = isEn_us ? "Yes" : "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = isEn_us ? "No" : "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
 
                     break;
@@ -1422,11 +1408,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == ImagingOverallAssessment_Lugano.PMDPD.GetEnumInt())
                     {
-                        answer = isEn_us ? "Yes" : "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = isEn_us ? "No" : "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
 
                     break;
@@ -1437,11 +1423,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == VisitTumorEvaluation.PD.GetEnumInt())
                     {
-                        answer = isEn_us ? "Yes" : "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = isEn_us ? "No" : "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
                     break;