diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index e14a62f5b..f24ecb0a8 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -337,14 +337,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO public class GetDataInspectionOutDto : DataInspection { public string ExperimentName { get; set; } = string.Empty; - public string SubjectCode { get; set; } = string.Empty; - public string TrialName { get; set; } = string.Empty; - public string SiteCode { get; set; } = string.Empty; - public string ResearchProgramNo { get; set; } = string.Empty; - public string SubjectVisitName { get; set; } = string.Empty; - public string RoleName { get; set; } = string.Empty; public string FirstName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index e54488d86..9756242bc 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -344,8 +344,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid SubjectId { get; set; } - public List Data { get; set; } + public List Data { get; set; } - public List ReadModuleData { get; set; } } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index f1facb549..a7e8616a6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -80,33 +80,7 @@ namespace IRaCIS.Application.Services SiteId = x.Key.SiteId, SubjectCode = x.Key.SubjectCode, SubjectId = x.Key.SubjectId, - Data = x.Select(y => new GetReadModuleOutDto() - { - CreateTime = y.CreateTime, - CutOffVisitId = y.CutOffVisitId, - SiteCode = y.SiteCode, - SubjectId = y.SubjectId, - CutOffVisitName = y.CutOffVisitName, - SiteId = y.SiteId, - Status = y.Status, - SubjectCode = y.SubjectCode, - Id = y.Id, - IsEnrollmentConfirm = y.IsEnrollmentConfirm, - IsFinalVisit = y.IsFinalVisit, - SubjectVisitId = y.SubjectVisitId, - SubjectVisitName = y.SubjectVisitName, - PDState = y.PDState, - TrialSiteCode = y.TrialSiteCode, - IsUrgent = y.IsUrgent, - IsVisit = y.IsVisit, - ModuleType = y.ModuleType, - Name = y.Name, - OutPlanPreviousVisitId = y.OutPlanPreviousVisitId, - OutPlanPreviousVisitName = y.CutOffVisitName, - ReadModuleId = y.CutOffVisitId, - ReadModuleName = y.ReadModuleName, - VisitNum = y.VisitNum - }).ToList() + Data = x.ToList() }).ToList();