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

合并修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-02-13 10:59:23 +08:00
parent 7cb8d04ca9 6dd0831a66
commit 14690dc3cc
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
View File

@ -79,6 +79,11 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
public int InstanceNumber { get; set; }
public bool IsReading { get; set; }
public bool IsDeleted { get; set; }
public Guid? StudyId { get; set; }
public List<int?> KeyFramesList { get; set; } = new List<int?> { };

4
IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs
View File

@ -23,9 +23,9 @@ namespace IRaCIS.Core.Application.Services
ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
.ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
var imageResizePath = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => t.DicomSerie.ImageResizePath).FirstOrDefaultAsync();
var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new { t.DicomSerie.ImageResizePath,t.DicomSerie.IsDeleted,t.DicomSerie.IsReading }).FirstOrDefaultAsync();
return ResponseOutput.Ok(list, new { ImageResizePath = imageResizePath });
return ResponseOutput.Ok(list, seriesInfo);
}

4
IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs
View File

@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Services
var instanceList = await _instanceRepository.Where(s => s.StudyId == studyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
.ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
.Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath }).ToListAsync();//.GroupBy(u => u.SeriesId);
.Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath ,t.IsReading,t.IsDeleted}).ToListAsync();//.GroupBy(u => u.SeriesId);
foreach (var series in seriesList)
{
@ -42,6 +42,8 @@ namespace IRaCIS.Core.Application.Services
HtmlPath = k.HtmlPath,
Path = k.Path,
InstanceNumber = k.InstanceNumber,
IsReading=k.IsReading,
IsDeleted=k.IsDeleted
}).ToList();
}

4
IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
View File

@ -84,9 +84,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<DicomInstance, DicomInstanceDTO>()
.ForMember(o => o.IsDeleted, t => t.MapFrom(u => u.DicomSerie.IsDeleted))
.ForMember(o => o.SliceThickness, t => t.MapFrom(u => u.DicomSerie.SliceThickness))
.ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
.ForMember(o => o.SliceThickness, t => t.MapFrom(u => u.DicomSerie.SliceThickness));
CreateMap<DicomStudy, DicomStudyDTO>();
CreateMap<DicomSeries, DicomSeriesDTO>();
CreateMap<SCPSeries, DicomSeriesDTO>();

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

@ -258,6 +258,8 @@ namespace IRaCIS.Core.Application.Services
HtmlPath = k.HtmlPath,
Path = k.Path,
InstanceNumber = k.InstanceNumber,
IsReading=k.IsReading,
IsDeleted=k.IsDeleted,
}).ToList();
}
);