diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index b61c4a87c..2de19fa4c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -98,6 +98,7 @@ namespace IRaCIS.Application.Services { var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); List result = await _visitTaskRepository.Where(x =>x.TaskState==TaskState.Effect&& x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum && x.ReadingCategory == ReadingCategory.Global && x.VisitTaskNum < taskInfo.VisitTaskNum) + .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate) .OrderBy(x => x.VisitTaskNum) .Select(x => new GetHistoryGlobalInfoOutDto() { @@ -869,8 +870,10 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetReadingPastResultList(GetReadingPastResultListInDto inDto) { + var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); var readingPastResultList = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId && x.DoctorUserId == _userInfo.Id - && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned&&x.TaskState==TaskState.Effect) + .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); return readingPastResultList; } #endregion @@ -1122,34 +1125,6 @@ namespace IRaCIS.Application.Services } - - - /// - /// 全局阅片裁判触发 - /// - /// - /// - private async Task GlobalTriggerJudgeQuestion(Guid visitTaskId) - { - List visitTaskids = new List(); - var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync(); - - // 判断是否是一致性分析产生的 - if (taskInfo.IsAnalysisCreate) - { - if (taskInfo.ConsistentAnalysisOriginalTaskId != null) - { - visitTaskids.Add(visitTaskId); - visitTaskids.Add(taskInfo.ConsistentAnalysisOriginalTaskId.Value); - } - } - else - { - visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory != ReadingCategory.Judge - - && x.ReReadingApplyState != ReReadingApplyState.Agree && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId).Select(x => x.Id).ToListAsync(); - } - } /// /// 触发裁判任务(新)