修改一版

Uat_Study
he 2022-06-07 11:15:43 +08:00
parent 05d96e9de1
commit 8912beb1a5
6 changed files with 20 additions and 5 deletions

View File

@ -932,6 +932,11 @@
中心name
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.PlanCount">
<summary>
计划条数
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetReadingPeriodSetEffect.Id">
<summary>
项目ID

View File

@ -201,6 +201,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 中心name
/// </summary>
public List<string> SiteCodes { get; set; }
/// <summary>
/// 计划条数
/// </summary>
public int PlanCount { get; set; }
}
public class SetReadingPeriodSetEffect

View File

@ -165,7 +165,6 @@ namespace IRaCIS.Application.Services
Data = x.ToList()
}).ToList();
PageOutput<GetReadModuleDtoOut> pageOutput = new PageOutput<GetReadModuleDtoOut>()
{
@ -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

View File

@ -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),

View File

@ -17,7 +17,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingPeriodSet, ReadingPeriodSetView>()
.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()));

View File

@ -72,7 +72,14 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public ReadingSetType ReadingSetType { get; set; }
public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
/// <summary>
/// 阅片期计划
/// </summary>
public List<ReadingPeriodPlan> ReadingPeriodPlanList { get; set; } = new List<ReadingPeriodPlan>();
}