修改一版

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1085,7 +1085,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         {
             var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
                   .Where(x => !x.Subject.IsDeleted)
-              .Where(t => (t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect) || t.ReReadingApplyState == ReReadingApplyState.HaveApplyed)
+              .Where(t => (t.ReadingTaskState != ReadingTaskState.HaveSigned || t.ReReadingApplyState == ReReadingApplyState.HaveApplyed) && t.TaskState == TaskState.Effect)
                   .GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
             var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()

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

@@ -129,7 +129,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<GetGlobalReadingInfoOutDto> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto)
+        public async Task<(GetGlobalReadingInfoOutDto,object)> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto)
         {
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             if (taskInfo.ReadingCategory != ReadingCategory.Global)
@@ -215,7 +215,28 @@ namespace IRaCIS.Application.Services
 
             });
 
-            return result;
+
+            var subjectCode = await _subjectRepository.Where(x => x.Id == taskInfo.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
+
+
+            var trialInfo = await _trialRepository.Where(x => x.Id == taskInfo.TrialId).Select(x => new
+            {
+                x.IsReadingShowPreviousResults,
+                x.IsReadingShowSubjectInfo,
+                x.ClinicalInformationTransmissionEnum,
+            }).FirstOrDefaultAsync();
+
+            return (result, new
+            {
+                VisitTaskId = taskInfo.Id,
+                SubjectId = taskInfo.SubjectId,
+                SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? subjectCode : taskInfo.BlindSubjectCode,
+                ReadingCategory = taskInfo.ReadingCategory,
+                TaskBlindName = taskInfo.TaskBlindName,
+                IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
+                IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
+               
+            });
         }
         #endregion
 
@@ -692,15 +713,9 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<GetJudgeReadingInfoOutDto> GetJudgeReadingInfo(GetJudgeReadingInfo inDto)
+        public async Task<(GetJudgeReadingInfoOutDto,object)> GetJudgeReadingInfo(GetJudgeReadingInfo inDto)
         {
-            var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => new
+            var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync();
-            {
-                x.ReadingTaskState,
-                x.JudgeResultTaskId,
-                x.JudgeResultRemark,
-                x.JudgeResultImagePath,
-            }).FirstOrDefaultAsync();
             GetJudgeReadingInfoOutDto judgeInfo = new GetJudgeReadingInfoOutDto()
             {
                 ReadingTaskState = visitTask.ReadingTaskState,
@@ -758,17 +773,17 @@ namespace IRaCIS.Application.Services
                     break;
 
                 case ReadingCategory.Global:
-                    var taskOneInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
+                    var taskOneInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
                     {
                         UsingOriginalData = true,
                         VisitTaskId = taskList[0].Id
-                    });
+                    })).Item1;
 
-                    var taskTwoInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
+                    var taskTwoInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
                     {
                         UsingOriginalData = true,
                         VisitTaskId = taskList[1].Id
-                    });
+                    })).Item1;
 
 
                     foreach (var item in taskOneInfo.TaskList)
@@ -855,8 +870,28 @@ namespace IRaCIS.Application.Services
                     break;
             }
 
-           
+            var subjectCode = await _subjectRepository.Where(x => x.Id == visitTask.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
-            return judgeInfo;
+
+
+            var trialInfo = await _trialRepository.Where(x => x.Id == visitTask.TrialId).Select(x => new
+            {
+                x.IsReadingShowPreviousResults,
+                x.IsReadingShowSubjectInfo,
+                x.ClinicalInformationTransmissionEnum,
+            }).FirstOrDefaultAsync();
+
+            return (judgeInfo, new
+            {
+                VisitTaskId = visitTask.Id,
+                SubjectId = visitTask.SubjectId,
+                SubjectCode = visitTask.BlindSubjectCode.IsNullOrEmpty() ? subjectCode : visitTask.BlindSubjectCode,
+                ReadingCategory = visitTask.ReadingCategory,
+                TaskBlindName = visitTask.TaskBlindName,
+                IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
+                IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
+
+            });
+            
         }
         #endregion
 
@@ -1267,17 +1302,17 @@ namespace IRaCIS.Application.Services
                             noteEqual = ComputeJudgeResult(groupTasks);
                             break;
                         case ReadingCategory.Global:
-                            var taskOneInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
+                            var taskOneInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
                             {
                                 UsingOriginalData = true,
                                 VisitTaskId = visitTaskids[0]
-                            });
+                            })).Item1;
 
-                            var taskTwoInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
+                            var taskTwoInfo = (await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
                             {
                                 UsingOriginalData = true,
                                 VisitTaskId = visitTaskids[1]
-                            });
+                            })).Item1;
 
                             // 判断两个任务是否
                             if (taskOneInfo.TaskList.Count() != taskTwoInfo.TaskList.Count())
@@ -1330,7 +1365,7 @@ namespace IRaCIS.Application.Services
                         });
 
                         // 找到最后一个任务ID
-                        var lastTask = taskOneInfo.TaskList.Last();
+                        var lastTask = taskOneInfo.Item1.TaskList.Last();
 
                         if (lastTask == null)
                         {