Compare commits
No commits in common. "79a6e43e022ff778f4493a7f4e15775e85984397" and "2838b3756fc635c2facc4dfb1956ecff2e5e5039" have entirely different histories.
79a6e43e02
...
2838b3756f
|
@ -54,10 +54,9 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
VisitTask? globalTaskInfo = null;
|
VisitTask? globalTaskInfo = null;
|
||||||
var relatedVisitTaskIdList = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.RelatedVisitTaskIdList).FirstNotNullAsync();
|
var relatedVisitTaskIdList = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.RelatedVisitTaskIdList).FirstNotNullAsync();
|
||||||
Guid? judgeResultTaskId = null;
|
|
||||||
if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned && relatedVisitTaskIdList.Count() > 0)
|
if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned && relatedVisitTaskIdList.Count() > 0)
|
||||||
{
|
{
|
||||||
judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
|
var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
|
||||||
|
|
||||||
// 说明是裁判 取裁判结果
|
// 说明是裁判 取裁判结果
|
||||||
if (judgeResultTaskId != null)
|
if (judgeResultTaskId != null)
|
||||||
|
@ -101,15 +100,11 @@ namespace IRaCIS.Application.Services
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (judgeResultTaskId == null)
|
var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == globalTaskInfo.JudgeVisitTaskId).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
|
||||||
{
|
|
||||||
judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == globalTaskInfo.JudgeVisitTaskId).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
|
|
||||||
if (judgeResultTaskId == null)
|
if (judgeResultTaskId == null)
|
||||||
{
|
{
|
||||||
throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
|
throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
|
visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
|
||||||
visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync();
|
visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue