From 680c01f7205ade14682a020f3654bfee3cd36232 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 21 Nov 2022 11:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs      |  1 -
 .../Service/Allocation/VisitTaskService.cs            | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index bfafba782..692286995 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -250,7 +250,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public ReadingCategory ReadingCategory { get; set; }
 
-
         /// <summary>
         /// 是否是一致性分析产生
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index f4b451d51..869efc585 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -860,7 +860,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             //var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
 
 
-            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
+            var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialReadingCriterionId).FirstNotNullAsync();
 
             var readingTool = criterionConfig.ReadingTool;
             var isReadingTaskViewInOrder = criterionConfig.IsReadingTaskViewInOrder;
@@ -904,6 +904,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     RandomReadInfo = new IRUnReadOutDto(),
                     IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
                     ReadingTool = readingTool,
+                    IseCRFShowInDicomReading= criterionConfig.IseCRFShowInDicomReading,
+                    IsReadingShowSubjectInfo= criterionConfig.IsReadingShowSubjectInfo,
+                    IsReadingShowPreviousResults= criterionConfig.IsReadingShowPreviousResults,
+                    DigitPlaces= criterionConfig.DigitPlaces,
                 });
             }
             else
@@ -927,6 +931,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
                     RandomReadInfo = iRUnReadOut,
                     ReadingTool = readingTool,
+                    IseCRFShowInDicomReading = criterionConfig.IseCRFShowInDicomReading,
+                    IsReadingShowSubjectInfo = criterionConfig.IsReadingShowSubjectInfo,
+                    IsReadingShowPreviousResults = criterionConfig.IsReadingShowPreviousResults,
+                    DigitPlaces = criterionConfig.DigitPlaces,
                 });
 
             }
@@ -965,6 +973,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 {
                     Id = u.Id,
                     IsUrgent = u.IsUrgent,
+              
                     VisitNum = u.VisitTaskNum,
                     TaskBlindName = u.TaskBlindName,
                     VisistId = u.SourceSubjectVisitId,