修改

IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Domain.Share.Reading;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Domain.Share.Reading;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,39 +16,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
 
-    public class ReadModuleAddOrEdit
+    public class ReadModuleAddOrEdit: ReadModule
     {
-        public Guid? Id { get; set; }
+        public new Guid? Id { get; set; }
 
-        /// <summary>
-        /// 受试者ID
-        /// </summary>
-        public Guid? SubjectId { get; set; }
-
-        /// <summary>
-        /// 模块类型
-        /// </summary>
-        public ModuleTypeEnum ModuleType { get; set; }
-
-        /// <summary>
-        /// 模块名称
-        /// </summary>
-        public string ModuleName { get; set; }
-
-        /// <summary>
-        /// 是否加急
-        /// </summary>
-        public bool? IsUrgent { get; set; }
-
-        /// <summary>
-        /// 访视ID
-        /// </summary>
-        public Guid? SubjectVisitId { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public ReadModuleEnum? Status { get; set; }
     }
 
 
@@ -55,7 +27,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
 
         /// <summary>
-        /// Id
+        /// Id(阅片期Id 或者 访视ID)
         /// </summary>
         public Guid? Id { get; set; }
 
@@ -69,11 +41,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ModuleTypeEnum ModuleType { get; set; }
 
-        /// <summary>
-        /// 模块名称
-        /// </summary>
-        public string ModuleName { get; set; }
-
         /// <summary>
         /// 是否加急
         /// </summary>
@@ -84,6 +51,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? SubjectVisitId { get; set; }
 
+        /// <summary>
+        /// 访视名称
+        /// </summary>
+        public string SubjectVisitName { get; set; }
+
         /// <summary>
         /// 状态
         /// </summary>
@@ -94,19 +66,56 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DateTime CreateTime { get; set; }
 
+        /// <summary>
+        /// 受试者Code
+        /// </summary>
         public string SubjectCode { get; set; }
 
+        /// <summary>
+        /// 中心Id
+        /// </summary>
         public string SiteCode { get; set; }
 
-
+        /// <summary>
+        /// 是否为末次访视
+        /// </summary>
         public bool IsFinalVisit { get; set; } = false;
 
 
-        public string VisitName { get; set; }
+        /// <summary>
+        /// 上一访视
+        /// </summary>
+        public Guid? OutPlanPreviousVisitId { get; set; }
 
+        /// <summary>
+        /// 上一访视名称
+        /// </summary>
+        public string OutPlanPreviousVisitName { get; set; }
+
+        /// <summary>
+        /// 中心ID
+        /// </summary>
         public Guid? SiteId { get; set; }
+
+        /// <summary>
+        /// 是否为访视
+        /// </summary>
+        public bool IsVisit { get; set; }
+
+        /// <summary>
+        /// 是否为PD进展
+        /// </summary>
+        public PDStateEnum PDState { get; set; } = PDStateEnum.None;
+
+        /// <summary>
+        /// 入组确认评估
+        /// </summary>
+        public bool IsEnrollmentConfirm { get; set; } = false;
+
+
     }
 
+    
     public class GetReadModuleResultDto
     {
         /// <summary>
@@ -133,8 +142,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 数据
         /// </summary>
         public List<GetReadModuleDtoOut> CurrentPageData { get; set; }
-
-      
     }
         
         

IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs

@@ -47,21 +47,25 @@ namespace IRaCIS.Application.Services
                    SiteId = x.SiteId,
                    SubjectCode = x.Code,
                    SubjectId = x.Id,
-                   Data=x.SubjectVisitList.Select(y=>new GetReadModuleOutDto()
+                   Data=x.SubjectVisitList.OrderBy(y=>y.InPlan).Select(y=>new GetReadModuleOutDto()
                    {
-                       CreateTime = y.CreateTime,
+                       Id = y.Id,  //id
-                       Id = y.Id,
+                       ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, // 模块类型
-                       IsFinalVisit=y.IsFinalVisit,  // 是否末次访视
+                       IsUrgent = x.IsUrgent, // 是否加急
+                       SubjectVisitId = y.Id, // 访视ID
+                       SubjectVisitName=y.VisitName, //  访视名称
+                       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, // 
                        SubjectId = x.Id,
-                       SubjectVisitId = y.Id,
-                       IsUrgent = x.IsUrgent,
-                       ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, // 
-                       SubjectCode = y.Subject.Code,
-                       SiteCode = x.Site.SiteCode,
-                       SiteId = x.Site.Id,
-                       VisitName = y.VisitName,
-
-
                    }).ToList()
                });
 
@@ -80,7 +84,7 @@ namespace IRaCIS.Application.Services
                         CreateTime = y.CreateTime,
                         Id = y.Id,
                         SubjectId=x.SubjectId,
-
+                        ModuleType=y.ModuleType,
                     }));
             });
 

IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs

@@ -112,8 +112,8 @@ namespace IRaCIS.Application.Services
             var readquery =await _readingPeriodSetRepository.UpdatePartialNowNoQueryAsync(indto.Id, x => new ReadingPeriodSet() {
                 IsTakeEffect = indto.IsTakeEffect
             });
-            bool result=  await _readingPeriodSetRepository.SaveChangesAsync();
+         
-            return ResponseOutput.Result(result);
+            return ResponseOutput.Result(true);
         }
 
 

IRaCIS.Core.Domain/Reading/ReadModule.cs

@@ -65,6 +65,27 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? LastVisitIdSetId { get; set; }
 
+		/// <summary>
+		/// 阅片期配置
+		/// </summary>
+		[ForeignKey("ReadingPeriodSetId")]
+		public ReadingPeriodSet ReadingPeriodSet { get; set; } = new ReadingPeriodSet();
+
+
+		/// <summary>
+		/// 阅片期配置
+		/// </summary>
+		[ForeignKey("SubjectVisitId")]
+		public SubjectVisit SubjectVisit { get; set; } = new SubjectVisit();
+
+
+
+		/// <summary>
+		/// 阅片期配置
+		/// </summary>
+		[ForeignKey("LastVisitIdSetId")]
+		public SubjectVisit LastSubjectVisit { get; set; } = new SubjectVisit();
+
 	}
 
 

IRaCIS.Core.Domain/Visit/SubjectVisit.cs

@@ -100,8 +100,14 @@ namespace IRaCIS.Core.Domain.Models
 
         public DateTime? CheckPassedTime { get; set; }
 
+        /// <summary>
+        /// 上一访视
+        /// </summary>
         public Guid? OutPlanPreviousVisitId { get; set; }
 
+        [ForeignKey("OutPlanPreviousVisitId")]
+        public SubjectVisit OutPlanPreviousVisit { get; set; }
+
         //public Guid? ClinicalDataSignUserId { get; set; }
 
         //public DateTime? ClinicalDataSignTime { get; set; }