修改一版
parent
1734d4d39d
commit
196f523a97
|
@ -97,7 +97,7 @@ namespace IRaCIS.Application.Services
|
|||
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.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum && x.ReadingCategory == ReadingCategory.Global && x.VisitTaskNum < taskInfo.VisitTaskNum)
|
||||
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)
|
||||
.OrderBy(x => x.VisitTaskNum)
|
||||
.Select(x => new GetHistoryGlobalInfoOutDto()
|
||||
{
|
||||
|
@ -1172,7 +1172,8 @@ namespace IRaCIS.Application.Services
|
|||
{
|
||||
// 这里是非一致性分析产生的
|
||||
visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory != ReadingCategory.Judge
|
||||
&&x.IsAnalysisCreate==false
|
||||
&& x.TaskState== TaskState.Effect
|
||||
&& x.IsAnalysisCreate==false
|
||||
&& x.ReReadingApplyState != ReReadingApplyState.Agree && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue