diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
index ae2bfca4b..6f03964d3 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
@@ -36,9 +36,12 @@ namespace IRaCIS.Core.Application.Contracts
public CommonDocumentBusinessScenario? BusinessScenarioEnum { get; set; }
public bool? IsReturnRequired { get; set; }
- public bool? IsUrgent { get; set; }
public bool? IsEnable { get; set; }
+ public CriterionType? CriterionTypeEnum { get; set; }
+
+
+
}
/// EmailNoticeConfigAddOrEdit 列表查询参数模型
@@ -47,7 +50,6 @@ namespace IRaCIS.Core.Application.Contracts
public Guid? Id { get; set; }
public string Code { get; set; } = String.Empty;
-
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
///
@@ -55,20 +57,52 @@ namespace IRaCIS.Core.Application.Contracts
///
public bool IsDistinguishCriteria { get; set; }
-
- //public string AuthorizationCode { get; set; } = String.Empty;
- //public Guid ScenarioId { get; set; }
- //public string Title { get; set; } = String.Empty;
- //public string Body { get; set; } = String.Empty;
- //public string FromEmail { get; set; } = String.Empty;
- //public string ReceiveEmail { get; set; } = String.Empty;
- //public string CopyEmail { get; set; } = String.Empty;
public bool IsReturnRequired { get; set; }
- public bool IsUrgent { get; set; }
public bool IsEnable { get; set; }
public bool IsAutoSend { get; set; }
public bool IsDeleted { get; set; }
+
+
+
+ public CriterionType? CriterionTypeEnum { get; set; }
+
+ /// 业务模块 ///
+ public int BusinessModuleEnum { get; set; }
+
+ /// 业务层级 ///
+ public int BusinessLevelEnum { get; set; }
+
+ /// 邮件类型 ///
+ public int EmailTypeEnum { get; set; }
+
+ /// 邮件加急类型 ///
+ public int EmailUrgentEnum { get; set; }
+ public string Description { get; set; } = string.Empty;
+
+
+ /// 定时周期 ///
+ public string EmailCron { get; set; } = string.Empty;
+
+ /// 邮件主题 ///
+ public string EmailTopic { get; set; } = string.Empty;
+
+ public string EmailTopicCN { get; set; } = string.Empty;
+
+
+ public string AttachPath { get; set; } = string.Empty;
+
+ public string AttachCNPath { get; set; } = string.Empty;
+
+ public string EmailHtmlContentPath { get; set; } = string.Empty;
+
+ public string EmailHtmlContentCNPath { get; set; } = string.Empty;
+
+ public string AttachName { get; set; }
+ public string AttachNameCN { get; set; }
+ public string EmailHtmlName { get; set; }
+ public string EmailHtmlNameCN { get; set; }
+
}
diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
index 27adfc3be..06c8d5430 100644
--- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
@@ -29,7 +29,6 @@ namespace IRaCIS.Core.Application.Contracts
var emailNoticeConfigQueryable = _emailNoticeConfigrepository
.WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
.WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
- .WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent)
.WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
.ProjectTo(_mapper.ConfigurationProvider);
diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
index dd1a99f11..9752aa344 100644
--- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
@@ -22,6 +22,47 @@ namespace IRaCIS.Core.Domain.Models
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
+ /// 标准类型 ///
+ public CriterionType? CriterionTypeEnum { get; set; }
+
+ /// 业务模块 ///
+ public int BusinessModuleEnum { get; set; }
+
+ /// 业务层级 ///
+ public int BusinessLevelEnum { get; set; }
+
+ /// 邮件类型 ///
+ public int EmailTypeEnum { get; set; }
+
+ /// 邮件加急类型 ///
+ public int EmailUrgentEnum { get; set; }
+
+ /// 定时周期 ///
+ public string EmailCron { get; set; }=string.Empty;
+
+ /// 邮件主题 ///
+ public string EmailTopic { get; set; } = string.Empty;
+
+ public string EmailTopicCN { get; set; } = string.Empty;
+
+ /// 附件 ///
+ public string AttachPath { get; set; } = string.Empty;
+
+ public string AttachCNPath { get; set; } = string.Empty;
+
+ public string EmailHtmlContentPath { get; set; } = string.Empty;
+
+ public string EmailHtmlContentCNPath { get; set; } = string.Empty;
+
+ public string Description { get; set; } = string.Empty;
+
+
+ public string AttachName { get; set; }
+ public string AttachNameCN { get; set; }
+ public string EmailHtmlName { get; set; }
+ public string EmailHtmlNameCN { get; set; }
+
+
///
/// 是否区分标准
///
@@ -34,10 +75,6 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public bool IsReturnRequired { get; set; }
-
- [Required]
- public bool IsUrgent { get; set; }
-
public bool IsAutoSend { get; set; }
public bool IsEnable { get; set; }
@@ -61,14 +98,21 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DeleteUserId { get; set; }
-
-
-
-
-
-
-
-
}
+
+ [Table("EmailNoticeUserType")]
+
+ public class EmailNoticeUserType
+ {
+ [JsonIgnore]
+ public EmailNoticeConfig EmailNoticeConfig { get; set; }
+
+ public Guid EmailNoticeConfigId { get; set; }
+
+
+ public UserTypeEnum UserType { get; set; }
+
+ public EmailUserType EmailUserType { get; set; }
+ }
}
diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
index 5b3bf06b4..4066d451c 100644
--- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
@@ -32,43 +32,32 @@ namespace IRaCIS.Core.Domain.Models
public string FromName { get; set; } = string.Empty;
- public List TrialEmailNoticeUserList { get; set; } = new List();
-
-
- //[Required]
-
- //public string ReceiveEmailsStr { get; set; } = string.Empty;
- //public string CopyEmailsStr { get; set; } = string.Empty;
-
- //[NotMapped]
- //public List ReceiveEmailList => ReceiveEmailsStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=>t.Trim()).ToList();
-
- //[NotMapped]
- //public List CopyEmailList => CopyEmailsStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t=> !string.IsNullOrEmpty(t)).Select(t => t.Trim()).ToList();
-
public string FromEmail { get; set; } = string.Empty;
- [Required]
- public bool IsUrgent { get; set; }
-
- [Required]
+ public List TrialEmailNoticeUserList { get; set; } = new List();
+
+
+ [Required]
+ public string FilePath { get; set; } = string.Empty;
+
+ [Required]
+ public string FileName { get; set; } = string.Empty;
+
+
+
+
+ [Required]
public string Code { get; set; } = string.Empty;
-
-
[Required]
public bool IsReturnRequired { get; set; }
-
-
-
[Required]
public bool IsAutoSend { get; set; }
-
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
@@ -80,12 +69,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
- [Required]
- public string FilePath { get; set; } = string.Empty;
-
- [Required]
- public string FileName { get; set; } = string.Empty;
-
[Required]
public Guid CreateUserId { get; set; }
diff --git a/IRaCIS.Core.Domain/_Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs
index b95189eae..99353f405 100644
--- a/IRaCIS.Core.Domain/_Config/_StaticData.cs
+++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs
@@ -83,6 +83,8 @@ public static class StaticData
public static readonly string SystemDataFolder = "SystemData";
+ public static readonly string OtherDataFolder = "OtherData";
+
public static readonly string SignDocumentFolder = "SignDocument";
@@ -90,6 +92,11 @@ public static class StaticData
public static readonly string EmailHtmlTemplate = "EmailHtml";
+ public static readonly string CommonFile = "CommonFile";
+ public static readonly string CheckFile = "CheckFile";
+ public static readonly string SiteUserSurveryFile = "SiteUserSurveryFile";
+
+
public static readonly string NoticeAttachment = "NoticeAttachment";
public static readonly string DicomFolder = "Dicom";