From b217967d9c002c89c0a5d395a38c025e758c7b8e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 9 Nov 2023 15:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8=E6=9F=A5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/EmailTemplate/UserOptCommon.html  |  2 +-
 .../ConsistencyVerificationHandler.cs         | 47 +++++++++++++++----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
index 2aadf9005..335aa4ca9 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
@@ -8,7 +8,7 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Hello  {0},
+                Hello {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 感谢您使用展影云平台。
diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
index 016c334b5..18a37b56d 100644
--- a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
+++ b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
@@ -113,13 +113,25 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
 
                     StringBuilder dialogMsg = new StringBuilder();
                     //---您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：
-                    dialogMsg.Append(StaticData.International("ConsistencyVerification_Img"));
+                    dialogMsg.Append($"<div>{StaticData.International("ConsistencyVerification_Img")}</div>");
                     var num = 0;
                     List<ParamInfoDto> paramInfoList = new List<ParamInfoDto>();
+
                     foreach (var item in dbVisitStudyList)
                     {
                         num++;
-                        dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {item.StudyDate} {(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
+
+                        if (_userInfo.IsEn_Us)
+                        {
+                            dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")}</div>");
+
+                        }
+                        else
+                        {
+                            dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
+
+                        }
+
                         paramInfoList.Add(new ParamInfoDto()
                         {
                             Modality = item.Modality,
@@ -205,9 +217,8 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                         // ETC  和系统的有区别
                         else
                         {
-                            dialogMsg.AppendLine($"<br/>");
-                            //存在问题如下：
-                            dialogMsg.AppendLine($"<br><span style='color: #f00'>{StaticData.International("ConsistencyVerification_Prob")}</span>");
+                            //"Problems are as follows:
+                            dialogMsg.AppendLine($"<br/><div style='color: #f00'>{StaticData.International("ConsistencyVerification_Prob")}</div>");
 
                             num = 0;
                             foreach (var item in dbExceptExcel)
@@ -215,8 +226,16 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                                 num++;
                                 //影像检查(EDC 缺少)   ConsistencyVerification_EdcL
 
+                                if (_userInfo.IsEn_Us) 
+                                {
+                                    dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_EdcL")} </div>");
+                                }
+                                else
+                                {
+                                    dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
+
+                                }
 
-                                dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
 
                             }
 
@@ -225,12 +244,22 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
                                 num++;
 
                                 // 影像检查(IRC 缺少)
-                                dialogMsg.AppendLine($"<span style='text-indent: 20px;'><br>{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
-          
+
+                                if (_userInfo.IsEn_Us)
+                                {
+                                    dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {item.StudyDate} {item.Modality} {StaticData.International("ConsistencyVerification_ImgC")} {StaticData.International("ConsistencyVerification_IrcL")}</div>");
+
+                                }
+                                else
+                                {
+                                    dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}</div>");
+
+                                }
+
                             }
 
                             dialogMsg.AppendLine($"<br/>");
-                            dialogMsg.AppendLine(@$"<br>{StaticData.International("ConsistencyVerification_Desc")}");
+                            dialogMsg.AppendLine(@$"<div>{StaticData.International("ConsistencyVerification_Desc")}<div/>");
 
                             //---根据导入的一致性核查数据，请确认本访视以下不一致检查项信息：
                             dbSV.CheckResult = StaticData.International("ConsistencyVerification_Conf") + String.Join(" | ", dbExceptExcel.Select(t => $"{StaticData.International("ConsistencyVerification_Edc")}{t.StudyDate} {t.Modality} ")) + "  |  "