修改一版
parent
37320c5be5
commit
b26e596ffb
|
@ -1225,6 +1225,11 @@
|
||||||
FileName
|
FileName
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetFileDto.CreateTime">
|
||||||
|
<summary>
|
||||||
|
上传时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.TrialId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.TrialId">
|
||||||
<summary>
|
<summary>
|
||||||
项目ID
|
项目ID
|
||||||
|
@ -4310,6 +4315,12 @@
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.AddCRCClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataInDto)">
|
||||||
|
<summary>
|
||||||
|
添加CRC数据类型
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.DeleteReadingClinicalData(System.Guid)">
|
<member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.DeleteReadingClinicalData(System.Guid)">
|
||||||
<summary>
|
<summary>
|
||||||
删除
|
删除
|
||||||
|
@ -4647,6 +4658,13 @@
|
||||||
<param name="indto"></param>
|
<param name="indto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetPreviewTheQuestion(IRaCIS.Core.Application.Service.Reading.Dto.GetPreviewTheQuestionInDto)">
|
||||||
|
<summary>
|
||||||
|
获取预览问题信息
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetTrialReadingQuestionCriterionIsIsCompleteConfig(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsCompleteConfig)">
|
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetTrialReadingQuestionCriterionIsIsCompleteConfig(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsCompleteConfig)">
|
||||||
<summary>
|
<summary>
|
||||||
设置项目标准是否完成配置
|
设置项目标准是否完成配置
|
||||||
|
|
|
@ -31,6 +31,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public bool IsEnable { get; set; }
|
public bool IsEnable { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public class GetPreviewTheQuestionInDto
|
||||||
|
{
|
||||||
|
[NotDefault]
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class AddOrUpdateReadingQuestionCriterionSystemInDto
|
public class AddOrUpdateReadingQuestionCriterionSystemInDto
|
||||||
{
|
{
|
||||||
public Guid? Id { get; set; }
|
public Guid? Id { get; set; }
|
||||||
|
|
|
@ -14,5 +14,8 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto);
|
Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto);
|
||||||
|
|
||||||
Task<IResponseOutput> SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto);
|
Task<IResponseOutput> SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto);
|
||||||
|
|
||||||
|
|
||||||
|
void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List<GetTrialReadingQuestionOutDto> questionlists);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -419,8 +419,8 @@ namespace IRaCIS.Application.Services
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="trialReadingQuestion"></param>
|
/// <param name="trialReadingQuestion"></param>
|
||||||
/// <param name="questionlists"></param>
|
/// <param name="questionlists"></param>
|
||||||
|
[NonDynamicMethod]
|
||||||
private void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List<GetTrialReadingQuestionOutDto> questionlists)
|
public void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List<GetTrialReadingQuestionOutDto> questionlists)
|
||||||
{
|
{
|
||||||
trialReadingQuestion.Childrens = questionlists.Where(x => x.ParentId == trialReadingQuestion.ReadingQuestionTrialId).ToList();
|
trialReadingQuestion.Childrens = questionlists.Where(x => x.ParentId == trialReadingQuestion.ReadingQuestionTrialId).ToList();
|
||||||
if (trialReadingQuestion.Childrens != null && trialReadingQuestion.Childrens.Count != 0)
|
if (trialReadingQuestion.Childrens != null && trialReadingQuestion.Childrens.Count != 0)
|
||||||
|
|
|
@ -30,6 +30,7 @@ namespace IRaCIS.Application.Services
|
||||||
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
|
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
|
||||||
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
|
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
|
||||||
private readonly IRepository<Dictionary> _dictionaryRepository;
|
private readonly IRepository<Dictionary> _dictionaryRepository;
|
||||||
|
private readonly IReadingImageTaskService _readingImageTaskService;
|
||||||
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
|
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
|
||||||
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
private readonly IRepository<PreviousPDF> _previousPDFRepository;
|
||||||
|
|
||||||
|
@ -42,6 +43,7 @@ namespace IRaCIS.Application.Services
|
||||||
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
|
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
|
||||||
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
|
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
|
||||||
IRepository<Dictionary> dictionaryRepository,
|
IRepository<Dictionary> dictionaryRepository,
|
||||||
|
IReadingImageTaskService readingImageTaskService,
|
||||||
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswer,
|
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswer,
|
||||||
IRepository<PreviousPDF> previousPDFRepository
|
IRepository<PreviousPDF> previousPDFRepository
|
||||||
)
|
)
|
||||||
|
@ -54,6 +56,7 @@ namespace IRaCIS.Application.Services
|
||||||
this._clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
|
this._clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
|
||||||
this._clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
|
this._clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
|
||||||
this._dictionaryRepository = dictionaryRepository;
|
this._dictionaryRepository = dictionaryRepository;
|
||||||
|
this._readingImageTaskService = readingImageTaskService;
|
||||||
this._readingTaskQuestionAnswer = readingTaskQuestionAnswer;
|
this._readingTaskQuestionAnswer = readingTaskQuestionAnswer;
|
||||||
this._previousPDFRepository = previousPDFRepository;
|
this._previousPDFRepository = previousPDFRepository;
|
||||||
}
|
}
|
||||||
|
@ -438,6 +441,39 @@ namespace IRaCIS.Application.Services
|
||||||
return ResponseOutput.Ok(entity.Id.ToString());
|
return ResponseOutput.Ok(entity.Id.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取预览问题信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<List<GetTrialReadingQuestionOutDto>> GetPreviewTheQuestion(GetPreviewTheQuestionInDto inDto)
|
||||||
|
{
|
||||||
|
var trialQuestionQuery = from trialQuestion in _readingQuestionTrialRepository.Where(x=>x.ReadingQuestionCriterionTrialId== inDto.Id)
|
||||||
|
select new GetTrialReadingQuestionOutDto()
|
||||||
|
{
|
||||||
|
ReadingQuestionTrialId = trialQuestion.Id,
|
||||||
|
ReadingQuestionCriterionTrialId = trialQuestion.ReadingQuestionCriterionTrialId,
|
||||||
|
TrialId = trialQuestion.TrialId,
|
||||||
|
Type = trialQuestion.Type,
|
||||||
|
ParentTriggerValue = trialQuestion.ParentTriggerValue,
|
||||||
|
GroupName = trialQuestion.GroupName,
|
||||||
|
QuestionName = trialQuestion.QuestionName,
|
||||||
|
IsRequired = trialQuestion.IsRequired,
|
||||||
|
ShowOrder = trialQuestion.ShowOrder,
|
||||||
|
ParentId = trialQuestion.ParentId,
|
||||||
|
TypeValue = trialQuestion.TypeValue,
|
||||||
|
Answer = string.Empty
|
||||||
|
};
|
||||||
|
var qusetionList = await trialQuestionQuery.OrderBy(x => x.ShowOrder).ToListAsync();
|
||||||
|
List<GetTrialReadingQuestionOutDto> readingQuestionList = qusetionList.Where(x => x.ParentId == null).ToList();
|
||||||
|
readingQuestionList.ForEach(x =>
|
||||||
|
{
|
||||||
|
_readingImageTaskService.FindChildQuestion(x, qusetionList);
|
||||||
|
});
|
||||||
|
|
||||||
|
return readingQuestionList;
|
||||||
|
}
|
||||||
|
|
||||||
///// <summary>
|
///// <summary>
|
||||||
///// 设置项目标准是否生效
|
///// 设置项目标准是否生效
|
||||||
|
|
Loading…
Reference in New Issue