|
@@ -80,6 +80,7 @@ namespace Flyinsono.DBCopy.Tool.Service
|
|
|
private ReportTemplateDBRepository _reportTemplateDBRepository;
|
|
|
private ReportInfoResultDBRepository _reportInfoResultDBRepository;
|
|
|
private CustomLabelDBRepository _customLabelDBRepository;
|
|
|
+ private StorageFileInfoesDBRepository _storageFileInfoesDBRepository;
|
|
|
protected readonly object locker = new object();
|
|
|
protected ProbeAppHepler _probeAppHepler;
|
|
|
|
|
@@ -111,6 +112,8 @@ namespace Flyinsono.DBCopy.Tool.Service
|
|
|
_adminDBRepository = new AdminDBRepository();
|
|
|
_reportInfoResultDBRepository = new ReportInfoResultDBRepository();
|
|
|
_customLabelDBRepository = new CustomLabelDBRepository();
|
|
|
+
|
|
|
+ _storageFileInfoesDBRepository = new StorageFileInfoesDBRepository();
|
|
|
_probeAppHepler = new ProbeAppHepler();
|
|
|
}
|
|
|
|
|
@@ -2207,7 +2210,7 @@ namespace Flyinsono.DBCopy.Tool.Service
|
|
|
UpdateTime = reportInfoResult.UpdateTime,
|
|
|
RecordCode = reportInfoResult.RecordId,
|
|
|
ReportTemplateJson = reportInfoResult.Template,
|
|
|
- ReportDatasJson = ReportElementsSerializer.ConvertReportElementsToJson(isAI, reportInfoResult.Template, reportInfoResult.ElementCollection),
|
|
|
+ ReportDatasJson = ReportElementsSerializer.ConvertReportElementsToJson(isAI, reportInfoResult.Template, reportInfoResult.ElementCollection, GetFileUrl),
|
|
|
ReportPreviewList = new List<ReportPreviewDTO>(),
|
|
|
ReportOrgan = (DiagnosisOrganEnum)reportInfoResult.Organ,
|
|
|
DiagnosisLabels = diagnosisLabels,
|
|
@@ -2283,9 +2286,21 @@ namespace Flyinsono.DBCopy.Tool.Service
|
|
|
private string GetFileUrl(string fileUrl)
|
|
|
{
|
|
|
var prefix = "1!U$";
|
|
|
- if (!string.IsNullOrWhiteSpace(fileUrl) && fileUrl.StartsWith(prefix))
|
|
|
+ if (!string.IsNullOrWhiteSpace(fileUrl))
|
|
|
{
|
|
|
- return fileUrl.Replace(prefix, "");
|
|
|
+ if (fileUrl.StartsWith(prefix))
|
|
|
+ {
|
|
|
+ return fileUrl.Replace(prefix, "");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ var fileToken = fileUrl.Substring(fileUrl.LastIndexOf('/') + 1);
|
|
|
+ var storageInfo = _storageFileInfoesDBRepository.GetTerminalRecordByToken(fileToken);
|
|
|
+ if (storageInfo != null && !string.IsNullOrWhiteSpace(storageInfo.FileName))
|
|
|
+ {
|
|
|
+ return $"http://218.95.167.40:8098/FlyinsonoStorage/{storageInfo.FolderName}/{storageInfo.FileName}";
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return fileUrl ?? string.Empty;
|
|
|
}
|