From 9eabd1a07f74b7a16207f29e4bc98bf0196f1bec Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 7 Aug 2023 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wwwroot/EmailTemplate/TrialDoctorExistJoin.html | 2 +-
.../wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html | 2 +-
.../wwwroot/EmailTemplate/TrialDoctorFirstJoin.html | 2 +-
.../wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html | 2 +-
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html | 2 +-
.../wwwroot/EmailTemplate/TrialUserExistJoin_US.html | 2 +-
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html | 2 +-
.../wwwroot/EmailTemplate/TrialUserFirstJoin_US.html | 2 +-
IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html | 2 +-
.../Service/SiteSurvey/TrialSiteSurveyService.cs | 3 +++
10 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html
index 5e154e16f..8ae645e3b 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作。
+ 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
该项目采用电子化工作流，系统及您的账号信息如下：
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
index af5a32a3e..fcea3bd36 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
@@ -11,7 +11,7 @@
Dear {0},
- As the IRC service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
+ 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.
Digital workflow is implemented for this trial, and your account information is as follows:
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html
index cb7f00034..9f7422603 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阅片相关工作，欢迎您提供指导和建议，非常感谢！
+ 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作，欢迎您提供指导和建议，非常感谢！
该项目采用电子化工作流，系统及您的账号信息如下：
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
index 83d919950..8e5d37d94 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
@@ -11,7 +11,7 @@
Dear {0},
- As the IRC service provider of {1}trial (Protocol ID is {2}), Extensive Imaging invites you to participate in the independent assessment work of this trial.
+ 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.
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html
index 260ad6bba..5020ee521 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html
@@ -11,7 +11,7 @@
尊敬的 {0} ,您好：
- 展影医疗作为 [{1} (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+ 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
该项目采用电子化工作流，系统及您的账号信息如下：
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
index 5e33fc801..6be54f794 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
@@ -11,7 +11,7 @@
Dear {0},
- As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
+ As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
Digital workflow is implemented for this trial, and your account information is as follows:
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html
index 48019299e..958d8fe83 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相关工作。
+ 展影医疗作为 [{1} (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作。
该项目采用电子化工作流，系统及您的账号信息如下：
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
index e402530d6..f0de7c29f 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
@@ -11,7 +11,7 @@
Dear {0},
- As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
+ As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
Digital workflow is implemented for this trial, and your account information is as follows:
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
index e828eb2ea..94ee774f1 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
@@ -11,7 +11,7 @@
Dear Sir or Madam:
- Thank you for using our IRC imaging system.
+ Thank you for using our imaging system.
{0}, the verification code is {1}. Please enter this code within 3 minutes for follow-up operations.
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index afdf8c648..c6a07797d 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -751,6 +751,9 @@ namespace IRaCIS.Core.Application.Contracts
await SendSiteSurveyUserJoinEmail(new TrialSiteUserSurveyJoinCommand() { TrialId = trialId, TrialSiteSurveyId = trialSiteSurveyId, RouteUrl = siteSurvyeSubmit.RouteUrl, BaseUrl = siteSurvyeSubmit.BaseUrl, UserList = needGenerateList });
+ //将历史锁定的调研表废弃
+ await _trialSiteSurveyRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.SiteId == trialSiteSurvey.SiteId && t.State == TrialSiteSurveyEnum.PMCreatedAndLock, z => new TrialSiteSurvey() { IsDeleted = true });
+
}
await _trialSiteSurveyRepository.SaveChangesAsync();
return ResponseOutput.Ok();