From 576c1bf7e9ae79b8d85878511b7f09b29f91d6bc Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 14 Apr 2022 16:48:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InspectionController.cs | 89 ++++++++++++++++++- IRaCIS.Core.API/IRaCIS.Core.API.xml | 28 ++++++ .../TrialSiteUser/DTO/TrialConfigDTO.cs | 8 +- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 9c3937d9..6fe058b9 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -355,8 +355,6 @@ namespace IRaCIS.Core.API.Controllers return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun); } - - /// /// 下载访视计划 /// @@ -480,6 +478,93 @@ namespace IRaCIS.Core.API.Controllers var fun = _trialConfigService.TrialConfigSignatureConfirm; return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); } + + + /// + /// 配置 基础逻辑信息并确认 + /// + /// + /// + [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialBasicInfoConfirm")] + [UnitOfWork] + public async Task ConfigTrialBasicInfoConfirm(DataInspectionDto opt) + { + var data = await _trialConfigService.ConfigTrialBasicInfo(opt.OptCommand); + if (!data.IsSuccess) + { + return ResponseOutput.NotOk(data.ErrorMessage); + } + var fun = _trialConfigService.TrialConfigSignatureConfirm; + return await _inspectionService.Enforcement(new SignConfirmDTO() { + TrialId=opt.OptCommand.TrialId, + SignCode=opt.OptCommand.SignCode + }, opt.AuditInfo, opt.SignInfo, fun); + + } + + /// + /// 配置流程并确认 + /// + /// + /// + [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialProcessInfoConfirm")] + [UnitOfWork] + public async Task ConfigTrialProcessInfoConfirm(DataInspectionDto opt) + { + var data = await _trialConfigService.ConfigTrialProcessInfo(opt.OptCommand); + if (!data.IsSuccess) + { + return ResponseOutput.NotOk(data.ErrorMessage); + } + var fun = _trialConfigService.TrialConfigSignatureConfirm; + return await _inspectionService.Enforcement(new SignConfirmDTO() + { + TrialId = opt.OptCommand.TrialId, + SignCode = opt.OptCommand.SignCode + }, opt.AuditInfo, opt.SignInfo, fun); + } + + /// + /// 配置加急信息并确认 + /// + /// + /// + [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialUrgentInfoConfirm")] + [UnitOfWork] + public async Task ConfigTrialUrgentInfoConfirm(DataInspectionDto opt) + { + var data = await _trialConfigService.ConfigTrialUrgentInfo(opt.OptCommand); + if (!data.IsSuccess) + { + return ResponseOutput.NotOk(data.ErrorMessage); + } + var fun = _trialConfigService.TrialConfigSignatureConfirm; + return await _inspectionService.Enforcement(new SignConfirmDTO() + { + TrialId = opt.OptCommand.TrialId, + SignCode = opt.OptCommand.SignCode + }, opt.AuditInfo, opt.SignInfo, fun); + } + + + /// + /// 保存并确认访视计划 + /// + /// + /// + [HttpPost, Route("Inspection/VisitPlan/SaveConfirmTrialVisitPlan")] + [UnitOfWork] + public async Task SaveConfirmTrialVisitPlan(DataInspectionDto opt) + { + var update = await _visitPlanService.AddOrUpdateVisitStage(opt.OptCommand); + if (!update.IsSuccess) + { + return ResponseOutput.NotOk(update.ErrorMessage); + } + var fun = _visitPlanService.ConfirmTrialVisitPlan; + return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun); + } + #endregion #region 受试者 /// diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index dac513ac..64333a11 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -205,6 +205,34 @@ 签名确认 + + + 配置 基础逻辑信息并确认 + + + + + + + 配置流程并确认 + + + + + + + 配置加急信息并确认 + + + + + + + 保存并确认访视计划 + + + + 添加或更新受试者信息[New] diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index c673c34f..7bf2b9f7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.Contracts public string Modalitys { get; set; } = string.Empty; + + public string SignCode { get; set; } = string.Empty; } public class TrialProcessConfig @@ -109,6 +111,8 @@ namespace IRaCIS.Core.Application.Contracts public int? DigitPlaces { get; set; } + public string SignCode { get; set; } = string.Empty; + } public class TrialUrgentConfig @@ -126,7 +130,7 @@ namespace IRaCIS.Core.Application.Contracts public bool IsPDProgressView { get; set; } - + public string SignCode { get; set; } = string.Empty; } public class TrialStateChangeDTO @@ -153,7 +157,7 @@ namespace IRaCIS.Core.Application.Contracts public string UserRealName { get; set; } = String.Empty; - + public string SignCode { get; set; } = string.Empty; }