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

Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRC_NewDev
he 2023-10-23 16:52:55 +08:00
parent f39ef0d799 66b9f2dd5c
commit e34f13bd6a
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -856,7 +856,18 @@ namespace IRaCIS.Core.API.Controllers
_userInfo = userInfo;
}
/// <summary> 通用文件下载 </summary>
[AllowAnonymous]
[HttpGet("CommonDocument/DownloadCommonDoc")]
public async Task<IActionResult> DownloadCommonFile(string code, [FromServices] IRepository<CommonDocument> _commonDocumentRepository)
{
var (filePath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
new FileExtensionContentTypeProvider().Mappings.TryGetValue(Path.GetExtension(filePath), out var contentType);
return File(System.IO.File.OpenRead(filePath), contentType ?? "application/octet-stream", fileName);
}
/// <summary>
/// 上传通用文档 比如一致性核查的 比如导出的excel 模板

6
IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs
View File

@ -117,6 +117,12 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO
public string Modality { get; set; }
}
public class InstancePathDTO
{
public string StudyCode { get; set; }
public string InstancePath { get; set; }
}
}

4
IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs
View File

@ -192,9 +192,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
/// <param name="_dicomSeriesRepository"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<string>> GetStudyModalityOSSPath(List<Guid> seriesIdList, [FromServices] IRepository<DicomSeries> _dicomSeriesRepository)
public async Task<List<InstancePathDTO>> GetStudyModalityOSSPath(List<Guid> seriesIdList, [FromServices] IRepository<DicomSeries> _dicomSeriesRepository)
{
return await _dicomSeriesRepository.Where(t => seriesIdList.Contains(t.Id)).SelectMany(t => t.DicomInstanceList).Select(t => t.Path).ToListAsync();
return await _dicomSeriesRepository.Where(t => seriesIdList.Contains(t.Id)).SelectMany(t => t.DicomInstanceList).Select(t => new InstancePathDTO() {InstancePath= t.Path,StudyCode=t.DicomStudy.StudyCode } ).ToListAsync();
}

4
IRaCIS.Core.Domain/Image/DicomInstance.cs
View File

@ -11,6 +11,10 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("SeriesId")]
public DicomSeries DicomSerie { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public DicomStudy DicomStudy { get; set; }
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public Guid SeqId { get; set; }