From 3affa7d89e33bad88703e95eb75a1126d7882880 Mon Sep 17 00:00:00 2001 From: DK Date: Mon, 28 Mar 2022 17:24:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InspectionController.cs | 24 +- IRaCIS.Core.API/IRaCIS.Core.API.xml | 7 - .../IRaCIS.Core.Application.xml | 307 ++++++------------ .../Service/Common/FrontAuditConfigService.cs | 4 +- 4 files changed, 115 insertions(+), 227 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 0701c7836..e29e4b9c6 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -66,18 +66,18 @@ namespace IRaCIS.Core.API.Controllers return await _inspectionService.GetInspectionData(dto); } - /// - /// 用户 签名某个文档 签署文件 - /// - /// - /// - [HttpPost, Route("Inspection/trialDocument/userConfirm")] - [UnitOfWork] - public async Task UserConfirm(TrialDocumentConfirmDTO opt) - { - var fun = _trialDocumentService.UserConfirm; - return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); - } + ///// + ///// 用户 签名某个文档 签署文件 + ///// + ///// + ///// + //[HttpPost, Route("Inspection/trialDocument/userConfirm")] + //[UnitOfWork] + //public async Task UserConfirm(TrialDocumentConfirmDTO opt) + //{ + // var fun = _trialDocumentService.UserConfirm; + // return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); + //} #region setting diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 9f4508f58..dab7da8b9 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -158,13 +158,6 @@ - - - 用户 签名某个文档 签署文件 - - - - 添加或更新受试者信息[New] diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 72c9a0d10..d4ba58346 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -562,6 +562,107 @@ SystemAnonymizationService + + + 子类 + + + + + 配置 基础逻辑信息 + + + + + 配置流程 + + + + + 配置加急信息 + + + + + 用户 签名某个文档 Dto + + + + + 功能模块 + + + + + 盲态访视名 + + + + + 项目iD + + + + + 中心 + + + + + 受试者 + + + + + 访视 + + + + + 操作类型 + + + + + 子类 + + + + + 修改原因 + + + + + 是否有签名 + + + + + 通用逻辑封装 + + 方法参数 + 添加稽查 + 用户签名 + 委托 + + + + + 映射 SiteId SubjectId SubjectVisitId TrialId 最开始没有 需要特殊处理 + + + + + + 验证用户签名信息 /// + + + 添加签名记录 /// + + + 添加稽查记录（ 有的会签名，有的不会签名） /// + 项目外部人员 录入流程相关 @@ -858,212 +959,6 @@ - - 指定资源Id，渲染Dicom检查的Jpeg预览图像 - Dicom检查的Id - - - - 获取某个检查的关联检查列表（该受试者在这个想项目下的所有检查） - 点击检查检查列表中的一个检查获取对应的序列列表（调用之前的接口：/series/list/，根据StudyId，获取访视的序列列表） - - - - - 指定资源Id，获取Dicom检查信息 - Dicom检查的Id - - - - 批量验证 检查是否可以上传 并告知原因 - - - - - SystemAnonymizationService - - - - - 子类 - - - - - 配置 基础逻辑信息 - - - - - 配置流程 - - - - - 配置加急信息 - - - - - 用户 签名某个文档 Dto - - - - - 功能模块 - - - - - 盲态访视名 - - - - - 项目iD - - - - - 中心 - - - - - 受试者 - - - - - 访视 - - - - - 操作类型 - - - - - 子类 - - - - - 修改原因 - - - - - 是否有签名 - - - - - 通用逻辑封装 - - 方法参数 - 添加稽查 - 用户签名 - 委托 - - - - - 映射 SiteId SubjectId SubjectVisitId TrialId 最开始没有 需要特殊处理 - - - - - - 验证用户签名信息 /// - - - 添加签名记录 /// - - - 添加稽查记录（ 有的会签名，有的不会签名） /// - - - - 项目外部人员 录入流程相关 - - - - - 验证 在系统中是否存在该类型的账户 返回true 表示 不存在 可以添加和更新|存在但是信息一致，false 需要提示不一致项（前端 可以直接用我返回的错误信息，或者根据返回的用户信息实体，自己设置格式显示） - - - - - - - 添加和更新接口 已验证邮箱和账户类型不允许添加重复项 - - - - - - - 勾选用户 批量发送邮件 - - - - - - 不带Token 访问 用户选择 参与 不参与 Id: TrialExternalUserId - - - - - - - 不带Token 访问 Site调研用户 加入项目 Id: TrialSiteSurveyUserId - - - - - - - 不带Token 访问 页面获取项目基本信息 和参与情况 (已经确认了 就不允许再次确认) Id: TrialExternalUserId/TrialSiteSurveyUserId - - - - - - - 加入项目 - - - - - - - - TrialUserPreparation Service - - - - - 项目下 人员邀请 加入列表 - - - - - - - 不带Token访问 加入项目 记录 同意与否 - - - - - - - 用户加入项目 - - - - CRC 访视上传列表 diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 4d04a096e..6574b909e 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -10,12 +10,12 @@ using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; -namespace IRaCIS.Core.Application.Service +namespace IRaCIS.Core.Application.Service { /// /// FrontAuditConfigService /// - [ApiExplorerSettings(GroupName = "Test")] + [ApiExplorerSettings(GroupName = "Reviewer")] public class FrontAuditConfigService : BaseService, IFrontAuditConfigService { From d1dba6b3792e37f4f2352cd42bedcf0cff03a06d Mon Sep 17 00:00:00 2001 From: DK Date: Mon, 28 Mar 2022 17:34:04 +0800 Subject: [PATCH 2/4] --- .../Service/Common/FrontAuditConfigService.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 6574b909e..3f7127274 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -8,7 +8,7 @@ using IRaCIS.Core.Domain.Models; using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; - +using Castle.Core.Internal; namespace IRaCIS.Core.Application.Service { @@ -27,11 +27,18 @@ namespace IRaCIS.Core.Application.Service } - public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery queryFrontAuditConfig) + public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery iq) { + var query = _repository.GetQueryable() + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Value == iq.Value) + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ValueCN == iq.ValueCN) + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Description == iq.Description) + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.OptTypeId == iq.OptTypeId) + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Code == iq.Code) + .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId); - var frontAuditConfigQueryable = _repository.GetQueryable() + var frontAuditConfigQueryable = query .ProjectTo(_mapper.ConfigurationProvider); return await frontAuditConfigQueryable.ToListAsync(); From 6cc5e03ca3059c608b48a18720a37e8ebe1e22e5 Mon Sep 17 00:00:00 2001 From: DK Date: Mon, 28 Mar 2022 17:42:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 21 +++++++++++++++++++ .../Service/Common/FrontAuditConfigService.cs | 17 +++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index d4ba58346..2fc09022d 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -537,6 +537,27 @@ FrontAuditConfigService + + + 获取列表 + + + + + + + 新增或者修改 + + + + + + + 删除 + + + + 指定资源Id，渲染Dicom检查的Jpeg预览图像 Dicom检查的Id diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 3f7127274..86f74fc99 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -26,7 +26,11 @@ namespace IRaCIS.Core.Application.Service _frontAuditConfigRepository = frontAuditConfigRepository; } - + /// + /// 获取列表 + /// + /// + /// public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery iq) { var query = _repository.GetQueryable() @@ -45,6 +49,11 @@ namespace IRaCIS.Core.Application.Service } + /// + /// 新增或者修改 + /// + /// + /// public async Task AddOrUpdateFrontAuditConfig(FrontAuditConfigAddOrEdit addOrEditFrontAuditConfig) { // 在此处拷贝automapper 映射 @@ -60,7 +69,11 @@ namespace IRaCIS.Core.Application.Service } - + /// + /// 删除 + /// + /// + /// [HttpDelete("{frontAuditConfigId:guid}")] public async Task DeleteFrontAuditConfig(Guid frontAuditConfigId) { From a96de2f4160878c5f89515c970fa913163c8e0bd Mon Sep 17 00:00:00 2001 From: DK Date: Mon, 28 Mar 2022 17:58:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/DTO/FrontAuditConfigViewModel.cs | 4 ++-- .../Service/Inspection/DTO/InspectionModel.cs | 4 ++-- IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 2 +- IRaCIS.Core.Domain/Trial/DataInspection.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index a7f2ebd80..f786582c7 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? ParentId { get; set; } public bool IsEnable { get; set; } public bool IsConfig { get; set; } - public int? ModuleTypeId { get; set; } + public string ModuleTypeId { get; set; } public string OptTypeId { get; set; } public string ChildrenTypeId { get; set; } } @@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? ParentId { get; set; } public bool IsEnable { get; set; } public bool IsConfig { get; set; } - public int? ModuleTypeId { get; set; } + public string ModuleTypeId { get; set; } public string OptTypeId { get; set; } public string ChildrenTypeId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index 7a246a119..06e66e8db 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO /// /// 子类 /// - public int ChildrenType { get; set; } + public string ChildrenType { get; set; } public bool IsSign { get; set; } public string JsonDetail { get; set; } = string.Empty; @@ -183,7 +183,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO /// /// 子类 /// - public int? ChildrenType { get; set; } + public string ChildrenType { get; set; } /// /// 修改原因 diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 5c55e2ce5..8e90ba493 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -86,7 +86,7 @@ namespace IRaCIS.Core.Domain.Models /// /// ModuleTypeId /// - public int? ModuleTypeId { get; set; } + public string ModuleTypeId { get; set; } /// /// OptTypeId diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 9f0666e6f..83ba2e18c 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -91,7 +91,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 子类 /// - public int? ChildrenType { get; set; } + public string ChildrenType { get; set; } /// /// Json 对象