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

多帧对齐bug修复
continuous-integration/drone/push Build encountered an error
Details

Browse Source
This commit is contained in:
caiyiling
2025-02-14 14:30:55 +08:00
parent ab5645f28a
commit 0cd07b76f8
8 changed files with 102 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/dicom-show/dicom-study.vue
+1 -1
View File
@@ -53,7 +53,7 @@
<div v-if="item.isExistMutiFrames && item.instanceCount > 1">
<el-popover
v-model="item.isShowPopper"
placement="right"
placement="right-start"
trigger="manual"
popper-class="instance_frame_wrapper"
>
src/views/dicom-show/dicom-visit.vue
+2 -2
View File
@@ -60,7 +60,7 @@
<div v-if="series.isExistMutiFrames && series.instanceCount > 1">
<el-popover
v-model="series.isShowPopper"
placement="right"
placement="right-start"
trigger="manual"
popper-class="instance_frame_wrapper"
>
@@ -218,7 +218,7 @@
<div v-else>#{{ seriesItem.seriesNumber }}</div>
<div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
<el-popover
placement="right"
placement="right-start"
trigger="click"
popper-class="instance_frame_wrapper"
>
src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+12 -1
View File
@@ -1780,7 +1780,18 @@ export default {
if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx]
const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
// const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
let filterStr = ''
if (n > -1 && series.isExistMutiFrames) {
if (series.instanceInfoList[n].NumberOfFrames > 0) {
filterStr = `frame=${frame}&instanceId=${instanceId}`
} else {
filterStr = `instanceId=${instanceId}`
}
} else {
filterStr = `instanceId=${instanceId}`
}
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx
src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+12 -1
View File
@@ -496,7 +496,18 @@ export default {
var series = studyList[studyIdx].SeriesList[seriesIdx]
// var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
// const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
let filterStr = ''
if (n > -1 && series.isExistMutiFrames) {
if (series.instanceInfoList[n].NumberOfFrames > 0) {
filterStr = `frame=${frame}&instanceId=${instanceId}`
} else {
filterStr = `instanceId=${instanceId}`
}
} else {
filterStr = `instanceId=${instanceId}`
}
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx
src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+24 -2
View File
@@ -477,7 +477,18 @@ export default {
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
// const instanceList = seriesList[srIdx].instanceList
const imageIds = seriesList[srIdx].imageIds
const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
// const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k=>k.Id === measureDatas[i].InstanceId)
let filterStr = ''
if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
filterStr = `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}`
} else {
filterStr = `instanceId=${measureDatas[i].InstanceId}`
}
} else {
filterStr = `instanceId=${measureDatas[i].InstanceId}`
}
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx]
series.imageIdIndex = isIdx
@@ -550,7 +561,18 @@ export default {
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
// const instanceList = seriesList[srIdx].imageIds
const imageIds = seriesList[srIdx].imageIds
const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
// const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i=>i.Id === measureDatas[mIdx].InstanceId)
let filterStr = ''
if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
filterStr = `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}`
} else {
filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
}
} else {
filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
}
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx]
series.imageIdIndex = isIdx
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+14 -3
View File
@@ -1736,9 +1736,20 @@ export default {
var series = studyList[studyIdx].SeriesList[seriesIdx]
let frame =
this.visitTaskList[index].MeasureData[idx].MeasureData.frame
let filterStr = series.isExistMutiFrames
? `frame=${frame}&instanceId=${instanceId}`
: `instanceId=${instanceId}`
// let filterStr = series.isExistMutiFrames
// ? `frame=${frame}&instanceId=${instanceId}`
// : `instanceId=${instanceId}`
let filterStr = ''
let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
if (n > -1 && series.isExistMutiFrames) {
if (series.instanceInfoList[n].NumberOfFrames > 0) {
filterStr = `frame=${frame}&instanceId=${instanceId}`
} else {
filterStr = `instanceId=${instanceId}`
}
} else {
filterStr = `instanceId=${instanceId}`
}
var instanceIdx = series.imageIds.findIndex((imageId) =>
imageId.includes(filterStr)
)
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
+12 -1
View File
@@ -635,7 +635,18 @@ export default {
// (imageId) => !!~imageId.indexOf(instanceId)
// );
let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
// let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
let filterStr = ''
if (n > -1 && series.isExistMutiFrames) {
if (series.instanceInfoList[n].NumberOfFrames > 0) {
filterStr = `frame=${frame}&instanceId=${instanceId}`
} else {
filterStr = `instanceId=${instanceId}`
}
} else {
filterStr = `instanceId=${instanceId}`
}
var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx;
src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+25 -3
View File
@@ -451,7 +451,18 @@ export default {
// const instanceList = seriesList[srIdx].instanceList
// 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}`
// let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(k=>k.Id === measureDatas[i].InstanceId)
let filterStr = ''
if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
filterStr = `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}`
} else {
filterStr = `instanceId=${measureDatas[i].InstanceId}`
}
} else {
filterStr = `instanceId=${measureDatas[i].InstanceId}`
}
const isIdx = imageIds.findIndex(is => is.includes(filterStr))
const series = seriesList[srIdx]
series.imageIdIndex = isIdx
@@ -523,9 +534,20 @@ export default {
const seriesList = studyList[sdIndx].SeriesList
const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
// 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}`
let instanceIndex = seriesList[srIdx].instanceInfoList.findIndex(i=>i.Id === measureDatas[mIdx].InstanceId)
let filterStr = ''
if (instanceIndex > -1 && seriesList[srIdx].isExistMutiFrames) {
if (seriesList[srIdx].instanceInfoList[instanceIndex].NumberOfFrames > 0) {
filterStr = `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}`
} else {
filterStr = `instanceId=${measureDatas[mIdx].InstanceId}`
}
} else {
filterStr = `instanceId=${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]
series.imageIdIndex = isIdx