修改一版
parent
16da83540b
commit
42f9f68395
|
@ -130,7 +130,7 @@ namespace IRaCIS.Application.Services
|
||||||
private async Task AddTrialClinicalDataTrialSet(Guid trialId)
|
private async Task AddTrialClinicalDataTrialSet(Guid trialId)
|
||||||
{
|
{
|
||||||
var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync();
|
var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync();
|
||||||
if (syncClinicalDataTime != null)
|
if (syncClinicalDataTime == null)
|
||||||
{
|
{
|
||||||
var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
|
var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
|
||||||
var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
|
var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
|
||||||
|
|
|
@ -315,12 +315,33 @@ namespace IRaCIS.Application.Services
|
||||||
Answer= leftquestionAnswer.Answer
|
Answer= leftquestionAnswer.Answer
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync();
|
var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync();
|
||||||
List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
|
|
||||||
|
var groupList = qusetionList.Where(x => x.Type == "group").ToList();
|
||||||
|
|
||||||
groupList.ForEach(x =>
|
groupList.ForEach(x =>
|
||||||
{
|
{
|
||||||
this.FindChildQuestion(x, qusetionList);
|
x.Childrens = qusetionList.Where(y => y.GroupName == x.QuestionName && y.ParentId == null).ToList();
|
||||||
|
|
||||||
|
x.Childrens.ForEach(z =>
|
||||||
|
{
|
||||||
|
this.FindChildQuestion(z, qusetionList);
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//groupList.ForEach(x =>
|
||||||
|
//{
|
||||||
|
// this.FindChildQuestion(x, qusetionList);
|
||||||
|
//});
|
||||||
return (groupList, new
|
return (groupList, new
|
||||||
{
|
{
|
||||||
readingTaskState = readingTaskState
|
readingTaskState = readingTaskState
|
||||||
|
|
|
@ -285,7 +285,16 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public string SignCode { get; set; } = string.Empty;
|
public string SignCode { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class GetReadingInfoOutDto
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GetReadingInfoInDto
|
||||||
|
{
|
||||||
|
[NotDefault]
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class SignConfirmDTO
|
public class SignConfirmDTO
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue