From f679eba8fb632c798147a127f4a5425533fed21f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Apr 2022 16:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs     | 2 ++
 IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs   | 2 ++
 IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs     | 3 +--
 IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
index 48edb92f1..a006e6a27 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
@@ -48,6 +48,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<DicomSeries, QASeriesInfoDto>()
+                  .ForMember(o => o.StudyTime, t => t.MapFrom(u => u.DicomStudy.StudyTime))
+
                 .ForMember(o => o.StudyCode, t => t.MapFrom(u => u.DicomStudy.StudyCode))
                  .ForMember(o => o.InstanceList, t => t.MapFrom(u => u.DicomInstanceList.Select(t=>t.Id).ToArray()))
                 ;
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
index f405721d6..d34b8a8ff 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
@@ -386,6 +386,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
     public class QASeriesInfoDto
     {
+        public DateTime? StudyTime { get; set; }
+
         public string StudyCode { get; set; } = string.Empty;
         public Guid Id { get; set; }
         public Guid StudyId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 6fd1591bb..afa2115ed 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -359,7 +359,6 @@ namespace IRaCIS.Core.Application.Contracts
         public string SubjectCode { get; set; } = String.Empty;
         public String TrialSiteCode { get; set; } = String.Empty;
 
-        public ChallengeStateEnum ChallengeState { get; set; }
 
 
         public int? ChallengeCount { get; set; }
@@ -400,7 +399,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class QCVisitBasicListViewModel
     {
-
+        public ChallengeStateEnum ChallengeState { get; set; }
         public bool? IsConfirmedClinicalData { get; set; }
         public bool IsQCConfirmedReupload { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
index 393a8d69d..039c6ebf6 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@@ -76,8 +76,8 @@ namespace IRaCIS.Application.Services
         public async Task<List<TrialSelectDTO>> GetTrialSelect()
         {
             return  await  _trialRepository.AsQueryable()
-                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM, t => t.IsDeleted == false)
+                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false)
+               
                 .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
         }