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

修改一版

Uat_Study
he 2022-06-02 14:01:31 +08:00
parent 94e075ef54
commit 68ac0941c2
7 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 截止访视 /// 截止访视
/// </summary> /// </summary>
public decimal? ExpirationVisit { get; set; } public decimal? ExpirationVisitNum { get; set; }
/// <summary> /// <summary>
/// 访视计划ID /// 访视计划ID
@ -41,7 +41,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
@ -197,7 +196,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public bool IsFinalVisit { get; set; } = false; public bool IsFinalVisit { get; set; } = false;
/// <summary> /// <summary>
/// 上一访视 /// 上一访视
/// </summary> /// </summary>
@ -228,7 +226,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public bool IsEnrollmentConfirm { get; set; } = false; public bool IsEnrollmentConfirm { get; set; } = false;
} }

8
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
View File

@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 截止访视 /// 截止访视
/// </summary> /// </summary>
public decimal? ExpirationVisit { get; set; } public decimal? ExpirationVisitNum { get; set; }
/// <summary> /// <summary>
/// 访视计划ID /// 访视计划ID
@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 是否生效 /// 是否生效
/// </summary> /// </summary>
public int? IsTakeEffect { get; set; } = 0; public ReadingPeriodStatus IsTakeEffect { get; set; } = ReadingPeriodStatus.NotTakeEffect;
public List<Guid> SiteIds { get; set; } = new List<Guid>(); public List<Guid> SiteIds { get; set; } = new List<Guid>();
@ -85,7 +85,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 截止访视 /// 截止访视
/// </summary> /// </summary>
public decimal? ExpirationVisit { get; set; } public decimal? ExpirationVisitNum { get; set; }
/// <summary> /// <summary>
/// 访视计划ID /// 访视计划ID
@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 截止访视 /// 截止访视
/// </summary> /// </summary>
public decimal? ExpirationVisit { get; set; } public decimal? ExpirationVisitNum { get; set; }
/// <summary> /// <summary>
/// 项目ID /// 项目ID

10
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
View File

@ -131,12 +131,12 @@ namespace IRaCIS.Application.Services
///// <param name="visit"></param> ///// <param name="visit"></param>
///// <returns></returns> ///// <returns></returns>
//[NonDynamicWebApi] //[NonDynamicWebApi]
//public async Task<SubmitStateEnum> GetVisitSubmitStateEnum(SubjectVisit visit) //public async Task<ReadModuleEnum> GetVisitSubmitStateEnum(SubjectVisit visit)
//{ //{
// if (visit.SubmitState != SubmitStateEnum.Submitted) // 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(); 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(); var visit = visits.OrderByDescending(x => x.VisitNum).FirstOrDefault();

5
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -60,6 +60,11 @@ namespace IRaCIS.Core.Domain.Share.Reading
/// </summary> /// </summary>
public enum ReadingPeriodStatus public enum ReadingPeriodStatus
{ {
/// <summary>
/// 未生效
/// </summary>
NotTakeEffect=0,
/// <summary> /// <summary>
/// 已生效 /// 已生效
/// </summary> /// </summary>

3
IRaCIS.Core.Domain/Reading/ReadModule.cs
View File

@ -66,11 +66,10 @@ namespace IRaCIS.Core.Domain.Models
public Guid? LastVisitIdSetId { get; set; } public Guid? LastVisitIdSetId { get; set; }
/// <summary> /// <summary>
/// 对应阅片期 /// 裁判对应原阅片模块的Id
/// </summary> /// </summary>
public Guid? ReadModuleId { get; set; } public Guid? ReadModuleId { get; set; }
/// <summary> /// <summary>
/// 对应 /// 对应
/// </summary> /// </summary>

12
IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
View File

@ -39,7 +39,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 截止访视 /// 截止访视
/// </summary> /// </summary>
public decimal? ExpirationVisit { get; set; } public decimal? ExpirationVisitNum { get; set; }
/// <summary> /// <summary>
/// 访视计划ID /// 访视计划ID
@ -65,18 +65,10 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
public string? Remark { get; set; } public string Remark { get; set; } = string.Empty;
public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>(); public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
} }
public enum ReadingPeriodSetTakeEffectEnum
{
}
} }

4
IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
View File

@ -31,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid SiteId { get; set; } public Guid SiteId { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
@ -49,6 +47,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Site Site { get; set; } public Site Site { get; set; }
public ReadingPeriodSet ReadingPeriodSet { get; set; } public ReadingPeriodSet ReadingPeriodSet { get; set; }