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

修改

IRC_NewDev
he 2024-03-19 11:33:34 +08:00
parent 2d81b05fba
commit 4b92874ca6
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
View File

@ -39,5 +39,7 @@ namespace IRaCIS.Core.Application.Contracts
Task ResetReadingRestTime(Guid? userId); Task ResetReadingRestTime(Guid? userId);
Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto);
} }
} }

2
IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
View File

@ -216,7 +216,7 @@ namespace IRaCIS.Core.Application.Contracts
public class GetPTAndCtSeriesInDto public class GetPTAndCtSeriesInDto
{ {
public List<Guid> VisitTaskIds { get; set; } public Guid VisitTaskId { get; set; }
} }
public class VisitStudyDTO public class VisitStudyDTO

17
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -11,6 +11,7 @@ using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
using MassTransit; using MassTransit;
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Application.Services;
namespace IRaCIS.Core.Application.Services namespace IRaCIS.Core.Application.Services
{ {
@ -22,6 +23,7 @@ namespace IRaCIS.Core.Application.Services
private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository; private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
private readonly IRepository<ReadModule> _readModuleRepository; private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
private readonly IReadingImageTaskService _ireadingImageTaskService;
private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository; private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository; private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
private readonly IRepository<DicomInstance> _dicomInstanceRepository; private readonly IRepository<DicomInstance> _dicomInstanceRepository;
@ -39,6 +41,7 @@ namespace IRaCIS.Core.Application.Services
IRepository<ReadingClinicalData> readingClinicalDataRepository, IRepository<ReadingClinicalData> readingClinicalDataRepository,
IRepository<ReadModule> readModuleRepository, IRepository<ReadModule> readModuleRepository,
IRepository<Trial> trialRepository, IRepository<Trial> trialRepository,
IReadingImageTaskService ireadingImageTaskService,
IRepository<ReadingPeriodSet> readingPeriodSetRepository, IRepository<ReadingPeriodSet> readingPeriodSetRepository,
IRepository<NoneDicomStudy> noneDicomStudyRepository, IRepository<NoneDicomStudy> noneDicomStudyRepository,
IRepository<DicomInstance> dicomInstanceRepository, IRepository<DicomInstance> dicomInstanceRepository,
@ -57,6 +60,7 @@ namespace IRaCIS.Core.Application.Services
this._readingClinicalDataRepository = readingClinicalDataRepository; this._readingClinicalDataRepository = readingClinicalDataRepository;
this._readModuleRepository = readModuleRepository; this._readModuleRepository = readModuleRepository;
this._trialRepository = trialRepository; this._trialRepository = trialRepository;
this._ireadingImageTaskService = ireadingImageTaskService;
this._readingPeriodSetRepository = readingPeriodSetRepository; this._readingPeriodSetRepository = readingPeriodSetRepository;
this._noneDicomStudyRepository = noneDicomStudyRepository; this._noneDicomStudyRepository = noneDicomStudyRepository;
this._dicomInstanceRepository = dicomInstanceRepository; this._dicomInstanceRepository = dicomInstanceRepository;
@ -329,7 +333,16 @@ namespace IRaCIS.Core.Application.Services
[HttpPost] [HttpPost]
public async Task<List<GetPTAndCtSeriesOutDto>> GetPTAndCtSeries(GetPTAndCtSeriesInDto inDto) public async Task<List<GetPTAndCtSeriesOutDto>> GetPTAndCtSeries(GetPTAndCtSeriesInDto inDto)
{ {
var visitSeriesList=await _readingTableAnswerRowInfoRepository.Where(x => inDto.VisitTaskIds.Contains(x.VisitTaskId))
var pastResultList= await this._ireadingImageTaskService.GetReadingPastResultList(new GetReadingPastResultListInDto()
{
VisitTaskId = inDto.VisitTaskId
}) ;
var visitTaskIds = pastResultList.Select(x => x.VisitTaskId).ToList();
var visitSeriesList=await _readingTableAnswerRowInfoRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId))
.Where(x => x.PTSeriesId != null && x.CTSeriesId != null) .Where(x => x.PTSeriesId != null && x.CTSeriesId != null)
.Select(x => new .Select(x => new
{ {
@ -345,7 +358,7 @@ namespace IRaCIS.Core.Application.Services
List<Guid> seriesIds = new List<Guid>(); List<Guid> seriesIds = new List<Guid>();
foreach (var item in inDto.VisitTaskIds) foreach (var item in visitTaskIds)
{ {
var visitSeries = visitSeriesList.Where(x => x.VisitTaskId == item).OrderByDescending(x => x.UpdateTime).FirstOrDefault(); var visitSeries = visitSeriesList.Where(x => x.VisitTaskId == item).OrderByDescending(x => x.UpdateTime).FirstOrDefault();
if (visitSeries != null) if (visitSeries != null)