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

修改一版

Uat_Study
he 2022-06-01 17:29:52 +08:00
parent d4023d33dd
commit bea5ee827b
3 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -477,17 +477,17 @@
截止访视
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.VisitStageId">
<summary>
访视计划ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.SubjectId">
<summary>
受试者ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.IsUrgent">
<summary>
是否加急
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.Name">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto.SubjectVisitName">
<summary>
名称
</summary>
@ -2995,11 +2995,11 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.AddOrUpdateReadModuleService(IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddOrEdit)">
<member name="M:IRaCIS.Application.Services.ReadModuleService.AddReadModule(IRaCIS.Core.Application.Service.Reading.Dto.ReadModuleAddDto)">
<summary>
新增或者修改
添加阅片期
</summary>
<param name="addOrEditReadModule"></param>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadModuleService.DeleteReadModule(System.Guid)">

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

@ -19,6 +19,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class ReadModuleAddDto
{
public Guid TrialId { get; set; }
/// <summary>
/// 截止日期
/// </summary>
@ -27,22 +29,23 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 截止访视
/// </summary>
public Guid? ExpirationVisit { get; set; }
public decimal? ExpirationVisit { get; set; }
/// <summary>
/// 访视计划ID
/// </summary>
public Guid? VisitStageId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public bool? IsUrgent { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
public string SubjectVisitName { get; set; }
}

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

@ -141,8 +141,12 @@ namespace IRaCIS.Application.Services
return GetReadModuleOutDto;
}
/// <summary>
/// 添加阅片期
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddReadModule(ReadModuleAddDto dto)
{
var visits =await _subjectVisitRepository.Where(x => x.SubjectId == dto.SubjectId && x.InPlan).Select(x => new
@ -150,6 +154,8 @@ namespace IRaCIS.Application.Services
x.Id,
x.LatestScanDate,
x.VisitNum,
x.IsUrgent,
}).ToListAsync();
if (dto.ExpirationDate != null)
@ -159,8 +165,7 @@ namespace IRaCIS.Application.Services
if (dto.ExpirationVisit != null)
{
var visitstage =await _visitstageRepository.FirstOrDefaultAsync(x => x.Id == dto.ExpirationVisit);
visits = visits.Where(x => x.VisitNum <= visitstage.VisitNum).ToList();
visits = visits.Where(x => x.VisitNum <= dto.ExpirationVisit).ToList();
}
var visit = visits.OrderByDescending(x => x.VisitNum).FirstOrDefault();
@ -171,8 +176,8 @@ namespace IRaCIS.Application.Services
{
SubjectId = dto.SubjectId,
ModuleType = ModuleTypeEnum.Read,
IsUrgent = dto.IsUrgent,
ModuleName = dto.Name,
IsUrgent = visit.IsUrgent,
ModuleName = dto.SubjectVisitName,
SubjectVisitId = visit.Id,
Status = ReadModuleEnum.ImageRead,
});
@ -189,17 +194,17 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 新增或者修改
/// </summary>
/// <param name="addOrEditReadModule"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddOrUpdateReadModuleService(ReadModuleAddOrEdit addOrEditReadModule)
{
var entity = await _repository.InsertOrUpdateAsync<ReadModule, ReadModuleAddOrEdit>(addOrEditReadModule, true);
return ResponseOutput.Ok(entity.Id.ToString());
}
///// <summary>
///// 新增或者修改
///// </summary>
///// <param name="addOrEditReadModule"></param>
///// <returns></returns>
//[HttpPost]
//public async Task<IResponseOutput> AddOrUpdateReadModuleService(ReadModuleAddOrEdit addOrEditReadModule)
//{
// var entity = await _repository.InsertOrUpdateAsync<ReadModule, ReadModuleAddOrEdit>(addOrEditReadModule, true);
// return ResponseOutput.Ok(entity.Id.ToString());
//}