diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index 3d5e691..2b79dbb 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -356,7 +356,7 @@ export default { if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) { this.measureData = this.visitTaskList[idx].MeasureData this.studyList = this.visitTaskList[idx].StudyList - var sIdx = this.studyList.findIndex(s => s.IsDicom) + var sIdx = this.studyList.findIndex(s => s.IsDicom && !s.IsCriticalSequence) if (sIdx > -1) { // this.studyIndex = sIdx // c = 0 @@ -459,7 +459,7 @@ export default { this.activeNames = [`${this.studyList[secondObj.studyIndex].StudyId}`] } else { - const sIdx = this.studyList.findIndex(s => s.IsDicom) + const sIdx = this.studyList.findIndex(s => s.IsDicom && !i.IsCriticalSequence) const series = this.studyList[sIdx].SeriesList[0] const imageIdIndex = Math.floor(series.imageIds.length / 2) series.imageIdIndex = imageIdIndex > 0 ? imageIdIndex - 1 : 0 @@ -475,7 +475,7 @@ export default { }, getSecondMarkedSeries(baseObj, visitTaskInfo) { var obj = {} - var studyList = visitTaskInfo.StudyList + var studyList = visitTaskInfo.StudyList.filter(item => !item.IsCriticalSequence) var measureDatas = visitTaskInfo.MeasureData if (baseObj.isMarked) { var i = measureDatas.findIndex(i => Object.keys(i.MeasureData).length > 0 && i.OrderMarkName === baseObj.measureData.OrderMarkName) @@ -552,7 +552,7 @@ export default { var mIdx = measureDatas.findIndex(m => Object.keys(m.MeasureData).length > 0) if (mIdx !== -1) { // 有标记时,显示带标记影像所在序列 - const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[mIdx].StudyId && sd.IsDicom) + const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[mIdx].StudyId && sd.IsDicom && !s.IsCriticalSequence) if (sdIndx > -1) { const seriesList = studyList[sdIndx].SeriesList const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)