diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 5052df95d..1532ee143 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -85,7 +85,7 @@ namespace IRaCIS.Core.API.Controllers /// 获取稽查数据 /// /// - [HttpPost, Route("Inspection/GetInspectionData")] + [HttpPost, Route("Inspection/GetInspectionList")] public async Task> GetInspectionList(GetDataInspectionDto dto) { return await _inspectionService.GetInspectionList(dto); diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index c207b93b4..3346ed0d4 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -41,6 +41,8 @@ namespace IRaCIS.Core.Application.Service.Inspection from leftrial in trialtemp.DefaultIfEmpty() join site in _repository.GetQueryable().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp from leftsite in sitetemp.DefaultIfEmpty() + + join subject in _repository.GetQueryable().IgnoreQueryFilters() on data.SubjectId equals subject.Id into subtemp from leftsubject in subtemp.DefaultIfEmpty() join subjectVisit in _repository.GetQueryable().IgnoreQueryFilters() on data.SubjectVisitId equals subjectVisit.Id into subjectVisittemp diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index 8cb4f74dd..477930cff 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -160,31 +160,6 @@ namespace IRaCIS.Application.Services /// public async Task GenerateReadingTask(ReadingToGenerateInDto inDto) { - //var readset = (await _readingPeriodSetRepository.Where(x => x.Id == inDto.ReadingPeriodSetId).Include(x => x.ReadingPeriodSites).FirstOrDefaultAsync()).IfNullThrowConvertException(); - //var visits = await _subjectVisitRepository.Where(x => inDto.SubjectVisitIds.Contains(x.Id)).ToListAsync(); - - //List readModules = new List(); - - //foreach (var item in visits) - //{ - // readModules.Add(new ReadModule() - // { - // Id = NewId.NextGuid(), - // SubjectId = item.SubjectId, - // ModuleType = readset.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Read : ModuleTypeEnum.Oncology, - // IsUrgent = item.IsUrgent, - // ModuleName = readset.ReadingPeriodName, - // SubjectVisitId = item.Id, - // ReadingSetType = readset.ReadingSetType, - // Status = ReadingCommon.GetVisitSubmitStateEnum(item), - // }); - //}; - - //await _readModuleRepository.AddRangeAsync(readModules); - - - //var res = await _subjectVisitRepository.SaveChangesAsync(); - List plans = new List(); inDto.SubjectVisitIds.ForEach(x => { @@ -223,8 +198,6 @@ namespace IRaCIS.Application.Services SubjectCode = x.SubjectVisit.Subject.Code, SubjectId = x.SubjectVisit.SubjectId, SubjectVisitName = x.SubjectVisit.VisitName, - - //Remark= readset.Remark }); return await plans.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? "SubjectId" : inDto.SortField,