diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 15ef2d686..1c81b230a 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -98,18 +98,7 @@ namespace IRaCIS.Core.API.Controllers - /// - /// 配置 基础逻辑信息 - /// - /// - /// - [HttpPost, Route("Inspection/configTrialBasicInfo/configTrialBasicInfo")] - [UnitOfWork] - public async Task ConfigTrialBasicInfo(DataInspectionDto opt) - { - await _inspectionService.RecordSing(opt.SignInfo); - return await _trialConfigService.ConfigTrialBasicInfo(opt.Data); - } + /// /// 配置 基础逻辑信息并确认 @@ -131,7 +120,7 @@ namespace IRaCIS.Core.API.Controllers return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() { TrialId = opt.Data.TrialId, - SignCode = opt.Data.SignCode + SignCode = opt.SignInfo.SignCode }); @@ -150,19 +139,7 @@ namespace IRaCIS.Core.API.Controllers } - /// - /// 配置流程 - /// - /// - /// - [HttpPost, Route("Inspection/configTrialBasicInfo/configTrialProcessInfo")] - [UnitOfWork] - public async Task ConfigTrialProcessInfo(DataInspectionDto opt) - { - - await _inspectionService.RecordSing(opt.SignInfo); - return await _trialConfigService.ConfigTrialProcessInfo(opt.Data); - } + /// @@ -183,25 +160,13 @@ namespace IRaCIS.Core.API.Controllers return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() { TrialId = opt.Data.TrialId, - SignCode = opt.Data.SignCode + SignCode = opt.SignInfo.SignCode }); } - /// - /// 配置加急信息 - /// - /// - /// - [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialUrgentInfo")] - [UnitOfWork] - public async Task ConfigTrialUrgentInfo(DataInspectionDto opt) - { - - await _inspectionService.RecordSing(opt.SignInfo); - return await _trialConfigService.ConfigTrialUrgentInfo(opt.Data); - } + /// @@ -224,7 +189,7 @@ namespace IRaCIS.Core.API.Controllers return await _trialConfigService.TrialConfigSignatureConfirm(new SignConfirmDTO() { TrialId = opt.Data.TrialId, - SignCode = opt.Data.SignCode + SignCode = opt.SignInfo.SignCode }); } diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 5525619df..ac4897e58 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -62,13 +62,6 @@ - - - 配置 基础逻辑信息 - - - - 配置 基础逻辑信息并确认 @@ -82,13 +75,6 @@ - - - 配置流程 - - - - 配置流程并确认 @@ -96,13 +82,6 @@ - - - 配置加急信息 - - - - 配置加急信息并确认 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 7bf2b9f7d..050562e31 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Contracts public string Modalitys { get; set; } = string.Empty; - public string SignCode { get; set; } = string.Empty; + } public class TrialProcessConfig @@ -111,7 +111,6 @@ namespace IRaCIS.Core.Application.Contracts public int? DigitPlaces { get; set; } - public string SignCode { get; set; } = string.Empty; } @@ -130,7 +129,6 @@ namespace IRaCIS.Core.Application.Contracts public bool IsPDProgressView { get; set; } - public string SignCode { get; set; } = string.Empty; } public class TrialStateChangeDTO diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index e318a5e97..5ff1ae69f 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -37,8 +37,7 @@ namespace IRaCIS.Core.Domain.Models /// /// SubjectVisitId /// - [Required] - public Guid SubjectVisitId { get; set; } + public Guid? SubjectVisitId { get; set; } //关联基础数据