修改

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

@@ -746,12 +746,7 @@ namespace IRaCIS.Application.Services
             });
 
             var result = await _visitTaskRepository.SaveChangesAsync();
-            // 触裁判任务
-            await this.TriggerJudgeQuestion(inDto.VisitTaskId);
-            // 添加阅片期任务
-            await this.AddReadingTask(inDto.VisitTaskId);
-            // 完成阅片修改状态
-            await this.FinishReadUpdateState(inDto.VisitTaskId);
+            await this.SubmitTaskChangeState(inDto.VisitTaskId);
             return ResponseOutput.Ok(result);
         }
 
@@ -789,14 +784,21 @@ namespace IRaCIS.Application.Services
         {
             var result = await this.SaveGlobalReadingInfo(inDto);
 
+            await this.SubmitTaskChangeState(inDto.GlobalTaskId);
+
             return result;
         }
 
 
-        //public async Task<IResponseOutput> SubmitTaskChangeState()
-        //{
-            
-        //}
+        private async Task SubmitTaskChangeState(Guid visitTaskId)
+        {
+            // 触裁判任务
+            await this.TriggerJudgeQuestion(visitTaskId);
+            // 添加阅片期任务
+            await this.AddReadingTask(visitTaskId);
+            // 完成阅片修改状态
+            await this.FinishReadUpdateState(visitTaskId);
+        }
         #endregion
 
 
@@ -931,7 +933,7 @@ namespace IRaCIS.Application.Services
                 if (visitTask.SouceReadModuleId != null)
                 {
                     var visitNum = await _readModuleRepository.Where(x => x.Id == visitTask.SouceReadModuleId).Select(x => x.VisitNum).FirstOrDefaultAsync();
-                    var lastVisitId = await _visitTaskRepository.Where(x => !x.IsAnalysisCreate && x.SouceReadModuleId == visitTask.SouceReadModuleId && x.ReadModule.VisitNum <= visitNum).OrderByDescending(x => x.ReadModule.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
+                    var lastVisitId = await _visitTaskRepository.Where(x => !x.IsAnalysisCreate&&x.ArmEnum== visitTask.ArmEnum && x.SouceReadModuleId == visitTask.SouceReadModuleId && x.ReadModule.VisitNum <= visitNum).OrderByDescending(x => x.ReadModule.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
                     visitTaskids.Add(lastVisitId);
                 }
             }

IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs

@@ -298,8 +298,6 @@ namespace IRaCIS.Application.Services
         {
             if (indto.IsTakeEffect == ReadingPeriodStatus.TakeEffect)
             {
-
-               
                 var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstNotNullAsync();
                 var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Include(x => x.SubjectVisit)
                     .Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();