From 8b8ed1fee33f0ed10b1c9d470ff3e1e6b3d7bb58 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 6 Aug 2024 16:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=82=AE=E4=BB=B6=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/IRaCIS.Core.API.xml | 7 ++
.../IRaCIS.Core.Application.xml | 71 ++++++++++++++-----
.../Common/DTO/EmailNoticeConfigViewModel.cs | 5 +-
.../Common/EmailNoticeConfigService.cs | 2 +-
.../Interface/IUserFeedBackService.cs | 21 +++---
.../Common/EmailNoticeConfig.cs | 12 +++-
6 files changed, 87 insertions(+), 31 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index ddbe96072..726d34a48 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -167,6 +167,13 @@
+
+
+ PM签名一致性分析临床数据
+
+
+
+
提交结构化录入并签名
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 970833ba3..ef44e414d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -103,6 +103,20 @@
+
+
+ https://www.cnblogs.com/NBDWDYS2214143926/p/13329231.html
+
+
+
+
+ RSA解密
+
+ 私钥
+ 待解密的字符串(Base64)
+ 解密后的字符串
+
+
分配规则
@@ -400,7 +414,7 @@
PM 重阅追踪
-
+
@@ -529,11 +543,33 @@
+
+
+ getDocumentConfirmList 培训记录导出
+
+
+
+
+
+
+
+
影像上传列表 只导出已上传状态的访视记录
-
+
+
+
+
+
+
+
+
+
+ 影像质控导出
+
+
@@ -544,18 +580,19 @@
质疑列表
-
+
-
+
受试者信息导出表
-
+
+
@@ -574,7 +611,7 @@
影像上传监控表
-
+
@@ -604,7 +641,7 @@
一致性核查记录表
-
+
@@ -621,22 +658,24 @@
-
+
PM 重阅追踪
-
+
+
-
+
PM 医学审核（挑选任务生成后的列表）
+
@@ -12317,7 +12356,7 @@
获取确认列表情况 项目文档+系统文档+具体的人
-
+
@@ -12488,7 +12527,7 @@
CRC 访视上传列表
-
+
@@ -12503,7 +12542,7 @@
CRC 质疑列表
-
+
@@ -12524,14 +12563,14 @@
QC 访视列表
-
+
获取一致性核查列表 CRC/PM 公用
-
+
@@ -15201,7 +15240,7 @@
分页获取受试者列表[New]
- /// state:1-访视中，2-出组。0-全部
+ /// state:1-访视中，2-出组。0-全部
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
index edb1cfc5a..3ac45cfe9 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
@@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsDistinguishCriteria { get; set; }
- public bool IsSystemLevel { get; set; } = false;
+ public int? SystemLevel { get; set; }
}
@@ -128,7 +128,8 @@ namespace IRaCIS.Core.Application.Contracts
public List ToUserTypeList { get; set; }
public List CopyUserTypeList { get; set; }
- public bool IsSystemLevel { get; set; } = false;
+
+ public int? SystemLevel { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
index b634370e5..60ef71673 100644
--- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpPost]
public async Task> GetEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
{
- var emailNoticeConfigQueryable = _emailNoticeConfigrepository.Where(t=>t.IsSystemLevel==queryEmailNoticeConfig.IsSystemLevel)
+ var emailNoticeConfigQueryable = _emailNoticeConfigrepository.WhereIf(queryEmailNoticeConfig.SystemLevel!=null, t =>t.SystemLevel == queryEmailNoticeConfig.SystemLevel)
.WhereIf(queryEmailNoticeConfig.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == queryEmailNoticeConfig.IsDistinguishCriteria)
.WhereIf(queryEmailNoticeConfig.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryEmailNoticeConfig.CriterionTypeEnum)
.WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
diff --git a/IRaCIS.Core.Application/Service/Management/Interface/IUserFeedBackService.cs b/IRaCIS.Core.Application/Service/Management/Interface/IUserFeedBackService.cs
index 6fa7976a3..e4420f4a3 100644
--- a/IRaCIS.Core.Application/Service/Management/Interface/IUserFeedBackService.cs
+++ b/IRaCIS.Core.Application/Service/Management/Interface/IUserFeedBackService.cs
@@ -6,19 +6,18 @@
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
-{
- ///
- /// IUserFeedBackService
- ///
- public interface IUserFeedBackService
+{
+ ///
+ /// IUserFeedBackService
+ ///
+ public interface IUserFeedBackService
{
- Task> GetUserFeedBackList(UserFeedBackQuery inQuery);
-
- Task AddOrUpdateUserFeedBack(UserFeedBackAddOrEdit addOrEditUserFeedBack);
+ Task> GetUserFeedBackList(UserFeedBackQuery inQuery);
+
+
+ Task DeleteUserFeedBack(Guid userFeedBackId);
- Task DeleteUserFeedBack(Guid userFeedBackId);
-
}
-}
+}
diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
index 31c4dfec9..94de1e7fa 100644
--- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
@@ -69,7 +69,7 @@ namespace IRaCIS.Core.Domain.Models
- public bool IsSystemLevel { get; set; }
+ public int? SystemLevel { get; set; }
///
/// 是否区分标准
@@ -123,4 +123,14 @@ namespace IRaCIS.Core.Domain.Models
public EmailUserType EmailUserType { get; set; }
}
+
+
+ public enum SysEmailLevel
+ {
+ //系统 不配置角色
+ sys_not_role=1,
+
+ //系统需要配置角色的
+ sys_Config_role=2
+ }
}