XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing Details

uat_us
wangxiaoshuang 2024-06-28 15:58:50 +08:00
parent 5048f040cc 62d7315401
commit 0eb1289cf0
8 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
View File

@ -222,7 +222,8 @@ export default {
taskBlindName: '', taskBlindName: '',
frame: null, frame: null,
imageRendered: false, imageRendered: false,
isExistsClinicalData: false isExistsClinicalData: false,
isExistMutiFrames: false
// preventCache: true // preventCache: true
}, },
dicomInfo: { dicomInfo: {
@ -758,7 +759,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (var m = 0; m < this.measuredTools.length; m++) { for (var m = 0; m < this.measuredTools.length; m++) {
var toolType = this.measuredTools[m] var toolType = this.measuredTools[m]
@ -880,7 +881,6 @@ export default {
return seriesList[seriesIdx].loadStatus ? 1 : 0 return seriesList[seriesIdx].loadStatus ? 1 : 0
}, },
renderMeasuredData(e) { renderMeasuredData(e) {
this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId) var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
if (idx === -1) return if (idx === -1) return
this.measureData = this.visitTaskList[idx].MeasureData this.measureData = this.visitTaskList[idx].MeasureData
@ -899,9 +899,7 @@ export default {
} else { } else {
cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 }) cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
} }
// console.log('renderMeasuredData', this.stack.frame) if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type) const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
if (toolState && toolState.data.length > 0) { if (toolState && toolState.data.length > 0) {
var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid) var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@ -988,7 +986,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (let t = 0; t < this.measuredTools.length; t++) { for (let t = 0; t < this.measuredTools.length; t++) {
var toolType = this.measuredTools[t] var toolType = this.measuredTools[t]
@ -1067,6 +1065,7 @@ export default {
this.stack.sliceThickness = dicomSeries.sliceThickness this.stack.sliceThickness = dicomSeries.sliceThickness
this.stack.instanceCount = dicomSeries.instanceCount this.stack.instanceCount = dicomSeries.instanceCount
this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
this.stack.isExistMutiFrames = dicomSeries.isExistMutiFrames
// this.measuredData = dicomSeries.measuredData // this.measuredData = dicomSeries.measuredData
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId) var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@ -1087,7 +1086,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
ToolStateManager.clearImageIdToolState(dicomSeries.imageIds) ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@ -1201,7 +1200,7 @@ export default {
const imageInfo = this.getInstanceInfo(image.imageId) const imageInfo = this.getInstanceInfo(image.imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
this.resetWwwc() this.resetWwwc()
@ -1276,7 +1275,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (this.imageId !== instanceId) { if (this.imageId !== instanceId) {
this.getOrientationMarker(e.detail.element) this.getOrientationMarker(e.detail.element)
// 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值 // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@ -1335,13 +1334,13 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') { if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
const measureData = {} const measureData = {}
measureData.studyId = this.stack.studyId measureData.studyId = this.stack.studyId
measureData.seriesId = this.stack.seriesId measureData.seriesId = this.stack.seriesId
measureData.instanceId = instanceId measureData.instanceId = instanceId
measureData.frame = this.stack.frame ? this.stack.frame : 0 measureData.frame = this.stack.frame
measureData.data = e.detail.measurementData measureData.data = e.detail.measurementData
measureData.type = e.detail.toolName measureData.type = e.detail.toolName
measureData.thick = this.dicomInfo.thick measureData.thick = this.dicomInfo.thick
@ -1455,7 +1454,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
var uuid = measurementData.uuid var uuid = measurementData.uuid
var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid) var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

4
src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
View File

@ -1582,7 +1582,9 @@ export default {
var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId) var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
if (seriesIdx > -1) { if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx] var series = studyList[studyIdx].SeriesList[seriesIdx]
var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId)) let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) { if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx series.imageIdIndex = instanceIdx
seriesInfo = series seriesInfo = series

5
src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
View File

@ -464,7 +464,10 @@ export default {
var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId) var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
if (seriesIdx > -1) { if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx] var series = studyList[studyIdx].SeriesList[seriesIdx]
var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId)) // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) { if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx series.imageIdIndex = instanceIdx
// series.studyIndex = studyIdx // series.studyIndex = studyIdx

12
src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
View File

@ -440,9 +440,10 @@ export default {
const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId) const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
const seriesList = studyList[sdIndx].SeriesList const seriesList = studyList[sdIndx].SeriesList
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId) const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
// const instanceList = seriesList[srIdx].imageIds // const instanceList = seriesList[srIdx].instanceList
const instanceList = seriesList[srIdx].instanceList const imageIds = seriesList[srIdx].imageIds
const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId)) let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx] const series = seriesList[srIdx]
series.imageIdIndex = isIdx series.imageIdIndex = isIdx
@ -513,8 +514,9 @@ export default {
const seriesList = studyList[sdIndx].SeriesList const seriesList = studyList[sdIndx].SeriesList
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId) const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
// const instanceList = seriesList[srIdx].imageIds // const instanceList = seriesList[srIdx].imageIds
const instanceList = seriesList[srIdx].instanceList const imageIds = seriesList[srIdx].imageIds
const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId)) let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx] const series = seriesList[srIdx]
series.imageIdIndex = isIdx series.imageIdIndex = isIdx

