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
///
public Guid? Id { get; set; }
+ ///
+ /// 名称
+ ///
+ public string Name { get; set; }
+
///
/// 受试者ID
///
@@ -51,11 +56,34 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public Guid? SubjectVisitId { get; set; }
+
///
/// 访视名称
///
public string SubjectVisitName { get; set; }
+
+ ///
+ /// 截止访视
+ ///
+ public Guid? CutOffVisitId { get; set; }
+
+
+ ///
+ /// 截止访视名称
+ ///
+ public string CutOffVisitName { get; set; }
+
+ ///
+ /// 对应阅片期
+ ///
+ public Guid? ReadModuleId { get; set; }
+
+ ///
+ /// 对应Name
+ ///
+ public string ReadModuleName { get; set; }
+
///
/// 状态
///
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
///
public Guid? LastVisitIdSetId { get; set; }
+ ///
+ /// 对应阅片期
+ ///
+ public Guid? ReadModuleId { get; set; }
+
+
+ ///
+ /// 对应
+ ///
+ [ForeignKey("ReadModuleId")]
+ public ReadModule ReadModuleModel { get; set; } = new ReadModule();
+
///
/// 阅片期配置
///
- [ForeignKey("ReadingPeriodSetId")]
+ [ForeignKey("ReadingPeriodSetId")]
public ReadingPeriodSet ReadingPeriodSet { get; set; } = new ReadingPeriodSet();
///
- /// 阅片期配置
+ /// 访视
///
[ForeignKey("SubjectVisitId")]
public SubjectVisit SubjectVisit { get; set; } = new SubjectVisit();
@@ -81,7 +93,7 @@ namespace IRaCIS.Core.Domain.Models
///
- /// 阅片期配置
+ /// 访视
///
[ForeignKey("LastVisitIdSetId")]
public SubjectVisit LastSubjectVisit { get; set; } = new SubjectVisit();