修改一版

This commit is contained in:
he
2022-06-24 14:20:07 +08:00
parent e18ea0fd9c
commit 7aa5e843f6
9 changed files with 162 additions and 2 deletions
@@ -122,6 +122,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel=x.ClinicalDataLevel,
ClinicalUploadType=x.ClinicalUploadType,
UploadRole=x.UploadRole,
FileName=x.FileName,
Path=x.Path,
TrialId= trialId,
}).ToList();
@@ -51,6 +51,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 是否勾选
/// </summary>
public bool IsConfirm { get; set; }
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
}
public class ClinicalDataSystemSetAddOrEdit
@@ -89,7 +99,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
}
@@ -161,6 +181,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 是否使用
/// </summary>
public bool IsUsed { get; set; } = false;
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
}
@@ -210,6 +240,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
@@ -146,6 +146,7 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto)
{
var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm)
.WhereIf(inDto.UploadRole!=null,x=>x.UploadRole==inDto.UploadRole)