From 1a4301233c4f25104ac63204424f78268ce91a5c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 18 Sep 2023 10:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=BA=8F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ClinicalData/ClinicalDataSetService.cs |  1 +
 .../ClinicalData/ReadingClinicalDataService.cs     |  2 ++
 .../Service/Visit/SubjectVisitService.cs           | 14 ++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index e05935740..580fe4a54 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -277,6 +277,7 @@ namespace IRaCIS.Application.Services
                .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
                .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
+               .OrderBy(x=>x.CreateTime)
                .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
             return trialClinicalDataList;
         }
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 34f438404..d65654bf4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -189,6 +189,8 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                  .WhereIf(!inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
+                .Include(x=>x.ClinicalDataTrialSet)
+                .OrderBy(x=>x.ClinicalDataTrialSet.CreateTime)
                 .Select(x => new GetCRCClinicalDataOutDto()
                 {
                     Id = x.Id,
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index ff91d6e6c..e6a0e9ffa 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
+        private readonly IRepository<ReadingCustomTag> _readingCustomTagRepository;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
         private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
         private readonly IRepository<Subject> _subjectRepository;
@@ -43,6 +44,7 @@ namespace IRaCIS.Core.Application.Services
                  IRepository<DicomInstance> dicomInstanceRepository,
                 IRepository<VisitTask> visitTaskRepository,
                    IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
+                     IRepository<ReadingCustomTag> readingCustomTagRepository,
               IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,
               IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
             IRepository<Subject> subjectRepository,
@@ -60,6 +62,7 @@ namespace IRaCIS.Core.Application.Services
             this._dicomInstanceRepository = dicomInstanceRepository;
             this._visitTaskRepository = visitTaskRepository;
             this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
+            this._readingCustomTagRepository = readingCustomTagRepository;
             this._noneDicomStudyFileRepository = noneDicomStudyFileRepository;
             this._readingPeriodPlanRepository = readingPeriodPlanRepository;
             _subjectRepository = subjectRepository;
@@ -325,6 +328,17 @@ namespace IRaCIS.Core.Application.Services
             }).ToListAsync();
 
 
+            var tag = await _readingCustomTagRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).Select(x => new
+            {
+                ShowOrder=  0,
+                RowIndex= 0,
+                x.SeriesId,
+                x.StudyId,
+                x.InstanceId,
+            }).ToListAsync();
+
+            thisRowinfo.AddRange(tag);
+
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
 
             if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)