diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index cf0f882b3..41b1d9fe7 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
}
///ReadingMedicineSystemQuestionQuery 列表查询参数模型
- public class ReadingMedicineSystemQuestionQuery:PageInput
+ public class ReadingMedicineSystemQuestionQuery
{
public string Type { 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? Id { get; set; }
+
+ public int? ShowOrder { get; set; }
}
@@ -151,7 +153,7 @@ namespace IRaCIS.Core.Application.ViewModel
}
///ReadingMedicineTrialQuestionQuery 列表查询参数模型
- public class ReadingMedicineTrialQuestionQuery:PageInput
+ public class ReadingMedicineTrialQuestionQuery
{
///
/// 项目Id
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
index ec8885a66..df81cfdb8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
@@ -34,16 +34,15 @@ namespace IRaCIS.Core.Application.Service
///
///
[HttpPost]
- public async Task> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
+ public async Task> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
{
var query = _readingMedicineSystemQuestionRepository.AsQueryable()
.WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
.WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
- .ProjectTo(_mapper.ConfigurationProvider);
- return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineSystemQuestionView.ShowOrder) : inDto.SortField,
- inDto.Asc);
+ .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
+ return await query.ToListAsync();
}
///
@@ -85,7 +84,7 @@ namespace IRaCIS.Core.Application.Service
///
///
[HttpPost]
- public async Task> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
+ public async Task> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
{
var query = _readingMedicineTrialQuestionRepository.AsQueryable()
.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.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
- .ProjectTo(_mapper.ConfigurationProvider);
- return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineTrialQuestionView.ShowOrder) : inDto.SortField,
- inDto.Asc);
+ .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
+ return await query.ToListAsync();
}
///
@@ -124,9 +122,11 @@ namespace IRaCIS.Core.Application.Service
{
"select","radio"
};
+
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.ShowOrder != null, x => x.ShowOrder new GetReadingMedicineTrialOtherQuestionOutDto()
{
Id = x.Id,
@@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service
///
/// 从系统里面选择问题添加到项目里面
///
- ///
+ ///
///
[HttpPost]
public async Task AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto)
@@ -179,6 +179,17 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.Result(result);
}
-
- }
+
+ /////
+ ///// 确认医学审核问题
+ /////
+ /////
+ //public async Task ConfirmReadingMedicineQuestion()
+ //{
+
+ //}
+
+
+
+ }
}