Uat_Study
parent
81039b7778
commit
d2228b45ba
|
@ -257,6 +257,7 @@ namespace IRaCIS.Application.Services
|
||||||
x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
|
x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
|
||||||
x.ReadingTaskState == ReadingTaskState.HaveSigned &&
|
x.ReadingTaskState == ReadingTaskState.HaveSigned &&
|
||||||
x.TaskState == TaskState.Effect &&
|
x.TaskState == TaskState.Effect &&
|
||||||
|
x.IsSelfAnalysis == taskInfo.IsSelfAnalysis&&
|
||||||
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
|
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
|
||||||
.WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit, x => x.ReadingCategory == taskInfo.ReadingCategory)
|
.WhereIf(taskInfo.ReadingCategory != ReadingCategory.Visit, x => x.ReadingCategory == taskInfo.ReadingCategory)
|
||||||
|
|
||||||
|
@ -1074,6 +1075,8 @@ namespace IRaCIS.Application.Services
|
||||||
throw new BusinessValidationFailedException($"InstanceId和SeriesId不对应!");
|
throw new BusinessValidationFailedException($"InstanceId和SeriesId不对应!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
||||||
var questionInfo = await _readingQuestionTrialRepository.Where(x => x.Id == inDto.QuestionId).FirstNotNullAsync();
|
var questionInfo = await _readingQuestionTrialRepository.Where(x => x.Id == inDto.QuestionId).FirstNotNullAsync();
|
||||||
var criterionId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.TrialReadingCriterionId).FirstOrDefaultAsync();
|
var criterionId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.TrialReadingCriterionId).FirstOrDefaultAsync();
|
||||||
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == criterionId).FirstNotNullAsync();
|
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == criterionId).FirstNotNullAsync();
|
||||||
|
@ -1161,7 +1164,7 @@ namespace IRaCIS.Application.Services
|
||||||
rowInfo.IsDicomReading = inDto.IsDicomReading;
|
rowInfo.IsDicomReading = inDto.IsDicomReading;
|
||||||
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
|
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
|
||||||
rowInfo.NumberOfFrames = inDto.NumberOfFrames;
|
rowInfo.NumberOfFrames = inDto.NumberOfFrames;
|
||||||
rowInfo.FristAddTaskNum = inDto.FristAddTaskNum;
|
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
|
||||||
rowInfo.PicturePath = inDto.PicturePath;
|
rowInfo.PicturePath = inDto.PicturePath;
|
||||||
rowInfo.RowIndex = inDto.RowIndex;
|
rowInfo.RowIndex = inDto.RowIndex;
|
||||||
rowInfo.OrganInfoId = inDto.OrganInfoId;
|
rowInfo.OrganInfoId = inDto.OrganInfoId;
|
||||||
|
|
Loading…
Reference in New Issue