From e0756a40ea97cb81baeff093fe72fde16baea669 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 30 Sep 2022 15:35:05 +0800
Subject: [PATCH] x

---
 .../Service/Allocation/VisitTaskHelpeService.cs       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 2b23f573e..f9c0604ed 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -758,7 +758,7 @@ namespace IRaCIS.Core.Application.Service
                 case GenerateTaskCategory.Judge:
                     var firstTask = await _visitTaskRepository.Where(x => generateTaskCommand.JudgeVisitTaskIdList.Contains(x.Id)).FirstOrDefaultAsync();
 
-                    var subjectUser = await _subjectUserRepository.Where(x => x.SubjectId == firstTask.SubjectId && x.ArmEnum == Arm.JudgeArm && x.IsConfirmed).FirstOrDefaultAsync();
+                    var subjectUser = await _subjectUserRepository.Where(x => x.SubjectId == firstTask.SubjectId && x.ArmEnum == Arm.JudgeArm && x.IsConfirmed &&x.TrialReadingCriterionId==firstTask.TrialReadingCriterionId).FirstOrDefaultAsync();
 
                     VisitTask visitTask = new VisitTask()
                     {
@@ -782,6 +782,7 @@ namespace IRaCIS.Core.Application.Service
                         AllocateTime = subjectUser == null ? null : DateTime.Now,
                         SuggesteFinishedTime = subjectUser == null ? null : DateTime.Now.AddDays(7),
 
+                        TrialReadingCriterionId = firstTask.TrialReadingCriterionId,
 
                     };
                     await _visitTaskRepository.AddAsync(visitTask);
@@ -829,7 +830,9 @@ namespace IRaCIS.Core.Application.Service
                             TaskBlindName = item.ReadingName,
                             SouceReadModuleId = item.ReadModuleId,
                             TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                            ReadingCategory = item.ReadingCategory
+                            ReadingCategory = item.ReadingCategory,
+
+                            TrialReadingCriterionId = originalTaskInfo.TrialReadingCriterionId,
                         });
 
                         currentMaxCodeInt = currentMaxCodeInt + 1;
@@ -842,7 +845,9 @@ namespace IRaCIS.Core.Application.Service
 
                     foreach (var item in generateTaskCommand.ReadingGenerataTaskList)
                     {
+                        //需要 根据标准筛选
                         var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed).FirstOrDefaultAsync();
+
                         var singleTask = await _visitTaskRepository.AddAsync(new VisitTask()
                         {
                             TrialId = trialId,
@@ -863,7 +868,7 @@ namespace IRaCIS.Core.Application.Service
                             TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
                             ReadingCategory = item.ReadingCategory
 
-
+                            //TrialReadingCriterionId = originalTaskInfo.TrialReadingCriterionId,
                         });
 
                         singleTask.AllocateTime = DateTime.Now;