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

修改一版

Browse Source
This commit is contained in:
he
2022-06-02 14:01:31 +08:00
parent 94e075ef54
commit 68ac0941c2
7 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
+1 -4
View File
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止访视
/// </summary>
public decimal? ExpirationVisit { get; set; }
public decimal? ExpirationVisitNum { get; set; }
/// <summary>
/// 访视计划ID
@@ -41,7 +41,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 名称
/// </summary>
@@ -197,7 +196,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsFinalVisit { get; set; } = false;
/// <summary>
/// 上一访视
/// </summary>
@@ -228,7 +226,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsEnrollmentConfirm { get; set; } = false;
}
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
+4 -4
View File
@@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止访视
/// </summary>
public decimal? ExpirationVisit { get; set; }
public decimal? ExpirationVisitNum { get; set; }
/// <summary>
/// 访视计划ID
@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 是否生效
/// </summary>
public int? IsTakeEffect { get; set; } = 0;
public ReadingPeriodStatus IsTakeEffect { get; set; } = ReadingPeriodStatus.NotTakeEffect;
public List<Guid> SiteIds { get; set; } = new List<Guid>();
@@ -85,7 +85,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止访视
/// </summary>
public decimal? ExpirationVisit { get; set; }
public decimal? ExpirationVisitNum { get; set; }
/// <summary>
/// 访视计划ID
@@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止访视
/// </summary>
public decimal? ExpirationVisit { get; set; }
public decimal? ExpirationVisitNum { get; set; }
/// <summary>
/// 项目ID
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+5 -5
View File
@@ -131,12 +131,12 @@ namespace IRaCIS.Application.Services
///// <param name="visit"></param>
///// <returns></returns>
//[NonDynamicWebApi]
//public async Task<SubmitStateEnum> GetVisitSubmitStateEnum(SubjectVisit visit)
//public async Task<ReadModuleEnum> GetVisitSubmitStateEnum(SubjectVisit visit)
//{
// if (visit.SubmitState != SubmitStateEnum.Submitted)
// {
// return SubmitStateEnum.ToSubmit
// }
// return ReadModuleEnum.ImageUpload;
// }else if()
//}
@@ -197,9 +197,9 @@ namespace IRaCIS.Application.Services
visits = visits.Where(x => x.LatestScanDate <= dto.ExpirationDate.Value).ToList();
}
if (dto.ExpirationVisit != null)
if (dto.ExpirationVisitNum != null)
{
visits = visits.Where(x => x.VisitNum <= dto.ExpirationVisit).ToList();
visits = visits.Where(x => x.VisitNum <= dto.ExpirationVisitNum).ToList();
}
var visit = visits.OrderByDescending(x => x.VisitNum).FirstOrDefault();