20
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
View File

@ -221,7 +221,8 @@ export default {
taskBlindName: '', taskBlindName: '',
frame: null, frame: null,
imageRendered: false, imageRendered: false,
isExistsClinicalData: false isExistsClinicalData: false,
isExistMutiFrames: false
// preventCache: true // preventCache: true
}, },
dicomInfo: { dicomInfo: {
@ -743,7 +744,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (var m = 0; m < this.measuredTools.length; m++) { for (var m = 0; m < this.measuredTools.length; m++) {
var toolType = this.measuredTools[m] var toolType = this.measuredTools[m]
@ -865,7 +866,6 @@ export default {
return seriesList[seriesIdx].loadStatus ? 1 : 0 return seriesList[seriesIdx].loadStatus ? 1 : 0
}, },
renderMeasuredData(e) { renderMeasuredData(e) {
this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId) var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
if (idx === -1) return if (idx === -1) return
this.measureData = this.visitTaskList[idx].MeasureData this.measureData = this.visitTaskList[idx].MeasureData
@ -886,7 +886,7 @@ export default {
} }
// console.log('renderMeasuredData', this.stack.frame) // console.log('renderMeasuredData', this.stack.frame)
if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) { if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type) const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
if (toolState && toolState.data.length > 0) { if (toolState && toolState.data.length > 0) {
var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid) var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@ -973,7 +973,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (let t = 0; t < this.measuredTools.length; t++) { for (let t = 0; t < this.measuredTools.length; t++) {
var toolType = this.measuredTools[t] var toolType = this.measuredTools[t]
@ -1062,7 +1062,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
ToolStateManager.clearImageIdToolState(dicomSeries.imageIds) ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@ -1176,7 +1176,7 @@ export default {
const imageInfo = this.getInstanceInfo(image.imageId) const imageInfo = this.getInstanceInfo(image.imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
this.resetWwwc() this.resetWwwc()
@ -1251,7 +1251,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (this.imageId !== instanceId) { if (this.imageId !== instanceId) {
this.getOrientationMarker(e.detail.element) this.getOrientationMarker(e.detail.element)
// 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值 // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@ -1310,7 +1310,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') { if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
const measureData = {} const measureData = {}
measureData.studyId = this.stack.studyId measureData.studyId = this.stack.studyId
@ -1430,7 +1430,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId) const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId var instanceId = imageInfo.instanceId
var frame = imageInfo.frame var frame = imageInfo.frame
this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
var uuid = measurementData.uuid var uuid = measurementData.uuid
var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid) var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

9
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
View File

@ -1700,9 +1700,12 @@ export default {
); );
if (seriesIdx > -1) { if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx]; var series = studyList[studyIdx].SeriesList[seriesIdx];
var instanceIdx = series.instanceList.findIndex( let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
(imageId) => !!~imageId.indexOf(instanceId) let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
); var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
// var instanceIdx = series.instanceList.findIndex(
// (imageId) => !!~imageId.indexOf(instanceId)
// );
if (instanceIdx > -1) { if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx; series.imageIdIndex = instanceIdx;
seriesInfo = series; seriesInfo = series;

9
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
View File

@ -607,9 +607,12 @@ export default {
); );
if (seriesIdx > -1) { if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx]; var series = studyList[studyIdx].SeriesList[seriesIdx];
var instanceIdx = series.instanceList.findIndex( // var instanceIdx = series.instanceList.findIndex(
(imageId) => !!~imageId.indexOf(instanceId) // (imageId) => !!~imageId.indexOf(instanceId)
); // );
let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) { if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx; series.imageIdIndex = instanceIdx;
// series.studyIndex = studyIdx // series.studyIndex = studyIdx

16
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
View File

@ -415,9 +415,11 @@ export default {
const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId) const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
const seriesList = studyList[sdIndx].SeriesList const seriesList = studyList[sdIndx].SeriesList
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId) const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
// const instanceList = seriesList[srIdx].imageIds // const instanceList = seriesList[srIdx].instanceList
const instanceList = seriesList[srIdx].instanceList // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId)) const imageIds = seriesList[srIdx].imageIds
let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx] const series = seriesList[srIdx]
series.imageIdIndex = isIdx series.imageIdIndex = isIdx
@ -487,9 +489,11 @@ export default {
if (sdIndx > -1) { if (sdIndx > -1) {
const seriesList = studyList[sdIndx].SeriesList const seriesList = studyList[sdIndx].SeriesList
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId) const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
// const instanceList = seriesList[srIdx].imageIds // const instanceList = seriesList[srIdx].instanceList
const instanceList = seriesList[srIdx].instanceList // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId)) const imageIds = seriesList[srIdx].imageIds
let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx] const series = seriesList[srIdx]
series.imageIdIndex = isIdx series.imageIdIndex = isIdx