From a38fc6fb184be950e970b9420925e49124ddaaef Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 10 Nov 2022 16:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9modality?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs               | 2 ++
 .../Service/TrialSiteUser/TrialConfigService.cs               | 2 +-
 .../Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs           | 3 +++
 .../Service/WorkLoad/DoctorWorkloadService.cs                 | 2 +-
 IRaCIS.Core.Domain/Trial/Trial.cs                             | 4 ++++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 0eb40a717..b7dc0ff9c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -66,6 +66,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Modalitys { get; set; } = string.Empty;
 
+        public List<string> ModalityList { get; set; } = new List<string>();
+
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index f1e518206..6630cef25 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -654,7 +654,7 @@ namespace IRaCIS.Core.Application
 
             var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();
 
-
+            trialConfig.Modalitys = $"|{String.Join('|', trialConfig.ModalityList)}|";
             _mapper.Map(trialConfig, trialInfo);
             trialInfo.UpdateTime = DateTime.Now;
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
index 27cf3b997..60a75e52f 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
@@ -263,6 +263,9 @@ namespace IRaCIS.Application.Contracts
 
         //public List<ReadingCategory> ReadingCategorys { get; set; }
 
+        public string UserName { get; set; }
+
+
         public List<TrialReadingCriterionDto> TrialReadingCriterionList { get; set; }
 
         public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
index cb402cfe5..41914561e 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
@@ -232,8 +232,8 @@ namespace IRaCIS.Application.Services
                     FirstName = doctor.FirstName,
                     LastName = doctor.LastName,
                     FullName = doctor.FullName,
-
                     ChineseName = doctor.ChineseName,
+                    UserName= intoGroup.DoctorUser.UserName,
 
                     OutEnrollTime = intoGroup.OutEnrollTime,
                     EnrollTime = intoGroup.EnrollTime,
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 5b06852d5..54a9302dc 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
 
@@ -236,6 +237,9 @@ namespace IRaCIS.Core.Domain.Models
 
         public string Modalitys { get; set; } = "CT|MR|BoneScan|Photograph|PET|X-ray|US";
 
+        [NotMapped]
+        public List<string> ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList();
+
 
         public string PreliminaryAuditReuploadText { get; set; } = string.Empty;