diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index c9bc87ba9..cf2216ac2 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -637,25 +637,25 @@ namespace IRaCIS.Core.API.Controllers } #endregion #region 访视计划 - /// - /// 新增或添加访视计划 - /// - /// - /// - [HttpPost, Route("Inspection/VisitPlan/AddOrUpdateVisitStage")] - [UnitOfWork] - public async Task AddOrUpdateVisitStage(DataInspectionDto opt) - { - var fun = await _visitPlanService.AddOrUpdateVisitStage(opt.OptCommand); - if (!fun.IsSuccess) - { - return ResponseOutput.NotOk(fun.ErrorMessage); - } - opt.AuditInfo.VisitStageId = fun.Data.Id; - opt.OptCommand.Id = fun.Data.Id; - opt.AuditInfo.BlindName = fun.Data.BlindName; - return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun); - } + ///// + ///// 新增或添加访视计划 + ///// + ///// + ///// + //[HttpPost, Route("Inspection/VisitPlan/AddOrUpdateVisitStage")] + //[UnitOfWork] + //public async Task AddOrUpdateVisitStage(DataInspectionDto opt) + //{ + // var fun = await _visitPlanService.AddOrUpdateVisitStage(opt.OptCommand); + // if (!fun.IsSuccess) + // { + // return ResponseOutput.NotOk(fun.ErrorMessage); + // } + // opt.AuditInfo.VisitStageId = fun.Data.Id; + // opt.OptCommand.Id = fun.Data.Id; + // opt.AuditInfo.BlindName = fun.Data.BlindName; + // return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun); + //} /// @@ -878,23 +878,23 @@ namespace IRaCIS.Core.API.Controllers } - /// - /// 保存并确认访视计划 - /// - /// - /// - [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); - } + ///// + ///// 保存并确认访视计划 + ///// + ///// + ///// + //[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 b7ff1f0b4..a07fa4e2c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -282,13 +282,6 @@ - - - 新增或添加访视计划 - - - - 删除访视计划对象 @@ -358,13 +351,6 @@ - - - 保存并确认访视计划 - - - - 添加或更新受试者信息[New] diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 103aaf8f3..cba708c6d 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2563,7 +2563,7 @@ - 添加或更新访视计划某项[New] + 添加或更新访视计划某项 删除项目计划某一项 废弃 diff --git a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs index 3d8eeaea2..4e54b0f18 100644 --- a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs @@ -162,7 +162,7 @@ namespace IRaCIS.Core.Application.Contracts } - [HttpDelete("{trialId:guid}/{previousHistoryId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{previousHistoryId:guid}")] public async Task DeletePreviousHistory(Guid previousHistoryId) { await _previousHistoryRepository.DeleteFromQueryAsync(t => t.Id == previousHistoryId,true); @@ -187,7 +187,7 @@ namespace IRaCIS.Core.Application.Contracts } - [HttpDelete("{trialId:guid}/{previousOtherId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{previousOtherId:guid}")] public async Task DeletePreviousOther(Guid previousOtherId) { await _previousOtherRepository.DeleteFromQueryAsync(t => t.Id == previousOtherId,true); @@ -212,7 +212,7 @@ namespace IRaCIS.Core.Application.Contracts } - [HttpDelete("{trialId:guid}/{previousSurgeryId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{previousSurgeryId:guid}")] public async Task DeletePreviousSurgery(Guid previousSurgeryId) { var success = await _previousSurgeryRepository.DeleteFromQueryAsync(t => t.Id == previousSurgeryId,true); @@ -237,7 +237,7 @@ namespace IRaCIS.Core.Application.Contracts } - [HttpDelete("{trialId:guid}/{previousPDFId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{previousPDFId:guid}")] public async Task DeletePreviousPDF(Guid previousPDFId) { diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 74f44a351..a0056a746 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application.Contracts } [TypeFilter(typeof(TrialResourceFilter))] - [HttpDelete("{trialId:guid}/{noneDicomStudyId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")] public async Task DeleteNoneDicomStudy(Guid noneDicomStudyId) { @@ -137,7 +137,8 @@ namespace IRaCIS.Core.Application.Contracts } - [HttpDelete("{trialId:guid}/{noneDicomStudyFileId:guid}")] + [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyFileId:guid}")] + [TypeFilter(typeof(TrialResourceFilter))] public async Task DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId) { //var subjectVisitId = await _noneDicomStudyFileRepository.Where(t => t.Id == noneDicomStudyFileId).Select(t => t.NoneDicomStudy.SubjectVisitId).FirstOrDefaultAsync(); @@ -176,7 +177,8 @@ namespace IRaCIS.Core.Application.Contracts /// //[DisableRequestSizeLimit] [RequestSizeLimit(1_073_741_824)] - [HttpPost("{noneDicomStudyId:guid}/{subjectVisitId:guid}")] + [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")] + [TypeFilter(typeof(TrialResourceFilter))] public async Task UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId) { var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).IfNullThrowException().FullName; diff --git a/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs index 381cff976..cad9d1878 100644 --- a/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs @@ -6,7 +6,7 @@ namespace IRaCIS.Application.Interfaces { public interface IVisitPlanService { - Task> AddOrUpdateVisitStage(VisitPlanCommand visitPlan); + Task AddOrUpdateVisitStage(VisitPlanCommand visitPlan); Task ConfirmTrialVisitPlan(Guid trialId); Task DeleteVisitStage(Guid id); Task DownloadInflunceStudyList(Guid visitPlanInfluenceStatId); diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 404fb02b3..52ad56353 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -8,11 +8,8 @@ using IRaCIS.Core.Application.MediatR.CommandAndQueries; using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel.AspNetCore; -using IRaCIS.Core.Application.Service.Inspection.Interface; -using Newtonsoft.Json; using IRaCIS.Core.Infrastructure; using MassTransit; -using IRaCIS.Core.Domain.Common; namespace IRaCIS.Application.Services { @@ -25,7 +22,6 @@ namespace IRaCIS.Application.Services private readonly IRepository _influnceRepository; public VisitPlanService(IRepository visitStageRepository, IRepository trialRepository, IRepository subjectVisitRepository, - IRepository influnceStatRepository, IRepository visitPlanInfluenceStudy) { _visitStageRepository = visitStageRepository; @@ -37,6 +33,7 @@ namespace IRaCIS.Application.Services ///暂时不用 /// 获取项目访视计划 + [HttpPost] public async Task> GetTrialVisitStageList(VisitPlanQueryDTO param) { var visitStageQuery = _visitStageRepository.AsQueryable(true).Where(u => u.TrialId == param.TrialId) @@ -82,10 +79,10 @@ namespace IRaCIS.Application.Services } - /// 添加或更新访视计划某项[New] - [HttpPost] + /// 添加或更新访视计划某项 [UnitOfWork] - public async Task> AddOrUpdateVisitStage(VisitPlanCommand visitPlan) + [HttpPost] + public async Task AddOrUpdateVisitStage(VisitPlanCommand visitPlan) { if (!await _trialRepository.Where(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialOngoing || t.TrialStatusStr == StaticData.TrialInitializing)) @@ -149,7 +146,7 @@ namespace IRaCIS.Application.Services #endregion - return ResponseOutput.Ok(visitPlanItem); + return ResponseOutput.Ok(visitPlanItem.Id); } else//update @@ -201,7 +198,7 @@ namespace IRaCIS.Application.Services } - return ResponseOutput.Ok(stage); + return ResponseOutput.Ok(); } @@ -213,7 +210,6 @@ namespace IRaCIS.Application.Services [UnitOfWork] [HttpPost("{trialId:guid}")] - [TrialAudit(AuditType.TrialAudit, AuditOptType.ConfirmTrialVisitPlan)] public async Task ConfirmTrialVisitPlan(Guid trialId) {