Uat_Study
parent
cd8b7db66a
commit
74fe7c6e15
|
@ -818,6 +818,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
|
||||
public int ShowOrder { get; set; }
|
||||
|
||||
|
||||
public bool IsFirstChangeTask { get; set; } = false;
|
||||
|
||||
}
|
||||
|
||||
public class GetTableAnswerRowInfoInDto
|
||||
|
|
|
@ -711,6 +711,29 @@ namespace IRaCIS.Application.Services
|
|||
.WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId)
|
||||
.ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex)
|
||||
.ToListAsync();
|
||||
|
||||
|
||||
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
||||
|
||||
if (taskInfo.IsConvertedTask &&
|
||||
!(await _visitTaskRepository.AnyAsync(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
|
||||
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
|
||||
&& x.VisitTaskNum < taskInfo.VisitTaskNum
|
||||
&& x.DoctorUserId == taskInfo.DoctorUserId
|
||||
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
|
||||
&& !x.IsConvertedTask
|
||||
&& x.SubjectId == taskInfo.SubjectId
|
||||
&& x.ArmEnum == taskInfo.ArmEnum &&
|
||||
x.TaskState == TaskState.Effect))
|
||||
)
|
||||
{
|
||||
result.ForEach(x =>
|
||||
{
|
||||
x.IsFirstChangeTask = true;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
result.ForEach(x =>
|
||||
{
|
||||
|
||||
|
|
Loading…
Reference in New Issue