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

修改一版

Uat_Study
he 2022-06-08 17:39:50 +08:00
parent a2971f9e08
commit 543c8c4ccb
2 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
View File

@ -68,10 +68,13 @@ namespace IRaCIS.Application.Services
/// 获取系统临床数据（系统） /// 获取系统临床数据（系统）
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList() public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList(GetTrialClinicalDataSystemIndto inDto)
{ {
return await _clinicalDataSystemSetRepository.AsQueryable() return await _clinicalDataSystemSetRepository.AsQueryable()
.WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
.WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
.WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
.ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync();
} }
@ -81,12 +84,16 @@ namespace IRaCIS.Application.Services
/// </summary> /// </summary>
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(AddTrialClinicalDataSetInDto inDto) public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto)
{ {
await this.AddTrialClinicalDataTrialSet(inDto); await this.AddTrialClinicalDataTrialSet(inDto.TrialId);
return await _clinicalDataTrialSetRepository.AsQueryable() return await _clinicalDataTrialSetRepository.AsQueryable()
.Where(x => x.TrialId == inDto.TrialId) .Where(x => x.TrialId == inDto.TrialId)
.WhereIf(inDto.ClinicalDataLevel!=null,x=>x.ClinicalDataLevel== inDto.ClinicalDataLevel)
.WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
.WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
.ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
} }
@ -97,7 +104,7 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(AddTrialClinicalDataSetInDto inDto) private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(Guid trialId)
{ {
var systemIds = await _clinicalDataSystemSetRepository.Select(x => x.Id).ToListAsync(); var systemIds = await _clinicalDataSystemSetRepository.Select(x => x.Id).ToListAsync();
var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync(); var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();

45
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -72,6 +72,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid? SystemClinicalDataSetId { get; set; } public Guid? SystemClinicalDataSetId { get; set; }
/// <summary>
/// 是否勾选
/// </summary>
public bool IsCheck { get; set; }
/// <summary> /// <summary>
/// 是否来自于系统数据 /// 是否来自于系统数据
/// </summary> /// </summary>
@ -126,10 +131,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 是否勾选
/// </summary>
public bool IsCheck { get; set; }
} }
@ -164,11 +166,44 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string ClinicalDataSetName { get; set; } = string.Empty; public string ClinicalDataSetName { get; set; } = string.Empty;
} }
public class GetTrialClinicalDataSystemIndto
{
/// <summary>
/// 名称
/// </summary>
public string ClinicalDataSetName { get; set; } = String.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>
/// 上传方式
/// </summary>
public ClinicalUploadType? ClinicalUploadType { get; set; }
}
public class AddTrialClinicalDataSetInDto
public class GetTrialClinicalDataTrialIndto
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary>
/// 名称
/// </summary>
public string ClinicalDataSetName { get; set; } = String.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalDataLevel { get; set; }
/// <summary>
/// 上传方式
/// </summary>
public ClinicalUploadType? ClinicalUploadType { get; set; }
} }
} }