From 50527d9c33027fbb87c462af39fd169f7232eaca Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 10 Jan 2023 17:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkLoad/DTO/DoctorWorkLoadViewModel.cs   | 43 +++++++++++++++++++
 .../Service/WorkLoad/DoctorWorkloadService.cs | 12 +++++-
 IRaCIS.Core.Domain/Dcotor/Doctor.cs           |  2 +
 .../Dcotor/DoctorCriterionFile.cs             |  8 +++-
 4 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
index 60a75e52..ad504f6b 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
@@ -270,12 +270,15 @@ namespace IRaCIS.Application.Contracts
 
         public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
 
+        public List<CriterionFile> CriterionFileList { get; set; }
+
 
         public List<CriterionReadingCategory> CriterionCategoryList =>
               TrialReadingCriterionList.Select(t =>
             new CriterionReadingCategory()
             {
                 EnrollId = EnrollId,
+                CriterionFileList= CriterionFileList.Where(x=>x.CriterionType==t.CriterionType).ToList(),
                 TrialReadingCriterionId = t.TrialReadingCriterionId,
                 ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
             }).ToList();
@@ -317,12 +320,52 @@ namespace IRaCIS.Application.Contracts
     }
 
 
+    public class CriterionFile
+    {
+
+        public Guid Id { get; set; }
+
+
+        /// <summary>
+        /// 文件名称
+        /// </summary>
+		public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// 标准类型
+        /// </summary>
+        public CriterionType CriterionType { get; set; }
+
+        /// <summary>
+        /// 医生Id
+        /// </summary>
+        public Guid DoctorId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public CriterionFileType FileType { get; set; }
+    }
+
 
     public class CriterionReadingCategory
     {
         public Guid EnrollId { get; set; }
         public Guid TrialReadingCriterionId { get; set; }
 
+        public List<CriterionFile> CriterionFileList { get; set; }
+
+
         public List<ReadingCategory> ReadingCategorys { get; set; } = new List<ReadingCategory>();
     }
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
index 742a14f1..68c2cc03 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
@@ -207,8 +207,16 @@ namespace IRaCIS.Application.Services
                     IsEnable = allocateRule.IsEnable,
 
                     TrialReadingCriterionList = intoGroup.Trial.ReadingQuestionCriterionTrialList.Where(t=>t.IsConfirm).Select(t=>new TrialReadingCriterionDto() { TrialReadingCriterionId=t.Id,TrialReadingCriterionName=t.CriterionName,CriterionType=t.CriterionType,IsOncologyReading=t.IsOncologyReading,IsArbitrationReading=t.IsArbitrationReading,IsGlobalReading=t.IsGlobalReading,ReadingInfoSignTime=t.ReadingInfoSignTime,ReadingType=t.ReadingType}).ToList(),
-
-                    CriterionReadingCategoryList=intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
+                    CriterionFileList= doctor.CriterionFileList.Select(x=> new CriterionFile() { 
+                    CriterionType=x.CriterionType,
+                    DoctorId=x.DoctorId,
+                    FileName=x.FileName,
+                    FilePath=x.FilePath,
+                    FileType=x.FileType,
+                    Remark=x.Remark,
+                    Id=x.Id
+                    }).ToList(),
+                    CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
 
                     DoctorId = doctor.Id,
                     Code = doctor.ReviewerCode,
diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs
index 9ae5527e..feea39d4 100644
--- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs
+++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs
@@ -185,6 +185,8 @@ namespace IRaCIS.Core.Domain.Models
         public virtual Dictionary Position { get; set; }
         [JsonIgnore]
         public List<Attachment> AttachmentList { get; set; }
+        [JsonIgnore]
+        public List<DoctorCriterionFile> CriterionFileList { get; set; }
 
         public bool IsVirtual { get; set; }
 
diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
index 800b0ac8..6661804a 100644
--- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
+++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
@@ -55,8 +55,12 @@ namespace IRaCIS.Core.Domain.Models
         /// CreateTime
         /// </summary>
 		public DateTime CreateTime { get; set; }
-	 
-	 }
+
+		[JsonIgnore]
+		[ForeignKey("DoctorId")]
+		public Doctor Doctor { get; set; }
+
+	}
 
 	 
 }