This commit is contained in:
he
2023-01-16 16:10:55 +08:00
parent ef642356da
commit e9988526b0
4 changed files with 30 additions and 5 deletions
@@ -141,7 +141,7 @@ namespace IRaCIS.Application.Services
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
).Select(x => x.Id).FirstOrDefaultAsync();
result.JudgeTaskId = await _visitTaskRepository.Where(x =>
var judgeInfo = await _visitTaskRepository.Where(x =>
x.SubjectId == taskInfo.SubjectId
&& x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
&& x.TaskState == TaskState.Effect
@@ -152,8 +152,13 @@ namespace IRaCIS.Application.Services
&& x.DoctorUserId == taskInfo.DoctorUserId
&& x.ReadingTaskState == ReadingTaskState.HaveSigned
&& x.VisitTaskNum == taskInfo.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]
&& x.ReReadingApplyState != ReReadingApplyState.Agree)
.Select(x => x.Id).FirstOrDefaultAsync();
&& x.ReReadingApplyState != ReReadingApplyState.Agree).FirstOrDefaultAsync();
if (judgeInfo != null)
{
result.JudgeTaskId = judgeInfo.Id;
result.JudgeTaskName = judgeInfo.TaskBlindName;
}
// 一致性分析按照doctorId 其他按照分组