修改一版
parent
e5b5dd2d50
commit
e9cc363bd7
|
@ -1647,6 +1647,11 @@
|
||||||
问题名称
|
问题名称
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionOtherQuestionOutDto.TypeValue">
|
||||||
|
<summary>
|
||||||
|
类型值
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionOtherQuestionInDto.Id">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionOtherQuestionInDto.Id">
|
||||||
<summary>
|
<summary>
|
||||||
当前ID
|
当前ID
|
||||||
|
|
|
@ -220,6 +220,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 问题名称
|
/// 问题名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string QuestionName { get; set; }
|
public string QuestionName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 类型值
|
||||||
|
/// </summary>
|
||||||
|
public string TypeValue { get; set; }
|
||||||
}
|
}
|
||||||
public class GetTrialCriterionOtherQuestionInDto
|
public class GetTrialCriterionOtherQuestionInDto
|
||||||
{
|
{
|
||||||
|
|
|
@ -191,7 +191,8 @@ namespace IRaCIS.Application.Services
|
||||||
.Select(x => new CriterionOtherQuestionOutDto()
|
.Select(x => new CriterionOtherQuestionOutDto()
|
||||||
{
|
{
|
||||||
QuestionId = x.Id,
|
QuestionId = x.Id,
|
||||||
QuestionName = x.QuestionName
|
QuestionName = x.QuestionName,
|
||||||
|
TypeValue=x.TypeValue,
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
return questionList;
|
return questionList;
|
||||||
|
@ -413,7 +414,8 @@ namespace IRaCIS.Application.Services
|
||||||
.Select(x => new CriterionOtherQuestionOutDto()
|
.Select(x => new CriterionOtherQuestionOutDto()
|
||||||
{
|
{
|
||||||
QuestionId = x.Id,
|
QuestionId = x.Id,
|
||||||
QuestionName = x.QuestionName
|
QuestionName = x.QuestionName,
|
||||||
|
TypeValue = x.TypeValue,
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
return questionList;
|
return questionList;
|
||||||
|
|
|
@ -16,17 +16,20 @@ namespace IRaCIS.Core.Application
|
||||||
{
|
{
|
||||||
private readonly IRepository<Trial> _trialRepository;
|
private readonly IRepository<Trial> _trialRepository;
|
||||||
private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
|
private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
|
||||||
|
private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository;
|
||||||
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
|
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
|
||||||
private readonly IEasyCachingProvider _provider;
|
private readonly IEasyCachingProvider _provider;
|
||||||
|
|
||||||
public TrialConfigService(IRepository<Trial> trialRepository,
|
public TrialConfigService(IRepository<Trial> trialRepository,
|
||||||
IRepository<TrialQCQuestion> trialQCQuestionRepository,
|
IRepository<TrialQCQuestion> trialQCQuestionRepository,
|
||||||
|
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
|
||||||
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
|
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
|
||||||
IEasyCachingProvider provider
|
IEasyCachingProvider provider
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_trialRepository = trialRepository;
|
_trialRepository = trialRepository;
|
||||||
this._trialQCQuestionRepository = trialQCQuestionRepository;
|
this._trialQCQuestionRepository = trialQCQuestionRepository;
|
||||||
|
this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
|
||||||
this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
|
this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
|
||||||
this._provider = provider;
|
this._provider = provider;
|
||||||
}
|
}
|
||||||
|
@ -332,9 +335,18 @@ namespace IRaCIS.Core.Application
|
||||||
trialInfo.UpdateTime = DateTime.Now;
|
trialInfo.UpdateTime = DateTime.Now;
|
||||||
|
|
||||||
|
|
||||||
|
var cancelConfirmCriterionIds = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialConfig.TrialId && x.IsConfirm && !trialConfig.TrialCriterionIds.Contains(x.Id)).Select(x => x.Id).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
|
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => cancelConfirmCriterionIds.Contains(x.Id), x => new ReadingQuestionCriterionTrial()
|
||||||
|
{
|
||||||
|
IsConfirm = false
|
||||||
|
});
|
||||||
|
|
||||||
|
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => trialConfig.TrialCriterionIds.Contains(x.Id), x => new ReadingQuestionCriterionTrial()
|
||||||
|
{
|
||||||
|
IsConfirm = true
|
||||||
|
}); ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue