|
@@ -1278,6 +1278,15 @@ namespace WingMongoDBModule.Service
|
|
|
var sampleRemedicalInfoDTO = new SampleRemedicalInfoDTO();
|
|
|
sampleRemedicalInfoDTO.IsURM = remedicalItem.ImgList.Any(x => x.ImgType == 0);
|
|
|
sampleRemedicalInfoDTO.ImgList = remedicalItem.ImgList;
|
|
|
+ if (sampleRemedicalInfoDTO.ImgList?.Count > 0)
|
|
|
+ {
|
|
|
+ foreach(var item in sampleRemedicalInfoDTO.ImgList)
|
|
|
+ {
|
|
|
+ item.CoverImgUrl = item.CoverImgUrl.ToLocalUrl();
|
|
|
+ item.FileToken = item.FileToken.ToLocalUrl();
|
|
|
+ item.PreviewFileUrl = item.PreviewFileUrl.ToLocalUrl();
|
|
|
+ }
|
|
|
+ }
|
|
|
sampleRemedicalInfoDTO.IsAnalysisResult = remedicalItem.ImgList.Any(x => x.ImgType != 0);
|
|
|
sampleRemedicalInfoDTO.Application = remedicalItem.Application;
|
|
|
sampleRemedicalInfoDTO.ApplicationCategory = remedicalItem.ApplicationCategory;
|
|
@@ -1285,9 +1294,9 @@ namespace WingMongoDBModule.Service
|
|
|
sampleRemedicalInfoDTO.CreateTime = remedicalItem.CreateTime;
|
|
|
sampleRemedicalInfoDTO.FileDataType = (SampleRemedicalFileDataTypeEnum)remedicalItem.FileDataType.GetHashCode();
|
|
|
sampleRemedicalInfoDTO.ImageSize = remedicalItem.TerminalImages.ImageSize;
|
|
|
- sampleRemedicalInfoDTO.ImageUrl = remedicalItem.TerminalImages.OriginImageUrl;
|
|
|
- sampleRemedicalInfoDTO.CoverImgUrl = remedicalItem.TerminalImages.CoverImageUrl;
|
|
|
- sampleRemedicalInfoDTO.PreviewUrl = remedicalItem.TerminalImages.PreviewUrl;
|
|
|
+ sampleRemedicalInfoDTO.ImageUrl = remedicalItem.TerminalImages.OriginImageUrl.ToLocalUrl();
|
|
|
+ sampleRemedicalInfoDTO.CoverImgUrl = remedicalItem.TerminalImages.CoverImageUrl.ToLocalUrl();
|
|
|
+ sampleRemedicalInfoDTO.PreviewUrl = remedicalItem.TerminalImages.PreviewUrl.ToLocalUrl();
|
|
|
sampleRemedicalInfoDTO.SampleRemedicalMeasuredList = new List<SampleRemedicalMeasuredInfoDTO>();
|
|
|
//添加测量项
|
|
|
var itemRemedicalMeasuredInfos = remedicalMeasuredInfos.FindAll(x => x.RemedicalCode == remedicalItem.RemedicalCode);
|
|
@@ -1299,8 +1308,8 @@ namespace WingMongoDBModule.Service
|
|
|
measuredSampleRemedicalInfoDTO.RemedicalMeasuredInfoCode = itemRemedicalMeasuredInfo.RemedicalMeasuredInfoCode;
|
|
|
measuredSampleRemedicalInfoDTO.CreateTime = itemRemedicalMeasuredInfo.CreateTime;
|
|
|
measuredSampleRemedicalInfoDTO.FrameIndex = itemRemedicalMeasuredInfo.FrameIndex;
|
|
|
- measuredSampleRemedicalInfoDTO.MeasuredFileToken = itemRemedicalMeasuredInfo.MeasuredFileToken;
|
|
|
- measuredSampleRemedicalInfoDTO.PreviewFileToken = itemRemedicalMeasuredInfo.PreviewFileToken;
|
|
|
+ measuredSampleRemedicalInfoDTO.MeasuredFileToken = itemRemedicalMeasuredInfo.MeasuredFileToken.ToLocalUrl();
|
|
|
+ measuredSampleRemedicalInfoDTO.PreviewFileToken = itemRemedicalMeasuredInfo.PreviewFileToken.ToLocalUrl();
|
|
|
measuredSampleRemedicalInfoDTO.MeasuredData = itemRemedicalMeasuredInfo.MeasuredData;
|
|
|
measuredSampleRemedicalInfoDTO.Model = itemRemedicalMeasuredInfo.Model;
|
|
|
sampleRemedicalInfoDTO.SampleRemedicalMeasuredList.Add(measuredSampleRemedicalInfoDTO);
|
|
@@ -1322,9 +1331,9 @@ namespace WingMongoDBModule.Service
|
|
|
imgSampleRemedicalInfoDTO.CreateTime = remedicalItem.CreateTime;
|
|
|
imgSampleRemedicalInfoDTO.FileDataType = GetSampleRemedicalFileDataTypeEnumByImgType(img.ImgType);
|
|
|
imgSampleRemedicalInfoDTO.ImageSize = img.FileSize;
|
|
|
- imgSampleRemedicalInfoDTO.ImageUrl = img.FileToken;
|
|
|
- imgSampleRemedicalInfoDTO.PreviewUrl = img.PreviewFileUrl;
|
|
|
- imgSampleRemedicalInfoDTO.CoverImgUrl = img.CoverImgUrl;
|
|
|
+ imgSampleRemedicalInfoDTO.ImageUrl = img.FileToken.ToLocalUrl();;
|
|
|
+ imgSampleRemedicalInfoDTO.PreviewUrl = img.PreviewFileUrl.ToLocalUrl();;
|
|
|
+ imgSampleRemedicalInfoDTO.CoverImgUrl = img.CoverImgUrl.ToLocalUrl();;
|
|
|
sampleRemedicalBasicInfo.SampleRemedicalInfoList.Add(imgSampleRemedicalInfoDTO);
|
|
|
}
|
|
|
}
|