diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 46e926e87..3820bdbb0 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -932,6 +932,11 @@ 中心name + + + 计划条数 + + 项目ID diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index 030822c52..06396180f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -201,6 +201,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 中心name /// public List SiteCodes { get; set; } + + /// + /// 计划条数 + /// + public int PlanCount { get; set; } } public class SetReadingPeriodSetEffect diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 1d0f4f9e5..a844d5e4e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -165,7 +165,6 @@ namespace IRaCIS.Application.Services Data = x.ToList() }).ToList(); - PageOutput pageOutput = new PageOutput() { @@ -174,13 +173,11 @@ namespace IRaCIS.Application.Services PageIndex = dto.PageIndex, TotalCount = await subjectQuery.Select(x => x.SubjectId).Distinct().CountAsync(), }; - var maxcount = 0; pageOutput.CurrentPageData.ForEach(x => { maxcount = maxcount < x.Data.Count ? x.Data.Count : maxcount; }); - return (pageOutput, new { MaxLength = maxcount diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index 6886599c3..a53f8fa8d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -280,7 +280,7 @@ namespace IRaCIS.Application.Services ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Read : ModuleTypeEnum.Oncology, IsUrgent = item.SubjectVisit.IsUrgent, ModuleName = item.ReadingPeriodSet.ReadingPeriodName, - SubjectVisitId = item.Id, + SubjectVisitId = item.SubjectVisitId, ReadingSetType = item.ReadingPeriodSet.ReadingSetType, ReadingPeriodSetId= item.ReadingPeriodSet.Id, Status = ReadingCommon.GetVisitSubmitStateEnum(item.SubjectVisit), diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index b1acb4648..107afd587 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -17,7 +17,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.SubjectVisitName, u => u.MapFrom(s => s.VisitStage==null?string.Empty: s.VisitStage.VisitName)) .ForMember(d => d.SiteIds, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.SiteId))) - .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode))); + .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode))) + .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count)); //.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList())); diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs index 8aba2ba1a..0e6e45a84 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs @@ -72,7 +72,14 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingSetType ReadingSetType { get; set; } + public List ReadingPeriodSites { get; set; } = new List(); + + + /// + /// 阅片期计划 + /// + public List ReadingPeriodPlanList { get; set; } = new List(); }