From 8da1ab241321359a16b4935544e41b7d00cc3dbf Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 17 Aug 2023 14:25:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/GetReadModuleDto.cs | 10 ++--- .../ReadingPeriod/ReadModuleService.cs | 18 ++++----- .../Reading/View/ReadModuleView.cs | 40 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index 28fef0344..732caaef4 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -252,15 +252,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadModuleDtoOut { - public string SubjectCode { get; set; } + public string? SubjectCode { get; set; } - public string TrialSiteCode { get; set; } + public string? TrialSiteCode { get; set; } - public string SiteCode { get; set; } + public string? SiteCode { get; set; } - public Guid SiteId { get; set; } + public Guid? SiteId { get; set; } - public Guid SubjectId { get; set; } + public Guid? SubjectId { get; set; } public List Data { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index 87908db6a..17017cf77 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -148,16 +148,16 @@ namespace IRaCIS.Application.Services dto.SortField = nameof(ReadModuleView.SubjectCode); dto.Asc = true; } - + dto.SortField = dto.Asc ? dto.SortField : dto.SortField + " desc"; - var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId) - .WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId) - .WhereIf(dto.SubjectId != null, x => x.SubjectId == dto.SubjectId) - .WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSiteCode.Contains(dto.TrialSiteCode)) - .WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode)) - .WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType) - .WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus) - .WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode); + var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId) + .WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId) + .WhereIf(dto.SubjectId != null, x => x.SubjectId == dto.SubjectId) + .WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSiteCode.Contains(dto.TrialSiteCode)) + .WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode)) + .WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType) + .WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus) + .WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode); var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs index 9030a1cf3..9ec8187b5 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs @@ -18,17 +18,17 @@ namespace IRaCIS.Core.Domain.Models /// /// 项目ID /// - public Guid TrialId { get; set; } + public Guid? TrialId { get; set; } /// /// 名称 /// - public string Name { get; set; } + public string? Name { get; set; } /// /// 受试者ID /// - public Guid SubjectId { get; set; } + public Guid? SubjectId { get; set; } /// /// 模块类型 @@ -43,18 +43,18 @@ namespace IRaCIS.Core.Domain.Models /// /// 是否可改截止访视 /// - public bool IsCanChangeCutOffVisit { get; set; } + public bool? IsCanChangeCutOffVisit { get; set; } /// /// 访视ID /// - public Guid SubjectVisitId { get; set; } + public Guid? SubjectVisitId { get; set; } /// /// 访视名称 /// - public string SubjectVisitName { get; set; } + public string? SubjectVisitName { get; set; } /// @@ -76,34 +76,34 @@ namespace IRaCIS.Core.Domain.Models /// /// 对应Name /// - public string ReadModuleName { get; set; } + public string? ReadModuleName { get; set; } /// /// 创建时间 /// - public DateTime CreateTime { get; set; } + public DateTime? CreateTime { get; set; } /// /// 受试者Code /// - public string SubjectCode { get; set; } + public string? SubjectCode { get; set; } /// /// 中心Id /// - public string SiteCode { get; set; } + public string? SiteCode { get; set; } /// /// 项目中心Id /// - public string TrialSiteCode { get; set; } + public string? TrialSiteCode { get; set; } /// /// 是否为末次访视 /// - public bool IsFinalVisit { get; set; } = false; + public bool? IsFinalVisit { get; set; } = false; /// /// 上一访视 @@ -113,17 +113,17 @@ namespace IRaCIS.Core.Domain.Models /// /// 上一访视名称 /// - public string OutPlanPreviousVisitName { get; set; } + public string? OutPlanPreviousVisitName { get; set; } /// /// 中心ID /// - public Guid SiteId { get; set; } + public Guid? SiteId { get; set; } /// /// 是否为访视 /// - public bool IsVisit { get; set; } + public bool? IsVisit { get; set; } /// /// 访视Num @@ -133,12 +133,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 是否为PD进展 /// - public PDStateEnum PDState { get; set; } = PDStateEnum.None; + public PDStateEnum? PDState { get; set; } = PDStateEnum.None; /// /// 入组确认评估 /// - public bool IsEnrollmentConfirm { get; set; } = false; + public bool? IsEnrollmentConfirm { get; set; } = false; /// @@ -149,7 +149,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 是否是基线 /// - public bool IsBaseLine { get; set; } = false; + public bool? IsBaseLine { get; set; } = false; /// @@ -161,11 +161,11 @@ namespace IRaCIS.Core.Domain.Models /// /// 标准名称 /// - public string CriterionName { get; set; } + public string? CriterionName { get; set; } /// /// 阅片配置的类型 /// - public ReadingSetType ReadingSetType { get; set; } + public ReadingSetType? ReadingSetType { get; set; } } }