diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs index 4c9bff55c..2dc810245 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs @@ -82,6 +82,7 @@ namespace IRaCIS.Core.Application.Service medicalReviewInfo.TaskList = await _visitTaskRepository .WhereIf(taskInfo.ArmEnum == Arm.JudgeArm, x => x.ArmEnum == Arm.JudgeArm) .WhereIf(taskInfo.ArmEnum != Arm.JudgeArm, x => x.ArmEnum != Arm.JudgeArm) + .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate) .Where(x => x.SubjectId == taskInfo.SubjectId && x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() @@ -102,7 +103,9 @@ namespace IRaCIS.Core.Application.Service List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree - ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() + ) + .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) + .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() { TaskId = x.Id, IsCurrentTask = x.Id == taskInfo.Id, @@ -138,7 +141,9 @@ namespace IRaCIS.Core.Application.Service List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree - ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() + ) + .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) + .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() { TaskId = x.Id, IsCurrentTask = x.Id == taskInfo.Id, @@ -362,7 +367,8 @@ namespace IRaCIS.Core.Application.Service { x.SaveConclusionTime, x.SaveQuestionTime, - x.IsClosedDialog + x.IsClosedDialog, + x.IsHaveQuestion }).FirstNotNullAsync(); @@ -372,7 +378,7 @@ namespace IRaCIS.Core.Application.Service } - if (!taskmedicalReview.IsClosedDialog) + if (taskmedicalReview.IsHaveQuestion&&!taskmedicalReview.IsClosedDialog) { throw new BusinessValidationFailedException("对话未关闭"); diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 0c87bef13..2447b8a48 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -115,10 +115,16 @@ namespace IRaCIS.Core.Domain.Models public DateTime? SuggesteFinishedTime { get; set; } - //是否是重阅产生的,方便过滤数据 + + /// + /// 是否是重阅产生的,方便过滤数据 + /// public bool IsReReadingCreate { get; set; } - //是否是一致性分析产生 + + /// + /// 是否是一致性分析产生 + /// public bool IsAnalysisCreate { get; set; }