From de812534b64c16078b252ba6922f3f9d2875ceea Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 30 Sep 2022 14:14:25 +0800
Subject: [PATCH] =?UTF-8?q?IR=20=20=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E5=87=86=E5=88=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs      | 1 +
 .../Service/Reading/Dto/ReadingMedicalReviewDto.cs            | 4 ++++
 .../Service/Reading/ReadingMedicalReviewService.cs            | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index 532b43cc..e1b8179e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<VisitTask, IRHaveReadView>()
+                .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
                  .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
                  .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
                  .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code));
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index b2adabdb..d7f7958c 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -76,6 +76,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 无效的 为True无效
         /// </summary>
         public bool? IsInvalid { get; set; }
+
+        public Guid? TrialReadingCriterionId { get; set; }
     }
 
     public class GetIRMedicalFeedbackListOutDto
@@ -143,6 +145,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
         public TaskState TaskState { get; set; }
+
+        public string TrialReadingCriterionName { get; set; }
     }
 
     public class FinishMedicalReviewInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 3fcc87ef..7ca34756 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -587,6 +587,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inDto.IsHaveQuestion != null, x => x.IsHaveQuestion == inDto.IsHaveQuestion!)
                  .WhereIf(inDto.MedicalDialogCloseEnum != null, x => x.MedicalDialogCloseEnum == inDto.MedicalDialogCloseEnum!)
                  .WhereIf(inDto.IsInvalid != null, x => x.IsInvalid == inDto.IsInvalid!)
+                 .WhereIf(inDto.TrialReadingCriterionId != null, x => x.VisitTask.TrialReadingCriterionId == inDto.TrialReadingCriterionId!)
                 .Select(x => new GetIRMedicalFeedbackListOutDto
                 {
                     TaskState=x.VisitTask.TaskState,
@@ -607,6 +608,8 @@ namespace IRaCIS.Core.Application.Service
                     MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
                     IsInvalid=x.IsInvalid,
 
+                    TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName
+
                 }).WhereIf(!inDto.SubjectCode.IsNullOrEmpty(), x => x.SubjectCode == inDto.SubjectCode);
 
             var result=await taskMedicalReviewquery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(GetIRMedicalFeedbackListOutDto.AuditState) : inDto.SortField,