diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 007f82185..b1f8197c2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services var subjectisd = pageList.CurrentPageData.Select(x => x.SubjectId).ToList(); - var readModules =await _readModuleRepository.Where(x => subjectisd.Contains(x.SubjectId)).ToListAsync(); + var readModules =await _readModuleRepository.Where(x => subjectisd.Contains(x.SubjectId)).Include(x=>x.SubjectVisit) + .Include(x => x.ReadModuleModel).ToListAsync(); pageList.CurrentPageData.ForEach(x => { x.Data.AddRange(readModules.Where(y => y.SubjectId == x.SubjectId).Select( @@ -98,11 +99,11 @@ namespace IRaCIS.Application.Services SubjectCode= x.SubjectCode, SiteCode=x.SiteCode, SubjectVisitId= y.SubjectVisitId, - SubjectVisitName=y.SubjectVisit.VisitName, // 截止访视名称 + SubjectVisitName=y.SubjectVisit?.VisitName, // 截止访视名称 CutOffVisitId = y.SubjectVisitId, // 截止访视 - CutOffVisitName = y.SubjectVisit.VisitName, // 截止访视名称 + CutOffVisitName = y.SubjectVisit?.VisitName, // 截止访视名称 ReadModuleId=y.ReadModuleId, - ReadModuleName=y.ReadModuleModel.ModuleName, + ReadModuleName=y.ReadModuleModel?.ModuleName, IsUrgent = y.IsUrgent })); @@ -183,9 +184,6 @@ namespace IRaCIS.Application.Services SubjectVisitId = visit.Id, Status = ReadModuleEnum.ImageRead, - - - }); var res = await _readModuleRepository.SaveChangesAsync();