From bf61a05e4526e41d14b1c8da4c8c03d60972f776 Mon Sep 17 00:00:00 2001
From: he <1097837524@qq.com>
Date: Sat, 18 Jan 2025 22:55:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 3af4d7205..ff42210da 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -260,7 +260,8 @@ namespace IRaCIS.Core.Application.Service
              .ForMember(d => d.ParentDictionaryCode, u => u.MapFrom(s => s.ParentReadingQuestionTrial.DictionaryCode))
         .ForMember(t => t.ParentQuestionName, u => u.MapFrom(c => c.ParentReadingQuestionTrial.QuestionName))
           .ForMember(t => t.RelevanceShowOrder, u => u.MapFrom(c => c.RelevanceReadingQuestionTrial.ShowOrder))
-              .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder));
+              .ForMember(t => t.ParentQuestionShowOrder, u => u.MapFrom(c => c.ParentReadingQuestionTrial.ShowOrder))
+                 .ForMember(x => x.CreateUserRole, x => x.Ignore()); 
 
 
 

From 40b986e31014eb2a843326bd86260ebba7c62491 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Jan 2025 11:27:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=20=E5=92=8C=E8=B4=A6=E5=8F=B7=E5=B7=B2=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Controllers/ExtraController.cs | 2 +-
 IRaCIS.Core.Domain/Trial/Trial.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs
index 4933a95d8..f737fa776 100644
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@@ -203,7 +203,7 @@ namespace IRaCIS.Api.Controllers
 
             if (!await _useRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.")} ";
             }
 
             return Redirect(decodeUrl);
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 8577a27dd..f32bcb561 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -177,7 +177,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
 
     [MaxLength]
     public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他";
-    public string Modalitys { get; set; } = string.Empty;
+    public string Modalitys { get; set; } = "CT|MRI";
 
     [NotMapped]
     public List<string> ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList();

From 013b9720b3ec510873b158e5a569d19a7ca72e35 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Jan 2025 11:33:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/TrialSiteService.cs               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
index f131d5625..8ca70d2cb 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
@@ -169,6 +169,12 @@ namespace IRaCIS.Core.Application.Services
                 {
                     item.EnabledTime = DateTime.Now;
                 }
+
+                if (await _trialSiteRepository.AnyAsync(t => t.TrialSiteCode == item.TrialSiteCode && t.TrialId == item.TrialId))
+                {
+                    //---Code is not allowed to be repeated
+                    return ResponseOutput.NotOk(_localizer["TrialSite_CodeDuplicate"]);
+                }
             }
 
             await _trialSiteRepository.AddRangeAsync(addArray);