diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 8de62b240..b3c4d82ea 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5661,6 +5661,32 @@
             <param name="Id"></param>
             <returns></returns>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.ShortcutKeyService">
+            <summary>
+            快捷键服务
+            </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>
+            获取医生快捷键
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ShortcutKeyService.SetDefaultShortcutKey(IRaCIS.Core.Application.ViewModel.SetDefaultShortcutKey)">
+            <summary>
+            设置默认快捷键
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialExternalUserService">
             <summary>
             项目外部人员  录入流程相关
@@ -6058,6 +6084,15 @@
             检查日期
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyView">
+            <summary> DefaultShortcutKeyView  列表视图模型 </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyQuery">
+            <summary>DefaultShortcutKeyQuery  列表查询参数模型</summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.DefaultShortcutKeyAddOrEdit">
+            <summary> DefaultShortcutKeyAddOrEdit  列表查询参数模型</summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.CriterionNidusView.OrganType">
             <summary>
             器官类型
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index 0f8fd1917..ee4d31560 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -76,6 +76,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// SMTP端口
         /// </summary>
         public int? EmailSMTPServerPort { get; set; }
+
+        /// <summary>
+        /// 是否配置过邮箱
+        /// </summary>
+        public bool IsConfigureEmail { get; set; } = false;
     }
 
     public class SetTrialEmailInDto : GetTrialEmailSetOutDto
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index a0f038103..c75ff8bbf 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -56,6 +56,7 @@ namespace IRaCIS.Core.Application.Service
                 EmailSMTPServerAddress = x.EmailSMTPServerAddress,
                 EmailFromEmail = x.EmailFromEmail,
                 EmailFromName = x.EmailFromEmail,
+                IsConfigureEmail=x.IsConfigureEmail,
                 EmailSMTPServerPort = x.EmailSMTPServerPort
 
             }).FirstNotNullAsync();
@@ -82,7 +83,8 @@ namespace IRaCIS.Core.Application.Service
                 EmailFromName = inDto.EmailFromName,
                 EmailAuthorizationCode = inDto.EmailAuthorizationCode,
                 EmailSMTPServerAddress = inDto.EmailSMTPServerAddress,
-                EmailSMTPServerPort = inDto.EmailSMTPServerPort
+                EmailSMTPServerPort = inDto.EmailSMTPServerPort,
+                IsConfigureEmail=true,
             });
 
 
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index e0d5c880b..243fc07d4 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -349,7 +349,12 @@ namespace IRaCIS.Core.Domain.Models
         /// <summary>
         /// SMTP�˿�
         /// </summary>
-        public int? EmailSMTPServerPort { get; set; } 
+        public int? EmailSMTPServerPort { get; set; }
+
+        /// <summary>
+        /// �Ƿ����ù�����
+        /// </summary>
+        public bool IsConfigureEmail { get; set; } = false;
         #endregion
 
         ///// <summary>