修改

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Domain.Share;
 using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Contracts;
 using Newtonsoft.Json;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Core.Application.Service
 {	
@@ -354,6 +355,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveMedicineQuestion(SaveMedicineQuestionInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -397,6 +399,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveMedicalReviewInfo(SaveMedicalReviewInfoInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -448,6 +451,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> ClosedMedicalReviewDialog(ClosedMedicalReviewDialogInDto inDto)
         {
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
@@ -479,6 +483,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public  async Task<IResponseOutput> SendMedicalReviewDialog(SendMedicalReviewDialogInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -513,6 +518,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [UnitOfWork]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> IRSendMedicalReviewDialog(IRSendMedicalReviewDialogInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -642,6 +648,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> IRConfirmMedicalReview(IRConfirmMedicalReviewInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -10,6 +10,7 @@ using IRaCIS.Core.Infrastructure;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Application.Services
 {
@@ -41,6 +42,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> BatchSubmitGlobalReadingInfo(BatchSubmitGlobalReadingInfo inDto)
         {
             await VerifyTaskIsSign(inDto.GlobalTaskId);
@@ -80,6 +82,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveGlobalReadingInfo(SaveGlobalReadingInfoInDto inDto)
         {
             await VerifyTaskIsSign(inDto.GlobalTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -13,6 +13,7 @@ using IRaCIS.Core.Application.Interfaces;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Caching.Memory;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Application.Services
 {
@@ -129,6 +130,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task ChangeCalculationAnswer(ChangeCalculationAnswerInDto inDto)
         {
             var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
@@ -203,6 +205,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task ReadClinicalData(ReadClinicalDataInDto inDto)
         {
             await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask
@@ -921,6 +924,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task SplitLesion(SplitLesionInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -967,6 +971,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task MergeLesion(MergeLesionInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -1032,6 +1037,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveImageQuality(ChangeDicomReadingQuestionAnswerInDto inDto)
         {
             return await ChangeDicomReadingQuestionAnswer(inDto);
@@ -1055,6 +1061,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> ChangeDicomReadingQuestionAnswer(ChangeDicomReadingQuestionAnswerInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -1089,6 +1096,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> DeleteReadingRowAnswer(DeleteReadingRowAnswerInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -1225,6 +1233,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<SubmitTableQuestionOutDto> SubmitTableQuestion(SubmitTableQuestionInDto inDto)
         {
             SubmitTableQuestionOutDto result = new SubmitTableQuestionOutDto();
@@ -1244,6 +1253,7 @@ namespace IRaCIS.Application.Services
             var criterionId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.TrialReadingCriterionId).FirstOrDefaultAsync();
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == criterionId).FirstNotNullAsync();
             var tableQuestionIds = inDto.AnswerList.Select(x => x.TableQuestionId).ToList();
+            var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => x.RowId == inDto.RowId).ToListAsync();
 
             var tableQuestionIdGroup = tableQuestionIds.GroupBy(x => new { TableQuestionId = x }).Select(x => new TableQuestionData
             {
@@ -1382,7 +1392,9 @@ namespace IRaCIS.Application.Services
                 });
 
 
-                foreach(var item in inDto.AnswerList)
+                foreach (var item in inDto.AnswerList)
+                {
+                    if (tableAnswerList.Any(x => x.TableQuestionId == item.TableQuestionId))
                     {
                         await _readingTableQuestionAnswerRepository.UpdatePartialFromQueryAsync(x => x.RowId == inDto.RowId && x.TableQuestionId == item.TableQuestionId, x => new ReadingTableQuestionAnswer()
                         {
@@ -1391,6 +1403,21 @@ namespace IRaCIS.Application.Services
 
                         });
                     }
+                    else
+                    {
+                        await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer()
+                        {
+                            Answer = item.Answer,
+                            QuestionId = inDto.QuestionId,
+                            TableQuestionId = item.TableQuestionId,
+                            RowId = inDto.RowId.Value,
+                            TrialId = taskinfo.TrialId,
+                            RowIndex = rowInfo.RowIndex,
+                            VisitTaskId = inDto.VisitTaskId,
+                        });
+                    }
+                    
+                }
 
               
             }
@@ -1420,7 +1447,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto)
         {
 
@@ -1841,6 +1868,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task AddReadingTask(Guid visitTaskId)
         {
             // ****** 先生成阅片期  阅片期任务阅片完成之后生成肿瘤学的  如果没有阅片期 直接生成肿瘤学 *********////

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs

@@ -10,6 +10,7 @@ using IRaCIS.Core.Infrastructure;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Application.Services
 {
@@ -61,6 +62,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SetTrialCriterionJudgeQuestionAnswerGroup(SetTrialCriterionJudgeQuestionAnswerGroupInDto inDto)
         {
             await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(inDto.ReadingQuestionTrialId, x => new ReadingQuestionTrial()
@@ -335,6 +337,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -357,6 +360,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -5,6 +5,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Contracts;
 using MassTransit;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Application.Services
 {
@@ -37,6 +38,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SaveVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -10,6 +10,7 @@ using IRaCIS.Core.Infrastructure;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Filter;
 
 namespace IRaCIS.Application.Services
 {
@@ -162,6 +163,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SetOncologyReadingInfo(SetOncologyReadingInfoInDto inDto)
         {
             await VerifyTaskIsSign(inDto.OncologyTaskId);