From 2d9a6898fa4872758b5074e3edcb420a03505da1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 23 Jun 2022 17:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 11 ++++++++++
 .../Reading/ReadingImageTaskService.cs        | 12 +++++++++++
 .../Service/Reading/_MapConfig.cs             |  2 ++
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       | 20 +++++++++++++++++++
 IRaCIS.Core.Domain/Trial/Trial.cs             | 10 ++++++++++
 5 files changed, 55 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 4074cace3..38126cc1f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -133,6 +133,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        public ReadingTaskState ReadingTaskState { get; set; }
     }
 
+    public class GetReadingPastResultListOutDto
+    {
+        public Guid TaskId { get; set; }
+        public string TaskName { get; set; }
+    }
+
+    public class GetReadingPastResultListInDto
+    {
+        public Guid TrialId { get; set; }
+    }
+
     public class SaveJudgeVisitTaskResult
     {
         public Guid VisitTaskId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 33d04ed51..ef8d267c4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -379,6 +379,18 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(result);
         }
 
+        /// <summary>
+        /// 获取既往结果
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto)
+        {
+            var readingPastResultListawait =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id)
+                .ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
+                return readingPastResultListawait;
+        }
+
         /// <summary>
         /// 找子问题
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index c627d3dbe..9b2107ab4 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -75,6 +75,8 @@ namespace IRaCIS.Core.Application.Service
             #region IR阅片
             CreateMap<ReadingQuestionTrial, GetTrialReadingQuestionOutDto>()
                 .ForMember(x=>x.ReadingQuestionTrialId, y=>y.MapFrom(z=>z.Id));
+
+            CreateMap<VisitTask, GetReadingPastResultListOutDto>();
             #endregion
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index b31c40d5b..f695157b3 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -194,6 +194,16 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsFollowJudgeTaskAutoAssign { get; set; }
 
+        /// <summary>
+        /// 阅片是否显示受试者信息
+        /// </summary>
+        public bool IsReadingShowSubjectInfo { get; set; } 
+
+        /// <summary>
+        /// 阅片是否显示既往结果
+        /// </summary>
+        public bool IsReadingShowPreviousResults { get; set; } 
+
         public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; }
     }
 
@@ -204,6 +214,16 @@ namespace IRaCIS.Core.Application.Contracts
         public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
 
         public bool IsReadingTaskViewInOrder { get; set; } = true;
+
+        /// <summary>
+        /// 阅片是否显示受试者信息
+        /// </summary>
+        public bool IsReadingShowSubjectInfo { get; set; }
+
+        /// <summary>
+        /// 阅片是否显示既往结果
+        /// </summary>
+        public bool IsReadingShowPreviousResults { get; set; } 
     }
 
     public class TrialJudgeTaskConfig
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index d512037d6..472ee1236 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -345,6 +345,16 @@ namespace IRaCIS.Core.Domain.Models
         //��Ƭ������ʾ�Ƿ�˳��
         public bool IsReadingTaskViewInOrder { get; set; } = true;
 
+        /// <summary>
+        /// ��Ƭ�Ƿ���ʾ��������Ϣ
+        /// </summary>
+        public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+        /// <summary>
+        /// ��Ƭ�Ƿ���ʾ�������
+        /// </summary>
+        public bool IsReadingShowPreviousResults { get; set; } = false;
+
 
         //public Guid? ReviewTypeId { get; set; } = Guid.Empty;