XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-07-29 10:06:28 +08:00
parent 6afccabed8
commit 3139ad0a16
2 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -308,12 +308,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingPastResultListInDto public class GetReadingPastResultListInDto
{ {
[NotDefault]
public Guid TrialId { get; set; }
[NotDefault]
public Guid SubjectId { get; set; }
[NotDefault] [NotDefault]
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
} }

56
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -88,30 +88,6 @@ namespace IRaCIS.Application.Services
} }
#region 全局阅片相关 #region 全局阅片相关
/// <summary>
/// 获取全局阅片历史记录
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<GetHistoryGlobalInfoOutDto>> GetHistoryGlobalInfo(GetHistoryGlobalInfoInDto inDto)
{
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
List<GetHistoryGlobalInfoOutDto> 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;
}
/// <summary> /// <summary>
/// 保存全局阅片结果 /// 保存全局阅片结果
/// </summary> /// </summary>
@ -910,31 +886,19 @@ namespace IRaCIS.Application.Services
public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto) public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto)
{ {
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); 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 var readingPastResultList = await _visitTaskRepository.Where(x =>
&& x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned&&x.TaskState==TaskState.Effect) x.TrialId == taskInfo.TrialId &&
.Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync(); 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<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return readingPastResultList; return readingPastResultList;
} }
/// <summary>
/// 获取裁判既往结果
/// </summary>
/// <remarks>
/// 这里是裁判的既往结果
///
/// </remarks>
/// <returns></returns>
[HttpPost]
public async Task<List<GetReadingPastResultListOutDto>> 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<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.VisitTaskNum).ToListAsync();
return readingPastResultList;
}
#endregion #endregion
#region 找子问题 #region 找子问题