From d1ce475e9ced6b2eb7fb6a89dff054d46d1525c4 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 1 Jun 2022 15:47:58 +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

---
 .../Service/Reading/Dto/GetReadModuleDto.cs   | 28 +++++++++++++++++++
 .../Service/Reading/ReadModuleService.cs      | 19 ++++++++++---
 IRaCIS.Core.Domain/Reading/ReadModule.cs      | 18 ++++++++++--
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
index 1cfc5863b..82f026b67 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
@@ -31,6 +31,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? Id { get; set; }
 
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
 		/// 受试者ID
 		/// </summary>
@@ -51,11 +56,34 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? SubjectVisitId { get; set; }
 
+
         /// <summary>
         /// 访视名称
         /// </summary>
         public string SubjectVisitName { get; set; }
 
+
+        /// <summary>
+        /// 截止访视
+        /// </summary>
+        public Guid? CutOffVisitId { get; set; }
+
+
+        /// <summary>
+        /// 截止访视名称
+        /// </summary>
+        public string CutOffVisitName { get; set; }
+
+        /// <summary>
+        /// 对应阅片期
+        /// </summary>
+        public Guid? ReadModuleId { get; set; }
+
+        /// <summary>
+        /// 对应Name
+        /// </summary>
+        public string ReadModuleName { get; set; }
+
         /// <summary>
         /// 状态
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
index 29f075ff2..f3dc46db8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
@@ -47,24 +47,27 @@ namespace IRaCIS.Application.Services
                    SiteId = x.SiteId,
                    SubjectCode = x.Code,
                    SubjectId = x.Id,
-                   Data=x.SubjectVisitList.OrderBy(y=>y.InPlan).Select(y=>new GetReadModuleOutDto()
+                   Data=x.SubjectVisitList.OrderByDescending(y=>y.InPlan).Select(y=>new GetReadModuleOutDto()
                    {
                        Id = y.Id,  //id
+                       Name=y.VisitName,
                        ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, // 模块类型
                        IsUrgent = x.IsUrgent, // 是否加急
                        SubjectVisitId = y.Id, // 访视ID
                        SubjectVisitName=y.VisitName, //  访视名称
-                       Status= y.SubmitState== SubmitStateEnum.None|| y.SubmitState== SubmitStateEnum.ToSubmit? ReadModuleEnum.ImageUpload: ReadModuleEnum.ImageUpload, // 访视模块
+                       Status= y.SubmitState== SubmitStateEnum.None|| y.SubmitState== SubmitStateEnum.ToSubmit? ReadModuleEnum.ImageUpload: ReadModuleEnum.ImageUpload, // 状态
                        CreateTime = y.CreateTime, // 创建时间
                        SubjectCode = y.Subject.Code, // 受试者code
                        SiteCode = x.Site.SiteCode, // 中心Code
+
+
                        IsFinalVisit=y.IsFinalVisit, // 是否为末次评估
                        OutPlanPreviousVisitId = y.OutPlanPreviousVisitId, // 上一访视
                        OutPlanPreviousVisitName = y.OutPlanPreviousVisit.VisitName, // 上一访视名称
                        SiteId = x.Site.Id,  // 中心ID
                        IsVisit=true,  // 是否为访视
                        PDState = y.PDState, // PD 进展
-                       IsEnrollmentConfirm=y.IsEnrollmentConfirm, // 
+                       IsEnrollmentConfirm=y.IsEnrollmentConfirm, // 入组
                        SubjectId = x.Id,
                    }).ToList()
                });
@@ -77,14 +80,22 @@ namespace IRaCIS.Application.Services
             var readModules =await _readModuleRepository.Where(x => subjectisd.Contains(x.SubjectId)).ToListAsync();
 
             pageList.CurrentPageData.ForEach(x => {
-
                 x.Data.AddRange(readModules.Where(y => y.SubjectId == x.SubjectId).Select(
                     y => new GetReadModuleOutDto()
                     {
                         CreateTime = y.CreateTime,
                         Id = y.Id,
+                        Name=y.ModuleName,
                         SubjectId=x.SubjectId,
                         ModuleType=y.ModuleType,
+                        Status=y.Status,
+                        SubjectCode= x.SubjectCode,
+                        SiteCode=x.SiteCode,
+                        CutOffVisitId = y.SubjectVisitId,  // 截止访视
+                        CutOffVisitName = y.SubjectVisit.VisitName  // 截止访视名称
+                        ReadModuleId=y.ReadModuleId,
+                        ReadModuleName=y.ReadModuleModel.ModuleName,
+
                     }));
             });
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadModule.cs
index 150ee9797..8149e57af 100644
--- a/IRaCIS.Core.Domain/Reading/ReadModule.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadModule.cs
@@ -65,15 +65,27 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? LastVisitIdSetId { get; set; }
 
+	    /// <summary>
+		/// 对应阅片期
+		/// </summary> 
+		public Guid? ReadModuleId { get; set; }
+
+
+		/// <summary>
+		/// 对应
+		/// </summary>
+		[ForeignKey("ReadModuleId")]
+		public ReadModule ReadModuleModel { get; set; } = new ReadModule();
+
 		/// <summary>
 		/// 阅片期配置
 		/// </summary>
-		[ForeignKey("ReadingPeriodSetId")]
+		[ForeignKey("ReadingPeriodSetId")] 
 		public ReadingPeriodSet ReadingPeriodSet { get; set; } = new ReadingPeriodSet();
 
 
 		/// <summary>
-		/// 阅片期配置
+		/// 访视
 		/// </summary>
 		[ForeignKey("SubjectVisitId")]
 		public SubjectVisit SubjectVisit { get; set; } = new SubjectVisit();
@@ -81,7 +93,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
 		/// <summary>
-		/// 阅片期配置
+		/// 访视
 		/// </summary>
 		[ForeignKey("LastVisitIdSetId")]
 		public SubjectVisit LastSubjectVisit { get; set; } = new SubjectVisit();