修改访视计划

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2563,7 +2563,7 @@
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.VisitPlanService.AddOrUpdateVisitStage(IRaCIS.Application.Contracts.VisitPlanCommand)">
-            <summary> 添加或更新访视计划某项[New]</summary>
+            <summary> 添加或更新访视计划某项</summary>
         </member>
         <member name="M:IRaCIS.Application.Services.VisitPlanService.DeleteVisitStage(System.Guid)">
             <summary> 删除项目计划某一项 废弃  </summary>

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<IResponseOutput> 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<IResponseOutput> 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<IResponseOutput> 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<IResponseOutput> DeletePreviousPDF(Guid previousPDFId)
         {
            

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<IResponseOutput> 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<IResponseOutput> 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
         /// <returns></returns>
         //[DisableRequestSizeLimit]
         [RequestSizeLimit(1_073_741_824)]
-        [HttpPost("{noneDicomStudyId:guid}/{subjectVisitId:guid}")]
+        [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")]
+        [TypeFilter(typeof(TrialResourceFilter))]
         public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId)
         {
             var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).IfNullThrowException().FullName;

IRaCIS.Core.Application/Service/Visit/Interface/IVisitPlanService.cs

@@ -6,7 +6,7 @@ namespace IRaCIS.Application.Interfaces
 {
     public interface IVisitPlanService
     {
-        Task<IResponseOutput<VisitStage>> AddOrUpdateVisitStage(VisitPlanCommand visitPlan);
+        Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan);
         Task<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId);
         Task<IResponseOutput> DeleteVisitStage(Guid id);
         Task<IActionResult> DownloadInflunceStudyList(Guid visitPlanInfluenceStatId);

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<VisitPlanInfluenceStudy> _influnceRepository;
 
         public VisitPlanService(IRepository<VisitStage> visitStageRepository, IRepository<Trial> trialRepository, IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<VisitPlanInfluenceStat> influnceStatRepository,
             IRepository<VisitPlanInfluenceStudy> visitPlanInfluenceStudy)
         {
             _visitStageRepository = visitStageRepository;
@@ -37,6 +33,7 @@ namespace IRaCIS.Application.Services
 
         ///暂时不用
         /// <summary> 获取项目访视计划</summary>
+       [HttpPost]
         public async Task<PageOutput<VisitStageDTO>> GetTrialVisitStageList(VisitPlanQueryDTO param)
         {
             var visitStageQuery = _visitStageRepository.AsQueryable(true).Where(u => u.TrialId == param.TrialId)
@@ -82,10 +79,10 @@ namespace IRaCIS.Application.Services
         }
 
 
-        /// <summary> 添加或更新访视计划某项[New]</summary>
-        [HttpPost]
+        /// <summary> 添加或更新访视计划某项</summary>
         [UnitOfWork]
-        public async Task<IResponseOutput<VisitStage>> AddOrUpdateVisitStage(VisitPlanCommand visitPlan)
+        [HttpPost]
+        public async Task<IResponseOutput> 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<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId)
         {