Compare commits
No commits in common. "45f392492d3879537d85bf6afeb04e1c19802d94" and "46e793908893bc976d876f5af5124a1f5498f5bd" have entirely different histories.
45f392492d
...
46e7939088
|
@ -3835,13 +3835,6 @@ export function getDicomModalityList(params) {
|
||||||
params
|
params
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 获取患者序列信息
|
|
||||||
export function getPatientSeriesList(scpStudyId) {
|
|
||||||
return request({
|
|
||||||
url: `/Patient/getPatientSeriesList?scpStudyId=${scpStudyId}`,
|
|
||||||
method: 'get'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
// 获取反馈列表
|
// 获取反馈列表
|
||||||
export function getUserFeedBackList(data) {
|
export function getUserFeedBackList(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|
|
@ -138,7 +138,7 @@ import * as cornerstone from 'cornerstone-core'
|
||||||
import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
|
import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
|
||||||
import dicomViewer from '@/components/Dicom/DicomViewer'
|
import dicomViewer from '@/components/Dicom/DicomViewer'
|
||||||
import { getStudyInfo, getSeriesList } from '@/api/reading'
|
import { getStudyInfo, getSeriesList } from '@/api/reading'
|
||||||
import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
|
import { getInstanceList, setSeriesStatus } from '@/api/trials'
|
||||||
|
|
||||||
import requestPoolManager from '@/utils/request-pool'
|
import requestPoolManager from '@/utils/request-pool'
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
|
@ -219,8 +219,6 @@ export default {
|
||||||
this.loadStudy()
|
this.loadStudy()
|
||||||
} else if (this.type === 'Share') {
|
} else if (this.type === 'Share') {
|
||||||
this.loadStudy()
|
this.loadStudy()
|
||||||
} else if (this.type === 'Patient') {
|
|
||||||
this.loadPatientStudy()
|
|
||||||
}
|
}
|
||||||
cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
|
cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
|
||||||
window.addEventListener('beforeunload', e => {
|
window.addEventListener('beforeunload', e => {
|
||||||
|
@ -249,65 +247,6 @@ export default {
|
||||||
this.getSeriesList(url)
|
this.getSeriesList(url)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async loadPatientStudy() {
|
|
||||||
try {
|
|
||||||
let data = await getPatientSeriesList(this.studyId);
|
|
||||||
if (data.IsSuccess) {
|
|
||||||
const { Result } = data
|
|
||||||
var seriesList = []
|
|
||||||
Result.forEach((item, index) => {
|
|
||||||
const imageIds = []
|
|
||||||
item.InstanceInfoList.forEach(i => {
|
|
||||||
if (i.NumberOfFrames && i.NumberOfFrames > 1) {
|
|
||||||
for (let j = 0; j < i.NumberOfFrames; j++) {
|
|
||||||
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
|
|
||||||
}
|
|
||||||
i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
|
|
||||||
} else {
|
|
||||||
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
|
|
||||||
imageIds.push(imageId)
|
|
||||||
i.ImageId = imageId
|
|
||||||
}
|
|
||||||
})
|
|
||||||
var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
|
|
||||||
var studyId = this.$router.currentRoute.query.studyId
|
|
||||||
var trialId = this.$router.currentRoute.query.trialId
|
|
||||||
seriesList.push({
|
|
||||||
trialId,
|
|
||||||
subjectVisitId,
|
|
||||||
studyId,
|
|
||||||
imageIds: imageIds,
|
|
||||||
instanceInfoList: item.InstanceInfoList,
|
|
||||||
seriesId: item.Id,
|
|
||||||
seriesUid: item.SeriesInstanceUid,
|
|
||||||
seriesNumber: item.SeriesNumber,
|
|
||||||
sliceThickness: item.SliceThickness,
|
|
||||||
modality: item.Modality,
|
|
||||||
description: item.Description,
|
|
||||||
isReading: item.IsReading,
|
|
||||||
isDeleted: item.IsDeleted,
|
|
||||||
previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
|
|
||||||
instanceCount: item.InstanceCount,
|
|
||||||
prefetchInstanceCount: 0,
|
|
||||||
hasLabel: item.HasLabel,
|
|
||||||
keySeries: item.KeySeries,
|
|
||||||
tpCode: this.tpCode,
|
|
||||||
loadStatus: false,
|
|
||||||
imageloadedArr: [],
|
|
||||||
isExistMutiFrames: item.IsExistMutiFrames
|
|
||||||
})
|
|
||||||
})
|
|
||||||
this.seriesList = seriesList
|
|
||||||
if (this.seriesList.length > 0) {
|
|
||||||
this.loadAllImages()
|
|
||||||
this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
|
|
||||||
this.firstInstanceId = this.seriesList[0].imageIds[0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.log(err)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async getSeriesList(url) {
|
async getSeriesList(url) {
|
||||||
try {
|
try {
|
||||||
const data = await getSeriesList(url)
|
const data = await getSeriesList(url)
|
||||||
|
|
|
@ -257,7 +257,7 @@ export default {
|
||||||
image(item) {
|
image(item) {
|
||||||
let token = getToken();
|
let token = getToken();
|
||||||
const routeData = this.$router.resolve({
|
const routeData = this.$router.resolve({
|
||||||
path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Patient`,
|
path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Study`,
|
||||||
});
|
});
|
||||||
this.newWindow = window.open(routeData.href, "_blank");
|
this.newWindow = window.open(routeData.href, "_blank");
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue