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

修改一版

Uat_Study
he 2022-06-30 09:46:47 +08:00
parent dec123f710
commit 01ed29d3e3
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
View File

@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
} }
///<summary>ReadingMedicineSystemQuestionQuery 列表查询参数模型</summary> ///<summary>ReadingMedicineSystemQuestionQuery 列表查询参数模型</summary>
public class ReadingMedicineSystemQuestionQuery:PageInput public class ReadingMedicineSystemQuestionQuery
{ {
public string Type { get; set; }=string.Empty; public string Type { get; set; }=string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } = string.Empty;
@ -82,6 +82,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid? Id { get; set; } public Guid? Id { get; set; }
public int? ShowOrder { get; set; }
} }
@ -151,7 +153,7 @@ namespace IRaCIS.Core.Application.ViewModel
} }
///<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary> ///<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary>
public class ReadingMedicineTrialQuestionQuery:PageInput public class ReadingMedicineTrialQuestionQuery
{ {
/// <summary> /// <summary>
/// 项目Id /// 项目Id

29
IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
View File

@ -34,16 +34,15 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<PageOutput<ReadingMedicineSystemQuestionView>> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto) public async Task<List<ReadingMedicineSystemQuestionView>> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
{ {
var query = _readingMedicineSystemQuestionRepository.AsQueryable() var query = _readingMedicineSystemQuestionRepository.AsQueryable()
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue)) .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue)) .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider); .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineSystemQuestionView.ShowOrder) : inDto.SortField, return await query.ToListAsync();
inDto.Asc);
} }
/// <summary> /// <summary>
@ -85,7 +84,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<PageOutput<ReadingMedicineTrialQuestionView>> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto) public async Task<List<ReadingMedicineTrialQuestionView>> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
{ {
var query = _readingMedicineTrialQuestionRepository.AsQueryable() var query = _readingMedicineTrialQuestionRepository.AsQueryable()
.Where(x=>x.TrialId==inDto.TrialId) .Where(x=>x.TrialId==inDto.TrialId)
@ -93,9 +92,8 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue)) .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider); .ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineTrialQuestionView.ShowOrder) : inDto.SortField, return await query.ToListAsync();
inDto.Asc);
} }
/// <summary> /// <summary>
@ -124,9 +122,11 @@ namespace IRaCIS.Core.Application.Service
{ {
"select","radio" "select","radio"
}; };
var questionList = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId) var questionList = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId)
.Where(x => types.Contains(x.Type)) .Where(x => types.Contains(x.Type))
.WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id) .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
.WhereIf(inDto.ShowOrder != null, x => x.ShowOrder <inDto.ShowOrder)
.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto() .Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
{ {
Id = x.Id, Id = x.Id,
@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service
/// <summary> /// <summary>
/// 从系统里面选择问题添加到项目里面 /// 从系统里面选择问题添加到项目里面
/// </summary> /// </summary>
/// <param name="InDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<IResponseOutput> AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto) public async Task<IResponseOutput> AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto)
@ -180,5 +180,16 @@ namespace IRaCIS.Core.Application.Service
} }
///// <summary>
///// 确认医学审核问题
///// </summary>
///// <returns></returns>
//public async Task<IResponseOutput> ConfirmReadingMedicineQuestion()
//{
//}
} }
} }