From efaba3f46ace681daa46fdf4aa91157ac7cba01e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 2 Jun 2022 13:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9SubjectVisit=20=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 23 +++++++++++++++----
 .../Service/QC/_MapConfig.cs                  |  5 ++--
 .../Service/Visit/DTO/VisitPointViewModel.cs  |  2 ++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9397ca403..4bdb99e05 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -331,10 +331,10 @@
             <summary>
             获取枚举
             </summary>
-            <param name="Identification">标识</param>
-            <param name="json">Json对象</param>
+            <param name="trialId">标识</param>
+            <param name="identifications">标识</param>
+            <param name="jsonStr">Json对象</param>
             <returns></returns>
-            <exception cref="!:BusinessValidationFailedException"></exception>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetDataInspectionDateType(IRaCIS.Core.Domain.Models.DataInspection)">
             <summary>
@@ -487,11 +487,26 @@
             受试者ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.SubjectVisitName">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.Name">
             <summary>
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitFinishReadingAddReadModuleInDto.TrialId">
+            <summary>
+            项目ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitFinishReadingAddReadModuleInDto.SubjectId">
+            <summary>
+            受试者Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.VisitFinishReadingAddReadModuleInDto.SubjectVisitId">
+            <summary>
+            访视Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleSingleOutdto.ModuleType">
             <summary>
             模块类型
diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 0918a9626..6d5daacd3 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -95,8 +95,9 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.PreviousSurgeryList, u => u.MapFrom(s => s.PreviousSurgeryList.Where(t => t.SubjectVisitId == subjectVisitId || t.IsSubjectLevel)));
 
             CreateMap<SubjectVisit, SubjectVisitDTO>();
-            CreateMap<SubjectVisit, SubjectVisitSelectItem>();
-
+            CreateMap<SubjectVisit, SubjectVisitSelectItem>()
+                 .ForMember(d => d.IsUploadedImage, u => u.MapFrom(s => s.StudyList.Count() > 0 || s.NoneDicomStudyList.SelectMany(u => u.NoneDicomFileList).Count() > 0));
+               
             CreateMap<PreviousPDF, PreviousPDFView>()
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token));
 
diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
index 7b9dfc93b..e610c75ee 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
@@ -138,6 +138,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string VisitName { get; set; } = String.Empty;
 
         public int VisitExecuted { get; set; }
+
+        public bool IsUploadedImage { get; set; }
     }
 
     public class SubjectVisitSelectDTO