XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修改

IRC_NewDev
he 2023-08-17 14:25:15 +08:00
parent 6b6ab9e406
commit 8da1ab2413
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
View File

@ -252,15 +252,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadModuleDtoOut 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<ReadModuleView> Data { get; set; } public List<ReadModuleView> Data { get; set; }

18
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
View File

@ -148,16 +148,16 @@ namespace IRaCIS.Application.Services
dto.SortField = nameof(ReadModuleView.SubjectCode); dto.SortField = nameof(ReadModuleView.SubjectCode);
dto.Asc = true; dto.Asc = true;
} }
dto.SortField = dto.Asc ? dto.SortField : dto.SortField + " desc"; dto.SortField = dto.Asc ? dto.SortField : dto.SortField + " desc";
var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId) var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
.WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId) .WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId)
.WhereIf(dto.SubjectId != null, x => x.SubjectId == dto.SubjectId) .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.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.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode))
.WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType) .WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType)
.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus) .WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
.WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode); .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(); var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

40
IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
View File

@ -18,17 +18,17 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 项目ID /// 项目ID
/// </summary> /// </summary>
public Guid TrialId { get; set; } public Guid? TrialId { get; set; }
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public string Name { get; set; } public string? Name { get; set; }
/// <summary> /// <summary>
/// 受试者ID /// 受试者ID
/// </summary> /// </summary>
public Guid SubjectId { get; set; } public Guid? SubjectId { get; set; }
/// <summary> /// <summary>
/// 模块类型 /// 模块类型
@ -43,18 +43,18 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 是否可改截止访视 /// 是否可改截止访视
/// </summary> /// </summary>
public bool IsCanChangeCutOffVisit { get; set; } public bool? IsCanChangeCutOffVisit { get; set; }
/// <summary> /// <summary>
/// 访视ID /// 访视ID
/// </summary> /// </summary>
public Guid SubjectVisitId { get; set; } public Guid? SubjectVisitId { get; set; }
/// <summary> /// <summary>
/// 访视名称 /// 访视名称
/// </summary> /// </summary>
public string SubjectVisitName { get; set; } public string? SubjectVisitName { get; set; }
/// <summary> /// <summary>
@ -76,34 +76,34 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 对应Name /// 对应Name
/// </summary> /// </summary>
public string ReadModuleName { get; set; } public string? ReadModuleName { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime? CreateTime { get; set; }
/// <summary> /// <summary>
/// 受试者Code /// 受试者Code
/// </summary> /// </summary>
public string SubjectCode { get; set; } public string? SubjectCode { get; set; }
/// <summary> /// <summary>
/// 中心Id /// 中心Id
/// </summary> /// </summary>
public string SiteCode { get; set; } public string? SiteCode { get; set; }
/// <summary> /// <summary>
/// 项目中心Id /// 项目中心Id
/// </summary> /// </summary>
public string TrialSiteCode { get; set; } public string? TrialSiteCode { get; set; }
/// <summary> /// <summary>
/// 是否为末次访视 /// 是否为末次访视
/// </summary> /// </summary>
public bool IsFinalVisit { get; set; } = false; public bool? IsFinalVisit { get; set; } = false;
/// <summary> /// <summary>
/// 上一访视 /// 上一访视
@ -113,17 +113,17 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 上一访视名称 /// 上一访视名称
/// </summary> /// </summary>
public string OutPlanPreviousVisitName { get; set; } public string? OutPlanPreviousVisitName { get; set; }
/// <summary> /// <summary>
/// 中心ID /// 中心ID
/// </summary> /// </summary>
public Guid SiteId { get; set; } public Guid? SiteId { get; set; }
/// <summary> /// <summary>
/// 是否为访视 /// 是否为访视
/// </summary> /// </summary>
public bool IsVisit { get; set; } public bool? IsVisit { get; set; }
/// <summary> /// <summary>
/// 访视Num /// 访视Num
@ -133,12 +133,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 是否为PD进展 /// 是否为PD进展
/// </summary> /// </summary>
public PDStateEnum PDState { get; set; } = PDStateEnum.None; public PDStateEnum? PDState { get; set; } = PDStateEnum.None;
/// <summary> /// <summary>
/// 入组确认评估 /// 入组确认评估
/// </summary> /// </summary>
public bool IsEnrollmentConfirm { get; set; } = false; public bool? IsEnrollmentConfirm { get; set; } = false;
/// <summary> /// <summary>
@ -149,7 +149,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 是否是基线 /// 是否是基线
/// </summary> /// </summary>
public bool IsBaseLine { get; set; } = false; public bool? IsBaseLine { get; set; } = false;
/// <summary> /// <summary>
@ -161,11 +161,11 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 标准名称 /// 标准名称
/// </summary> /// </summary>
public string CriterionName { get; set; } public string? CriterionName { get; set; }
/// <summary> /// <summary>
/// 阅片配置的类型 /// 阅片配置的类型
/// </summary> /// </summary>
public ReadingSetType ReadingSetType { get; set; } public ReadingSetType? ReadingSetType { get; set; }
} }
} }