diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json
index d727b4e79..11b9ff698 100644
--- a/IRaCIS.Core.API/appsettings.Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json
@@ -53,6 +53,8 @@
"AuthorizationCode": "ExtImg@2022",
"SiteUrl": "http://irc.extimaging.com/login",
"CompanyName": "Extensive Imaging",
- "CompanyNameCN": "上海展影医疗科技有限公司"
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Extensive Imaging",
+ "CompanyShortNameCN": "展影医疗"
}
}
diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json
index 251a33369..c25e9e021 100644
--- a/IRaCIS.Core.API/appsettings.Test_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Test_IRC.json
@@ -70,8 +70,11 @@
"AuthorizationCode": "SHzyyl2021",
"SiteUrl": "http://irc.test.extimaging.com/login",
+
"CompanyName": "Extensive Imaging",
- "CompanyNameCN": "上海展影医疗科技有限公司"
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Extensive Imaging",
+ "CompanyShortNameCN": "展影医疗"
}
}
diff --git a/IRaCIS.Core.API/appsettings.US_IRC.json b/IRaCIS.Core.API/appsettings.US_IRC.json
index 834a44da2..654637a8c 100644
--- a/IRaCIS.Core.API/appsettings.US_IRC.json
+++ b/IRaCIS.Core.API/appsettings.US_IRC.json
@@ -69,8 +69,10 @@
"FromEmail": "test@extimaging.com",
"FromName": "Test_IRC",
"AuthorizationCode": "SHzyyl2021",
- "CompanyName": "Extensive Imaging",
- "CompanyNameCN": "上海展影医疗科技有限公司"
+ "CompanyName": "Elevate Imaging",
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Elevate Imaging",
+ "CompanyShortNameCN": "展影医疗"
}
}
diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json
index 2ee6cf6bf..aff99beba 100644
--- a/IRaCIS.Core.API/appsettings.Uat_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json
@@ -55,7 +55,9 @@
"AuthorizationCode": "SHzyyl2021",
"SiteUrl": "http://irc.uat.extimaging.com/login",
"CompanyName": "Extensive Imaging",
- "CompanyNameCN": "上海展影医疗科技有限公司"
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Extensive Imaging",
+ "CompanyShortNameCN": "展影医疗"
}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
index 92d97da7b..9a6dc6f9d 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗为您添加了账户，账户信息如下:
+ {company abbreviation}为您添加了账户，账户信息如下:
@@ -23,7 +23,7 @@
@@ -32,7 +32,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html
index cc724e76f..04453f355 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html
@@ -11,20 +11,20 @@
Dear {0} ,
- Extimaging has added an account for you. The account information is as follows:
+ {company abbreviation} has created an account for you. The account information is as follows:
- User name: {1}
+ User ID: {1}
Role: {2}
@@ -32,7 +32,7 @@
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
index 3816a3a56..3354b1a34 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗将您的账户密码已重置，账户信息如下:
+ {company abbreviation}将您的账户密码已重置，账户信息如下:
@@ -29,7 +29,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
- Extimaging has reset your account password, and the account information is as follows:
+ {company abbreviation} has reset your account password, and the account information is as follows:
- User name: {1}
+ User ID: {1}
Role: {2}
@@ -29,7 +29,7 @@
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html
index 227adf6d7..1becb5c55 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html
@@ -19,7 +19,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html
index 977a6ac01..e5d5f6b58 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html
@@ -11,7 +11,7 @@
Dear：
- Thank you for using Extensive Imaging Cloud System.
+ Thank you for using {company abbreviation} Cloud System.
{0}。
@@ -19,7 +19,7 @@
Best regards,
-
Extensive Imaging
+
{company}
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
+ {company abbreviation}作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
@@ -43,7 +43,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
index 2d8c51598..302210a88 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
@@ -11,10 +11,10 @@
Dear {0},
- As the service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
+ {company abbreviation} invites you to participate in the IRC work of a trial ({1} , {2}).
- This project adopts electronic workflow. The system and your account information are as follows：
+ Your account information is as follows：
@@ -28,20 +28,23 @@
Study name: {1}
- User name: {4}
+ User ID: {4}
Role: {5}
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html
index f89d659b7..1ac10ce08 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+ {company abbreviation}作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
@@ -44,7 +44,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
index 5728072f0..16ffaaeb4 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
@@ -11,10 +11,10 @@
Dear {0},
- Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+ {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
- This project adopts electronic workflow. The system and your account information are as follows：
+ Your account information is as follows：
@@ -28,15 +28,15 @@
Study name: {1}
- User name: {4}
+ User ID: {4}
Role: {5}
@@ -44,7 +44,7 @@
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html
index b04039562..70cf1bdec 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 您好, 您填写的中心调研表被驳回，详细信息如下：
+ 您填写的中心调研表被驳回，详细信息如下：
@@ -41,7 +41,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
- Hello, the center survey form you filled in has been rejected. The details are as follows：
+ The site survey form you filled in has been rejected. The details are as follows：
@@ -41,7 +41,7 @@
Best regards,
-
Extensive Imaging
+
{company}
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
+ {company abbreviation}作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
@@ -44,7 +44,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
index b0df12ba0..519e9ab19 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
@@ -11,10 +11,10 @@
Dear {0},
- As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
+ {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
- This project adopts electronic workflow. The system and your account information are as follows：
+ Your account information is as follows：
@@ -28,20 +28,23 @@
Study name: {1}
- User name: {4}
+ User ID: {4}
Role: {5}
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html
index 47be25687..3fa857aa3 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+ {company abbreviation}作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
@@ -44,7 +44,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
index 5728072f0..8bbd27dc5 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
@@ -11,10 +11,10 @@
Dear {0},
- Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+ {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
- This project adopts electronic workflow. The system and your account information are as follows：
+ Your account information is as follows：
@@ -28,15 +28,15 @@
Study name: {1}
- User name: {4}
+ User ID: {4}
Role: {5}
@@ -44,7 +44,7 @@
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
index 335aa4ca9..26ca6ecd3 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
@@ -8,7 +8,7 @@
- Hello {0},
+ Dear {0},
感谢您使用展影云平台。
@@ -21,7 +21,7 @@
祝您顺利！
-
上海展影医疗科技有限公司
+
{company}
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
index 55f3fe6a6..2d4abdab8 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
@@ -8,21 +8,21 @@
- Hello {0},
+ Dear {0},
- Thank you for using Extensive Imaging’s cloud system!
+ {1}
- {1}, and the verification code is {2}.
+ The verification code is {2}.
- Please enter this verification code within 3 minutes for subsequent operations.
+ This code will expire in 3 minutes.
Best regards,
-
Extensive Imaging
+
{company}
diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs
index 752d2e666..531be07e9 100644
--- a/IRaCIS.Core.Application/Service/Common/MailService.cs
+++ b/IRaCIS.Core.Application/Service/Common/MailService.cs
@@ -86,7 +86,8 @@ namespace IRaCIS.Application.Services
private string ReplaceCompanyName(string needDealtxt)
{
- return needDealtxt.Replace("{*}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN);
+ return needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
+ .Replace("{{company abbreviation}}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);
}
//重置邮箱
diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
index 2008be937..c612541f4 100644
--- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs
+++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
@@ -41,6 +41,12 @@ namespace IRaCIS.Core.Domain.Share
public string CompanyName { get; set; }
public string CompanyNameCN { get; set; }
+
+ public string CompanyShortName { get; set; }
+
+ public string CompanyShortNameCN { get; set; }
+
+
}