From af603b7bc6792a172f9abf926b92ccc2db71f4e0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 13 Feb 2023 18:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 23 +++++++++++--------
 .../Document/TrialEmailNoticeConfigService.cs |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 13f97ead2..c47c3b572 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5673,13 +5673,6 @@
             快捷键服务
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.GetDefaultShortcutKeyList(IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyQuery)">
-            <summary>
-            获取默认快捷键
-            </summary>
-            <param name="inQuery"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.GetDoctorShortcutKey(IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyQuery)">
             <summary>
             获取医生快捷键
@@ -5687,9 +5680,21 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.SetDefaultShortcutKey(IRaCIS.Core.Application.ViewModel.SetDefaultShortcutKey)">
+        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.GetDefaultShortcutKey">
             <summary>
-            设置默认快捷键
+            获取默认快捷键
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.RestoreDefaultShortcutKey(IRaCIS.Core.Application.ViewModel.RestoreDefaultShortcutKeyInDto)">
+            <summary>
+            重置为默认快捷键
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.SetShortcutKey(IRaCIS.Core.Application.ViewModel.SetDefaultShortcutKey)">
+            <summary>
+            设置快捷键
             </summary>
             <param name="inDto"></param>
             <returns></returns>
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 160f5c9f3..e27f540a8 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -77,7 +77,7 @@ namespace IRaCIS.Core.Application.Service
              FileName=inDto.EmailFromName,
              SMTPServerAddress=inDto.EmailSMTPServerAddress,
              SMTPServerPort= inDto.EmailSMTPServerPort.Value,
-
+             TrialId=inDto.TrialId,
             });
 
             await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
@@ -894,7 +894,7 @@ namespace IRaCIS.Core.Application.Service
 
         private  async Task TestEmailConfigAsync(TrialEmailNoticeConfigAddOrEdit config)
         {
-            var toUserList = await  _repository.Where<TrialUser>(t => t.TrialId == config.TrialId && config.ToUserTypeList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
+            var toUserList = await  _repository.Where<TrialUser>(t => t.TrialId == config.TrialId ).WhereIf(config.ToUserTypeList!=null,t=> config.ToUserTypeList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
 
 
             if (!config.FromEmail.Contains("@") || string.IsNullOrEmpty(config.FromEmail))