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

删除之前废弃的代码

Browse Source
This commit is contained in:
hang
2023-11-07 17:42:48 +08:00
parent 1c689ccfbd
commit 8e5e638914
26 changed files with 33 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs
+10 -9
View File
@@ -11,13 +11,14 @@ namespace IRaCIS.Core.Application.Services
{
private readonly IRepository<DicomInstance> _instanceRepository;
private readonly IRepository<DicomStudy> _studyRepository;
private readonly IRepository<KeyInstance> _keyInstanceRepository;
public InstanceService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository,
IRepository<KeyInstance> keyInstanceRepository )
//private readonly IRepository<KeyInstance> _keyInstanceRepository;
public InstanceService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository
//,IRepository<KeyInstance> keyInstanceRepository
)
{
_instanceRepository = instanceRepository;
_studyRepository = studyRepository;
_keyInstanceRepository = keyInstanceRepository;
//_keyInstanceRepository = keyInstanceRepository;
}
/// <summary> 指定资源Id，获取Dicom序列所属的实例信息列表 </summary>
@@ -42,11 +43,11 @@ namespace IRaCIS.Core.Application.Services
[HttpGet, Route("{seriesId:guid}/{tpCode?}/{key?}")]
public IEnumerable<Guid> List(Guid seriesId, string tpCode, bool? key)
{
if (key != null && key.HasValue && key.Value)
{
return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct();
}
else
//if (key != null && key.HasValue && key.Value)
//{
// return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct();
//}
//else
return _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).Select(t => t.Id);
}
IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs
+7 -6
View File
@@ -10,19 +10,20 @@ namespace IRaCIS.Core.Application.Services
[AllowAnonymous]
public class SeriesService : BaseService
{
private readonly IRepository<ImageLabel> _imageLabelRepository;
//private readonly IRepository<KeyInstance> _keyInstanceRepository;
// private readonly IRepository<ImageLabel> _imageLabelRepository;
private readonly IRepository<DicomSeries> _seriesRepository;
private readonly IRepository<DicomInstance> _instanceRepository;
private readonly IRepository<DicomStudy> _studyRepository;
private readonly IRepository<KeyInstance> _keyInstanceRepository;
public SeriesService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository,
IRepository<KeyInstance> keyInstanceRepository, IRepository<DicomSeries> seriesRepository, IRepository<ImageLabel> imageLabelRepository)
public SeriesService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository, IRepository<DicomSeries> seriesRepository
/* IRepository<KeyInstance> keyInstanceRepository, IRepository<ImageLabel> imageLabelRepository*/)
{
_seriesRepository = seriesRepository;
_instanceRepository = instanceRepository;
_studyRepository = studyRepository;
_keyInstanceRepository = keyInstanceRepository;
_imageLabelRepository = imageLabelRepository;
//_keyInstanceRepository = keyInstanceRepository;
//_imageLabelRepository = imageLabelRepository;
}
IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+1 -4
View File
@@ -19,8 +19,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<AddInstanceDto, DicomInstance>();
CreateMap<Report, ReportDTO>();
CreateMap<ImageLabel, ImageLabelDTO>();
CreateMap<DicomSeries, DicomSeriesWithLabelDTO>();
//影像上传 检查
@@ -73,11 +72,9 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ImageShareCommand, ImageShare>();
CreateMap<StudyDTFAddOrUpdateCommand, StudyDTF>();
CreateMap<StudyStatusDetail, StudyStatusDetailDTO>();
CreateMap<DicomInstance, DicomInstanceDTO>()
.ForMember(o => o.IsDeleted, t => t.MapFrom(u => u.DicomSerie.IsDeleted))