IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -1130,7 +1130,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid OncologyTaskId { get; set; }
 
-        public Guid RelatedTaskId { get; set; }
+        public Guid GlobalTaskId { get; set; }
 
         public List<SetOncologyQuestion> OncologyQuestionList { get; set; }
     }
@@ -1265,8 +1265,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid GlobalTaskId { get; set; }
 
-        public Guid RelatedTaskId { get; set; }
-
 
         public Guid SubjectId { get; set; }
 

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

@@ -56,19 +56,10 @@ namespace IRaCIS.Application.Services
             var relatedVisitTaskIdList = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.RelatedVisitTaskIdList).FirstNotNullAsync();
             if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned && relatedVisitTaskIdList.Count() > 0)
             {
-                var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
-
-                // 说明是裁判 取裁判结果
-                if (judgeResultTaskId != null)
+                if (relatedVisitTaskIdList.Count() > 0)
                 {
-                    globalTaskInfo = await _visitTaskRepository.Where(x =>x.Id== judgeResultTaskId).FirstNotNullAsync();
+                   globalTaskInfo = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).FirstNotNullAsync();
                 }
-                else
-                {
-                    globalTaskInfo = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).FirstNotNullAsync();
-                }
-
-
             }
             else
             {
@@ -92,7 +83,7 @@ namespace IRaCIS.Application.Services
 
             // 判断是否产生裁判
 
-            if (globalTaskInfo!.JudgeVisitTaskId == null)
+            if (globalTaskInfo.JudgeVisitTaskId == null)
             {
                 visitTask = globalTaskInfo;
                 // 全局的关联访视
@@ -105,11 +96,10 @@ namespace IRaCIS.Application.Services
                 {
                     throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
                 }
-                visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
+                visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstOrDefaultAsync();
                 visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync();
             }
 
-            result.RelatedTaskId = globalTaskInfo!.JudgeVisitTaskId ?? globalTaskInfo.Id;
             result.GlobalTaskId = visitTask.Id;
             result.SubjectId = visitTask.SubjectId;
 
@@ -211,7 +201,7 @@ namespace IRaCIS.Application.Services
             await _readingOncologyTaskInfoRepository.AddRangeAsync(readingOncologies);
 
             var relatedVisitTaskIdList=new  List<Guid>();
-            relatedVisitTaskIdList.Add(inDto.RelatedTaskId);
+            relatedVisitTaskIdList.Add(inDto.GlobalTaskId);
 
             var relatedVisitTaskIds = JsonConvert.SerializeObject(relatedVisitTaskIdList);