diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 0a86c6ee3..06dfbb286 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -308,12 +308,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingPastResultListInDto
{
- [NotDefault]
- public Guid TrialId { get; set; }
-
- [NotDefault]
- public Guid SubjectId { get; set; }
-
[NotDefault]
public Guid VisitTaskId { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index b39214a4d..1e3473697 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -88,30 +88,6 @@ namespace IRaCIS.Application.Services
}
#region 全局阅片相关
- ///
- /// 获取全局阅片历史记录
- ///
- ///
- ///
- [HttpPost]
- public async Task> GetHistoryGlobalInfo(GetHistoryGlobalInfoInDto inDto)
- {
- 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()
- {
-
- ReadingTaskState = x.ReadingTaskState,
- TaskName = x.TaskName,
- VisitTaskId = x.Id,
- VisitTaskNum=x.VisitTaskNum
- }).OrderBy(x=>x.VisitTaskNum).ToListAsync();
-
- return result;
- }
-
///
/// 保存全局阅片结果
///
@@ -910,31 +886,19 @@ namespace IRaCIS.Application.Services
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.ArmEnum== taskInfo.ArmEnum
- && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned&&x.TaskState==TaskState.Effect)
- .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
+ var readingPastResultList = await _visitTaskRepository.Where(x =>
+ x.TrialId == taskInfo.TrialId &&
+ x.SubjectId == taskInfo.SubjectId &&
+ x.ArmEnum== taskInfo.ArmEnum &&
+ x.Id != inDto.VisitTaskId &&
+ x.ReadingTaskState == ReadingTaskState.HaveSigned&&
+ x.TaskState==TaskState.Effect&&
+ x.ReadingCategory== taskInfo.ReadingCategory&&
+ x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
+ .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return readingPastResultList;
}
- ///
- /// 获取裁判既往结果
- ///
- ///
- /// 这里是裁判的既往结果
- ///
- ///
- ///
- [HttpPost]
- public async Task> GetJudgeReadingPastResultList(GetJudgeReadingPastResultListInDto inDto)
- {
- var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
- var readingPastResultList = await _visitTaskRepository.Where(x => x.TrialId == taskInfo.TrialId && x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum
- && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect&&
- x.ReadingCategory==ReadingCategory.Judge
- )
- .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate).ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.VisitTaskNum).ToListAsync();
- return readingPastResultList;
- }
#endregion
#region 找子问题