修改一版
parent
59a28dff89
commit
2ac0728378
|
@ -2168,6 +2168,13 @@
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.GetMedicineQuestionPreview(IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewInDto)">
|
||||||
|
<summary>
|
||||||
|
获取预览问题信息
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.AddOrUpdateReadingMedicineTrialQuestion(IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit)">
|
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.AddOrUpdateReadingMedicineTrialQuestion(IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit)">
|
||||||
<summary>
|
<summary>
|
||||||
新增或修改项目医学审核问题
|
新增或修改项目医学审核问题
|
||||||
|
@ -2600,6 +2607,56 @@
|
||||||
是否启用
|
是否启用
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.Type">
|
||||||
|
<summary>
|
||||||
|
类型
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.ParentTriggerValue">
|
||||||
|
<summary>
|
||||||
|
父问题触发值
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.QuestionName">
|
||||||
|
<summary>
|
||||||
|
问题名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TypeValue">
|
||||||
|
<summary>
|
||||||
|
类型值
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TrialId">
|
||||||
|
<summary>
|
||||||
|
项目ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.IsEnable">
|
||||||
|
<summary>
|
||||||
|
是否启用
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.IsRequired">
|
||||||
|
<summary>
|
||||||
|
是否必须
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.ShowOrder">
|
||||||
|
<summary>
|
||||||
|
排序
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.ParentId">
|
||||||
|
<summary>
|
||||||
|
父问题
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.IsConfirm">
|
||||||
|
<summary>
|
||||||
|
是否确认
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery">
|
<member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery">
|
||||||
<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary>
|
<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary>
|
||||||
</member>
|
</member>
|
||||||
|
|
|
@ -184,8 +184,78 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
public int? ParentShowOrder { get; set; }
|
public int? ParentShowOrder { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
///<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary>
|
|
||||||
public class ReadingMedicineTrialQuestionQuery
|
public class GetMedicineQuestionPreviewInDto
|
||||||
|
{
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class GetMedicineQuestionPreviewOutDto
|
||||||
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 类型
|
||||||
|
/// </summary>
|
||||||
|
public string Type { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 父问题触发值
|
||||||
|
/// </summary>
|
||||||
|
public string ParentTriggerValue { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 问题名称
|
||||||
|
/// </summary>
|
||||||
|
public string QuestionName { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 类型值
|
||||||
|
/// </summary>
|
||||||
|
public string TypeValue { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目ID
|
||||||
|
/// </summary>
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用
|
||||||
|
/// </summary>
|
||||||
|
public bool IsEnable { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否必须
|
||||||
|
/// </summary>
|
||||||
|
public bool IsRequired { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排序
|
||||||
|
/// </summary>
|
||||||
|
public int ShowOrder { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 父问题
|
||||||
|
/// </summary>
|
||||||
|
public Guid? ParentId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否确认
|
||||||
|
/// </summary>
|
||||||
|
public bool? IsConfirm { get; set; }
|
||||||
|
|
||||||
|
public List<GetMedicineQuestionPreviewOutDto> Childrens { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
///<summary>ReadingMedicineTrialQuestionQuery 列表查询参数模型</summary>
|
||||||
|
public class ReadingMedicineTrialQuestionQuery
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目Id
|
/// 项目Id
|
||||||
|
|
|
@ -107,6 +107,38 @@ namespace IRaCIS.Core.Application.Service
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取预览问题信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<List<GetMedicineQuestionPreviewOutDto>> GetMedicineQuestionPreview(GetMedicineQuestionPreviewInDto inDto)
|
||||||
|
{
|
||||||
|
var trialQuestionList = await _readingMedicineTrialQuestionRepository.Where(x=>x.TrialId==inDto.TrialId)
|
||||||
|
.ProjectTo<GetMedicineQuestionPreviewOutDto>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
|
List<GetMedicineQuestionPreviewOutDto> readingQuestionList = trialQuestionList.Where(x => x.ParentId == null).ToList();
|
||||||
|
readingQuestionList.ForEach(x =>
|
||||||
|
{
|
||||||
|
FindChildQuestion(x, trialQuestionList);
|
||||||
|
});
|
||||||
|
|
||||||
|
return readingQuestionList;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FindChildQuestion(GetMedicineQuestionPreviewOutDto trialReadingQuestion, List<GetMedicineQuestionPreviewOutDto> questionlists)
|
||||||
|
{
|
||||||
|
trialReadingQuestion.Childrens = questionlists.Where(x => x.ParentId == trialReadingQuestion.Id).ToList();
|
||||||
|
if (trialReadingQuestion.Childrens != null && trialReadingQuestion.Childrens.Count != 0)
|
||||||
|
{
|
||||||
|
trialReadingQuestion.Childrens.ForEach(x =>
|
||||||
|
{
|
||||||
|
this.FindChildQuestion(x, questionlists);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 新增或修改项目医学审核问题
|
/// 新增或修改项目医学审核问题
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -89,6 +89,8 @@ namespace IRaCIS.Core.Application.Service
|
||||||
CreateMap<ReadingMedicineTrialQuestionAddOrEdit, ReadingMedicineTrialQuestion>();
|
CreateMap<ReadingMedicineTrialQuestionAddOrEdit, ReadingMedicineTrialQuestion>();
|
||||||
CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>()
|
CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>()
|
||||||
.ForMember(x=>x.ParentShowOrder,y=>y.MapFrom(n=>n.ParentQuestion.ShowOrder));
|
.ForMember(x=>x.ParentShowOrder,y=>y.MapFrom(n=>n.ParentQuestion.ShowOrder));
|
||||||
|
|
||||||
|
CreateMap<ReadingMedicineTrialQuestion, GetMedicineQuestionPreviewOutDto>();
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue