From 420ba0bd3334988649439c39e196c18a77721132 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 14 Oct 2022 14:13:23 +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/Reading/Dto/ReadingImageTaskViewModel.cs     | 3 +++
 .../Service/Reading/ReadingImageTaskService.cs           | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e89639d4..78b3bb6f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -833,6 +833,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         [NotDefault]
         public Guid TrialId { get; set; }
+
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index e1463dc0..7c22c0c7 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1419,12 +1419,14 @@ namespace IRaCIS.Application.Services
             {
                 x.IsReadingShowPreviousResults,
                 x.IsReadingShowSubjectInfo,
+                x.CriterionName,
 
             }).FirstOrDefaultAsync();
 
             #region 临床数据
 
             #endregion
+
             bool isExistsClinicalData = false;
             if (trialInfo.ClinicalInformationTransmissionEnum == 1)
             {
@@ -1450,6 +1452,7 @@ namespace IRaCIS.Application.Services
                 IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults,
                 IsReadingShowSubjectInfo = criterionInfo.IsReadingShowSubjectInfo,
                 IsExistsClinicalData = isExistsClinicalData,
+                TrialCriterionName= criterionInfo.CriterionName
             });
         }
         #endregion
@@ -1463,11 +1466,11 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<GetTrialConfirmCriterionListOutDto>> GetTrialConfirmCriterionList(GetConfirmCriterionInDto inDto)
         {
-            var result = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm)
+            var result = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterion.IsConfirm && x.Id==inDto.VisitTaskId)
                .Select(x => new GetTrialConfirmCriterionListOutDto()
                {
-                   ReadingQuestionCriterionTrialId = x.Id,
-                   ReadingQuestionCriterionTrialName = x.CriterionName
+                   ReadingQuestionCriterionTrialId = x.TrialReadingCriterion.Id,
+                   ReadingQuestionCriterionTrialName = x.TrialReadingCriterion.CriterionName
                }).ToListAsync();
             return result;
         }