From 5b2449b60740cd79c8e783d3a223d544a36212bc Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 21 Sep 2023 11:36:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=96=B0=E5=A2=9EParentT?=
 =?UTF-8?q?riggerValueList=20RelevanceValueList=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 60cc90cc6..a787d8d4f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -3,6 +3,7 @@ using MassTransit;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -2276,6 +2277,42 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         //public List<TableQuestionDataInfo> TableQuestions { get; set; }
 
         public List<GetSystemReadingQuestionOutDto> Childrens { get; set; }
+
+        [NotMapped]
+        public List<string> RelevanceValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.RelevanceValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+        [NotMapped]
+        public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
     }
 
     public class GetTrialReadingQuestionOutDto

From 8b124e1c60289b06cbc49bf3f939c73f0d82240a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 21 Sep 2023 10:48:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/SubjectVisitService.cs                  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 74158eeb2..f1702dd28 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -419,12 +419,20 @@ namespace IRaCIS.Core.Application.Services
 
                             item.InstanceCount = item.InstanceList.Count();
 
+                            item.Description = "Key Series";
+
+                            var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
+                            ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
+                            item.Modality = string.Join(",", modalityList);
                             thisVisitTaskStudy.SeriesList.Add(item);
                             thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count();
 
 
 
                         }
+
+
+
                         result.Add(thisVisitTaskStudy);
 
                     }