This commit is contained in:
he
2022-10-25 16:55:25 +08:00
parent d10c6110e3
commit aa22ccdaf4
8 changed files with 86 additions and 71 deletions
@@ -171,7 +171,7 @@ namespace IRaCIS.Application.Services
ReadingPeriodSetId = item.ReadingPeriodSet.Id,
ReadingStatus = ReadingStatusEnum.TaskAllocate,
TrialId = readingPeriodSet.TrialId,
VisitNum = item.SubjectVisit.VisitNum,
//VisitNum = item.SubjectVisit.VisitNum,
//增加标准
TrialReadingCriterionId = readingPeriodSet.TrialReadingCriterionId
@@ -206,7 +206,7 @@ namespace IRaCIS.Application.Services
{
IsUrgent = readModule.IsUrgent??false,
SubjectId = readModule.SubjectId,
VisitNum=readModule.VisitNum,
VisitNum= await _subjectVisitRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync(),
ReadingName = readModule.ModuleName,
ReadModuleId =readModule.Id,
ReadingCategory = ReadingCategory.Global,
@@ -264,7 +264,7 @@ namespace IRaCIS.Application.Services
{
IsUrgent = readModule.IsUrgent ?? false,
SubjectId = readModule.SubjectId,
VisitNum=readModule.VisitNum,
VisitNum=await _visitTaskRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitTaskNum).FirstOrDefaultAsync(),
ReadingName = readModule.ModuleName,
ReadModuleId =readModule.Id,
ReadingCategory = ReadingCategory.Oncology,
@@ -439,7 +439,7 @@ namespace IRaCIS.Application.Services
globalVisitNum = await _readModuleRepository
.WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
.Where(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialId == inDto.TrialId).Select(x => x.VisitNum).Distinct().ToListAsync();
.Where(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialId == inDto.TrialId).Select(x => x.SubjectVisit.VisitNum).Distinct().ToListAsync();
}
List<GetReadingVisitListOutDto> result = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId)