From ee8071b161ab727f65734f5d044f9c749d79c529 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 2 Jun 2022 17:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadModuleService.cs | 20 +++++++++++-------- .../Reading/ReadingPeriodSetService.cs | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index b4eab63a8..c43d0f0eb 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -174,21 +174,25 @@ namespace IRaCIS.Application.Services return GetReadModuleOutDto; } - - ///// - ///// - ///// - ///// - ///// + + /// + /// + /// + /// + /// //public async Task> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto) //{ // var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null); - // var finalVisitNum =await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync(); + // var finalVisitNum = await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync(); // var readModulequery = _readModuleRepository.AsQueryable(); - // visitquery = visitquery.WhereIf(finalVisitNum!=null,x=>x.VisitNum< finalVisitNum).Where( x=> readModulequery.Where(y=>y.SubjectVisitId==x.Id&&y.ReadingSetType==inDto.ReadingSetType).Count()==0).OrderBy(x=>finalVisitNum) + // //visitquery = visitquery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum) + // // .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum) + // // .Select(x=>new GetSubjectReadVisitsOutDto() { + + // // } ) //} /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index add4ae382..22410a775 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -57,7 +57,7 @@ namespace IRaCIS.Application.Services }).ToList(); await _readingPeriodSetRepository.AddAsync(entity, true); - return ResponseOutput.Ok(); + return ResponseOutput.Ok(entity.Id); } else { @@ -70,7 +70,7 @@ namespace IRaCIS.Application.Services SiteId = x, }).ToList(); var success = await _readingPeriodSetRepository.SaveChangesAsync(); - return ResponseOutput.Ok(); + return ResponseOutput.Ok(entity.Id); } }