修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -497,6 +497,46 @@
             状态
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.Id">
+            <summary>
+            Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SubjectId">
+            <summary>
+            受试者ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.ModuleType">
+            <summary>
+            模块类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.ModuleName">
+            <summary>
+            模块名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.IsUrgent">
+            <summary>
+            是否加急
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.SubjectVisitId">
+            <summary>
+            访视ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleOutDto.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleResultDto.PageIndex">
             <summary>
             当前页索引

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

@@ -51,9 +51,49 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
-    public class GetReadModuleOutDto : ReadModule
+    public class GetReadModuleOutDto 
     {
 
+        /// <summary>
+        /// Id
+        /// </summary>
+        public 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; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
         public string SubjectCode { get; set; }
 
         public string SiteCode { get; set; }

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

@@ -22,6 +22,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<ReadModule> _readModuleRepository;
 
+
         public ReadModuleService(IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<Subject> subjectRepository,
               IRepository<ReadModule> readModuleRepository
@@ -62,9 +63,26 @@ namespace IRaCIS.Application.Services
 
                    }).ToList()
                });
+
             var pageList = await subjectquery.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField == null|| dto.SortField==string.Empty ? "SiteCode" : dto.SortField,
                 dto.Asc);
 
+            var subjectisd = pageList.CurrentPageData.Select(x => x.SubjectId).ToList();
+
+            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,
+                        SubjectId=x.SubjectId,
+
+                    }));
+            });
+
             return (pageList, new
             {
                 MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count)

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

@@ -74,7 +74,7 @@ namespace IRaCIS.Application.Services
         public async Task<PageOutput<ReadingPeriodSetView>>  GetReadingPeriodSetList(ReadingPeriodSetQuery query)
 		{
 			
-		     var readquery =_readingPeriodSetRepository.AsQueryable()
+		     var readquery =_readingPeriodSetRepository.AsQueryable().Include(x=>x.ReadingPeriodSites)
                 .WhereIf(query.TrialId!=null,x=>x.TrialId==query.TrialId)
                 .WhereIf(query.ReadingPeriodName != null, x => x.ReadingPeriodName.Contains(query.ReadingPeriodName))
                 .ProjectTo<ReadingPeriodSetView>(_mapper.ConfigurationProvider);

IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs

@@ -66,6 +66,8 @@ namespace IRaCIS.Core.Domain.Models
 		/// 备注
 		/// </summary>
 		public string Remark { get; set; }
+
+
 		public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
 
 	}