From 4ad299e24356ea4ddf4ec11efd9c8a588d1988e0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 28 Apr 2025 15:47:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?suv=E8=9E=8D=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms3D/components/PetCtReadPage.vue     | 1041 +++++++++++------
 .../dicoms3D/components/PetCtViewport.vue     |    7 +-
 .../dicoms3D/components/VisitReview.vue       |    2 +-
 .../reading-unit/components/ReadingRules.vue  |    2 +-
 4 files changed, 657 insertions(+), 395 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
index 32251ed3..fa3ccd90 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
@@ -6,7 +6,8 @@
                 <div class="task-info">
                     <div v-for="(s, index) in visitTaskList" :key="s.VisitTaskId" class="task-item"
                         :class="{ 'task-item-active': activeTaskId == s.VisitTaskId }"
-                        @click.prevent="toggleTask(s, index)">{{ s.TaskBlindName }}</div>
+                        @click.prevent="toggleTask(s, index)">{{
+                            s.TaskBlindName }}</div>
                 </div>
             </div>
             <div v-loading="sLoading" class="study-info">
@@ -152,6 +153,12 @@
                         <div class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="handleFusion">
                             <svg-icon icon-class="fusion" class="svg-icon" />
                         </div>
+                        <!-- 清除标注 -->
+                        <div v-if="criterionType === 0"
+                            :class="['tool-item', activeTool === 'Eraser' ? 'tool-item-active' : '']"
+                            :title="$t('trials:dicom-show:Eraser')" @click.prevent="setToolActive('Eraser')">
+                            <svg-icon icon-class="clear" class="svg-icon" />
+                        </div>
                         <div v-for="tool in tools" :key="tool.toolName"
                             :class="['tool-item', cellType[activeViewportIndex] === 'MIP' ? 'tool-disabled' : '', activeTool === tool.toolName ? 'tool-item-active' : '']"
                             :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }"
@@ -206,9 +213,28 @@
                             @click.prevent="resetViewport">
                             <svg-icon icon-class="refresh" class="svg-icon" />
                         </div>
+                        <!-- 更多 -->
+                        <div v-if="criterionType === 0" class="tool-item" :title="$t('trials:reading:button:more')"
+                            @click.stop="showPanel($event)" @mouseleave="toolMouseout">
+                            <div class="dropdown">
+                                <div class="icon" data-tool="more">
+                                    <svg-icon icon-class="more" class="svg-icon" />
+                                    <i class="el-icon-arrow-down" style="color:#fff;" />
+                                </div>
+                                <div class="dropdown-content">
+                                    <ul style="width:100px;">
+                                        <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
+                                            <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
+                                                {{ $t(i.i18nKey) }}
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
                         <!-- 伪彩 -->
                         <div class="item" effect="dark" :title="$t('trials:lugano:button:colormap')"
-                            style="flex: 1 0 0%;" v-show="cellType.includes('FUSION')">
+                            v-show="cellType.includes('FUSION')">
                             <div class="colorBar"
                                 style="display:flex;justify-content: flex-start;align-items: center;position: relative;"
                                 @mouseleave="isSlideMoving = false">
@@ -453,8 +479,9 @@
     </div>
 </template>
 <script>
-import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList } from '@/api/trials'
+import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
+import { getCustomTag, submitCustomTag } from '@/api/reading'
 import {
     RenderingEngine,
     Enums,
@@ -471,7 +498,7 @@ import {
 import * as cornerstoneTools from '@cornerstonejs/tools'
 import initLibraries from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initLibraries'
 import html2canvas from 'html2canvas'
-import { getTools, getCustomizeStandardsTools } from './toolConfig'
+import { getTools, getCustomizeStandardsTools, config } from './toolConfig'
 import StudyList from './StudyList'
 import PetCtViewport from './PetCtViewport'
 import customizeQuestionList from './customize/QuestionList'
@@ -630,7 +657,8 @@ export default {
             range: 40,
             upper: 6,
             isSlideMoving: false,
-            cellType: []
+            cellType: [],
+            customizeStandards: []
         }
     },
     computed: {
@@ -690,6 +718,7 @@ export default {
         this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
         if (this.criterionType === 0) {
             this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
+            this.customizeStandards = [...config.customizeStandards]
         } else {
             this.tools = getTools(this.criterionType)
         }
@@ -815,10 +844,15 @@ export default {
         },
         async setColorMap(rgbPresetName) {
             this.rgbPresetName = rgbPresetName
-            this.$refs[`viewport-${2}`][0].setPreset(this.rgbPresetName)
-            this.$refs[`viewport-${2}`][0].renderColorBar(this.rgbPresetName)
             this.createColorBar(this.rgbPresetName, 'colorBarCanvas', 256, 15)
-            this.$refs[`viewport-${2}`][0].setColorMap(rgbPresetName)
+            this.cellType.forEach((item, index) => {
+                if (item === 'FUSION') {
+                    this.$refs[`viewport-${index}`][0].setPreset(this.rgbPresetName)
+                    this.$refs[`viewport-${index}`][0].renderColorBar(this.rgbPresetName)
+                    this.$refs[`viewport-${index}`][0].setColorMap(rgbPresetName)
+                }
+            })
+
         },
         showColorBarPanel(e) {
             e.currentTarget.firstChild.firstChild.lastChild.style.display = 'block'
@@ -902,10 +936,6 @@ export default {
             }
         },
         handleFusion() {
-            // if (this.imageQualityIssues && parseInt(this.imageQualityIssues) === 6) {
-            //     this.$alert(this.$t('trials:lugano:message:fusionWarn'))
-            //     return
-            // }
             const i = this.activeTaskIndex
             if (i < 0) return
             if (this.studyList.length > 0) {
@@ -924,204 +954,6 @@ export default {
             this.fusionForm.isCurrentTask = this.visitTaskList[i].IsCurrentTask
             this.fusionSeries.visible = true
         },
-        // 加载当前任务关联的任务信息
-        async loadRelatedTasks() {
-            this.loading = true
-            try {
-                const params = {
-                    visitTaskId: this.taskInfo.VisitTaskId
-                }
-                const res = await getRelatedVisitTask(params)
-                let currentTaskIndex = 0
-                let currentTaskId = ''
-                this.visitTaskList = []
-                for (let i = 0; i < res.Result.length; i++) {
-                    const item = res.Result[i]
-                    let studyList = []
-                    let annotations = []
-                    let annotationUIDs = []
-                    let keyImages = []
-                    let isInit = false
-                    if (item.IsCurrentTask) {
-                        currentTaskIndex = i
-                        currentTaskId = item.VisitTaskId
-                    }
-                    if (item.IsCurrentTask || (this.taskInfo.IsReadingTaskViewInOrder === 1 && !this.taskInfo.IsBaseLineTask && item.IsBaseLineTask)) {
-                        const res = await this.loadTaskDetails(item, i)
-                        isInit = true
-                        studyList = res ? res.studyList : []
-                        annotations = res ? res.annotations : []
-                        annotationUIDs = res ? res.annotationUIDs : []
-                        keyImages = res ? res.keyImages : []
-                        if (!this.selectArr.includes(item.VisitTaskId)) {
-                            this.selectArr.push(item.VisitTaskId)
-                        }
-                        if (item.IsCurrentTask) {
-                            this.markedSeriesIds = []
-                            annotations.map(i => {
-                                if (i.MeasureData && i.MeasureData.seriesId) {
-                                    this.markedSeriesIds.push(i.MeasureData.seriesId)
-                                }
-                            })
-                        }
-                    }
-
-                    this.visitTaskList.push({
-                        ...item,
-                        StudyList: studyList,
-                        Annotations: annotations,
-                        KeyImages: keyImages,
-                        AnnotationUIDs: annotationUIDs,
-                        IsInit: isInit
-                    })
-                }
-                this.activeTaskId = currentTaskId
-                this.activeTaskIndex = currentTaskIndex
-                this.$nextTick(() => {
-                    this.setInitSeries()
-                })
-
-                this.loading = false
-            } catch (e) {
-                console.log(e)
-                this.loading = false
-            }
-        },
-        // 加载检查及标注信息
-        async loadTaskDetails(taskInfo, taskIndex) {
-            try {
-                const sujectVisitId = taskInfo.VisitId
-                const taskId = taskInfo.VisitTaskId
-                // 获取检查信息
-                const keyImages = []
-                const res1 = await getReadingVisitStudyList(this.trialId, sujectVisitId, taskId)
-                let keyStudyIndex = -1
-                let keySeriesIndex = -1
-                // const arr = [res1.Result[0]]
-                const arr = res1.Result
-                arr.forEach((study, studyIndex) => {
-                    study.SeriesList.forEach((series, seriesIndex) => {
-                        const imageIds = []
-                        const stack = []
-                        series.InstanceInfoList.forEach((instance, instanceIndex) => {
-                            if (study.IsCriticalSequence) {
-                                keyStudyIndex = studyIndex
-                                keySeriesIndex = seriesIndex
-                                keyImages.push({ Id: instance.Id, Path: instance.Path, KeyFramesList: instance.KeyFramesList, KeyStudyIndex: studyIndex, KeySeriesIndex: seriesIndex })
-                            } else {
-                                const i = keyImages.findIndex(k => k.Id === instance.Id)
-                                if (i > -1) {
-                                    keyImages[i].StudyIndex = studyIndex
-                                    keyImages[i].SeriesIndex = seriesIndex
-                                }
-                                const nFrames = instance.NumberOfFrames || 0
-                                if (nFrames === 0) {
-                                    // 单帧
-                                    stack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${taskId}`)
-                                } else {
-                                    // 多帧
-                                    for (let i = 0; i < nFrames; i++) {
-                                        const newImageId = `wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${taskId}&frame=${i + 1}`
-                                        stack.push(newImageId)
-                                    }
-                                }
-                                imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${taskId}`)
-                                this.instanceInfo[instance.Id] = { taskIndex, studyIndex, seriesIndex }
-                            }
-                        })
-                        series.Stack = stack
-                        series.ImageIds = imageIds
-                        series.SliceIndex = 0
-                        series.LoadedImageCount = 0
-                        series.LoadedImageProgress = 0
-                        series.TaskInfo = Object.assign({}, taskInfo)
-                        series.StudyIndex = studyIndex
-                        series.SeriesIndex = seriesIndex
-                    })
-                })
-                if (keyStudyIndex > -1 && keySeriesIndex > -1 && keyImages.length > 0) {
-                    const keyImageIds = []
-                    keyImages.forEach(instance => {
-                        if (instance.KeyFramesList.length > 0) {
-                            instance.KeyFramesList.map(i => {
-                                keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${taskId}&frame=${i}`)
-                            })
-                        } else {
-                            keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${taskId}`)
-                        }
-                    })
-                    res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].ImageIds = keyImageIds
-                }
-                // 获取标注信息
-                const res2 = await getTableAnswerRowInfoList(taskId)
-                const annotationUIDs = []
-                const annotations = res2.Result.map(i => {
-                    if (typeof i.MeasureData === 'string' && i.MeasureData) {
-                        i.MeasureData = JSON.parse(i.MeasureData)
-                        annotationUIDs.push(i.MeasureData.annotationUID)
-                    }
-                    return i
-                })
-                return { studyList: arr, annotations: annotations, annotationUIDs, keyImages }
-            } catch (e) {
-                console.log(e)
-            }
-        },
-        // 设置初始化序列信息
-        setInitSeries() {
-            const seriesArr = []
-            let activeStudyIndex = -1
-            let activeSeriesIndex = -1
-            const studyList = this.visitTaskList[this.activeTaskIndex].StudyList.filter(i => i.IsDicom)
-            const seriesList = studyList.map(s => s.SeriesList).flat()
-            if (this.taskInfo.IsReadingTaskViewInOrder === 0) {
-                // 完全随机（默认一个视口，展示第一个序列）
-                const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
-                seriesArr.push(series)
-                activeStudyIndex = series.StudyIndex
-                activeSeriesIndex = series.SeriesIndex
-            } else if (this.taskInfo.IsReadingTaskViewInOrder === 1) {
-                // 按时间顺序（默认基线时显示一个视口，展示第一个序列；随访时显示基线和当前随访的序列）
-                if (this.taskInfo.IsBaseLine) {
-                    // 基线默认显示第一个序列
-                    const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
-                    seriesArr.push(series)
-                    activeStudyIndex = series.StudyIndex
-                    activeSeriesIndex = series.SeriesIndex
-                } else {
-                    // 随访
-                    const i = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
-                    const baseSeries = this.getRelatedSeries(this.visitTaskList[i])
-                    seriesArr.push(baseSeries)
-                    const followUpSeries = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex], baseSeries)
-                    seriesArr.push(followUpSeries)
-                    activeStudyIndex = followUpSeries.StudyIndex
-                    activeSeriesIndex = followUpSeries.SeriesIndex
-                }
-            } else if (this.taskInfo.IsReadingTaskViewInOrder === 2) {
-                // 受试者内随机（默认两个视口，显示第一个序列和第二个序列；如果只有一个序列则两个视口均显示这个序列）
-                if (seriesList.length === 1) {
-                    seriesArr.push(seriesList[0], seriesList[0])
-                    activeStudyIndex = seriesList[0].StudyIndex
-                    activeSeriesIndex = seriesList[0].SeriesIndex
-                } else if (seriesArr.length > 1) {
-                    seriesArr.push(seriesList[0], seriesList[1])
-                    activeStudyIndex = seriesList[1].StudyIndex
-                    activeSeriesIndex = seriesList[1].SeriesIndex
-                }
-            }
-
-            if (activeStudyIndex > -1 && activeSeriesIndex > -1) {
-                seriesArr.map((i, index) => {
-                    this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
-                })
-                const visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
-                this.lastViewportTaskId = visitTaskId
-                this.currentVisitInfo = this.visitTaskList[this.activeTaskIndex]
-                this.$refs[visitTaskId][0].setSeriesActive(activeStudyIndex, activeSeriesIndex)
-                this.getStudyList(this.currentVisitInfo)
-            }
-        },
         getStudyList(obj) {
             if (obj) {
                 var studyList = obj.StudyList || []
@@ -1206,9 +1038,7 @@ export default {
                     ],
                 });
                 toolGroup.addTool(MIPJumpToClickTool.toolName, {
-                    targetViewportIds: [
-                        'viewport-0', 'viewport-1', 'viewport-2', 'viewport-3'
-                    ],
+                    targetViewportIds: viewportIds,
                 });
 
                 // Set the initial state of the tools, here we set one tool active on left click.
@@ -1221,27 +1051,15 @@ export default {
                     ],
                 });
 
-                if (this.criterionType === 0) {
-                    toolGroup.addTool(ArrowAnnotateTool.toolName, {
-                        arrowHeadStyle: 'standard',
-                        changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
-                            return doneChangingTextCallback(await this.customPrompt())
-                        },
-                        getTextCallback: async (doneChangingTextCallback) => {
-                            return doneChangingTextCallback(await this.customPrompt())
-                        }
-                    })
-                } else {
-                    toolGroup.addTool(ArrowAnnotateTool.toolName, {
-                        arrowHeadStyle: 'standard',
-                        changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
-                            return doneChangingTextCallback(data.text)
-                        },
-                        getTextCallback: async (doneChangingTextCallback) => {
-                            return doneChangingTextCallback('_')
-                        }
-                    })
-                }
+                toolGroup.addTool(ArrowAnnotateTool.toolName, {
+                    arrowHeadStyle: 'standard',
+                    changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
+                        return doneChangingTextCallback(data.text)
+                    },
+                    getTextCallback: async (doneChangingTextCallback) => {
+                        return doneChangingTextCallback('_')
+                    }
+                })
                 toolGroup.addTool(RectangleROITool.toolName, {
                     cachedStats: false,
                     getTextLines: this.getRectangleROIToolTextLines
@@ -1291,6 +1109,324 @@ export default {
             eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
             console.log(Events)
         },
+        // 更改视图布局
+        async changeLayout(v) {
+            this.setToolsPassive()
+            this.fullScreenIndex = null
+            this.layout = v
+            const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+            const ctSeries = this.$refs[`viewport-${this.activeViewportIndex}`][0].ctSeries
+            const petSeries = this.$refs[`viewport-${this.activeViewportIndex}`][0].petSeries
+            this.cellType = []
+            for (let i = 0; i < this.layout; i++) {
+                this.cellType.push(series.cellType)
+            }
+            let seriesArr = []
+            if (v === 1) {
+                this.rows = 1
+                this.cols = 1
+                this.activeViewportIndex = 0
+                if (typeof series === 'object') {
+                    seriesArr.push(series)
+                }
+            } else if (v === 2) {
+                this.rows = 1
+                this.cols = 2
+                this.activeViewportIndex = 1
+                if (typeof series === 'object') {
+                    seriesArr.push(series)
+                    seriesArr.push(series)
+                }
+            } else if (v === 3) {
+                this.rows = 1
+                this.cols = 2
+                if (series) {
+                    const idx = this.visitTaskList.findIndex(i => i.VisitTaskId === series.TaskInfo.VisitTaskId)
+                    const visitTaskNum = idx > -1 ? this.visitTaskList[idx].VisitTaskNum : -1
+                    if (visitTaskNum > 0) {
+                        let visitTaskIdx = -1
+                        if (this.criterionType === 10) {
+                            visitTaskIdx = this.visitTaskList.findIndex(i => i.VisitTaskNum === visitTaskNum - 1)
+                        } else {
+                            visitTaskIdx = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
+                        }
+                        if (visitTaskIdx > -1) {
+                            if (!this.visitTaskList[visitTaskIdx].IsInit) {
+                                this.sLoading = true
+                                try {
+                                    const res = await this.loadTaskDetails(this.visitTaskList[visitTaskIdx], visitTaskIdx)
+                                    const studyList = res ? res.studyList : []
+                                    const annotations = res ? res.annotations : []
+                                    const keyImages = res ? res.keyImages : []
+                                    const annotationUIDs = res ? res.annotationUIDs : []
+                                    this.$set(this.visitTaskList[visitTaskIdx], 'StudyList', studyList)
+                                    this.$set(this.visitTaskList[visitTaskIdx], 'Annotations', annotations)
+                                    this.$set(this.visitTaskList[visitTaskIdx], 'KeyImages', keyImages)
+                                    this.$set(this.visitTaskList[visitTaskIdx], 'AnnotationUIDs', annotationUIDs)
+                                    this.$set(this.visitTaskList[visitTaskIdx], 'IsInit', true)
+                                    this.sLoading = false
+                                } catch (e) {
+                                    this.sLoading = false
+                                }
+                            }
+                            const relatedSeries = this.getRelatedSeries(this.visitTaskList[visitTaskIdx], series)
+                            seriesArr.push(relatedSeries)
+                            seriesArr.push(series)
+                        }
+                    } else if (visitTaskNum === 0) {
+                        seriesArr.push(series)
+                        seriesArr.push(series)
+                    }
+                }
+                this.activeViewportIndex = 1
+            } else if (v === 4) {
+                this.rows = 2
+                this.cols = 2
+                if (typeof series === 'object') {
+                    seriesArr.push(series)
+                    seriesArr.push(series)
+                    seriesArr.push(series)
+                    seriesArr.push(series)
+                }
+                this.activeViewportIndex = 3
+            }
+            if (series.cellType === 'FUSION') {
+                let length = seriesArr.length
+                seriesArr = []
+                for (let i = 0; i < length; i++) {
+                    seriesArr.push({ ct: ctSeries, pet: petSeries })
+                }
+            }
+            seriesArr.map((i, index) => {
+                if (series.cellType === 'FUSION') {
+                    this.$refs[`viewport-${index}`][0].setSeriesInfo(i, false, { isFusion: true })
+                    this.$refs[`viewport-${index}`][0].setPreset(this.rgbPresetName)
+
+                } else if (series.cellType === 'MIP') {
+                    this.$refs[`viewport-${index}`][0].setSeriesInfo(i, false, { isMip: true })
+                } else {
+                    this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
+                }
+
+            })
+            this.$nextTick(() => {
+                const renderingEngine = getRenderingEngine(renderingEngineId)
+                renderingEngine.resize(true, false)
+            })
+        },
+
+        // 加载当前任务关联的任务信息
+        async loadRelatedTasks() {
+            this.loading = true
+            try {
+                const params = {
+                    visitTaskId: this.taskInfo.VisitTaskId
+                }
+                const res = await getRelatedVisitTask(params)
+                let currentTaskIndex = 0
+                let currentTaskId = ''
+                this.visitTaskList = []
+                for (let i = 0; i < res.Result.length; i++) {
+                    const item = res.Result[i]
+                    let studyList = []
+                    let annotations = []
+                    let annotationUIDs = []
+                    let keyImages = []
+                    let isInit = false
+                    if (item.IsCurrentTask) {
+                        currentTaskIndex = i
+                        currentTaskId = item.VisitTaskId
+                    }
+                    if (item.IsCurrentTask || (this.taskInfo.IsReadingTaskViewInOrder === 1 && !this.taskInfo.IsBaseLineTask && item.IsBaseLineTask)) {
+                        const res = await this.loadTaskDetails(item, i)
+                        isInit = true
+                        studyList = res ? res.studyList : []
+                        annotations = res ? res.annotations : []
+                        annotationUIDs = res ? res.annotationUIDs : []
+                        keyImages = res ? res.keyImages : []
+                        if (!this.selectArr.includes(item.VisitTaskId)) {
+                            this.selectArr.push(item.VisitTaskId)
+                        }
+                        if (item.IsCurrentTask) {
+                            this.markedSeriesIds = []
+                            annotations.map(i => {
+                                if (i.MeasureData && i.MeasureData.seriesId) {
+                                    this.markedSeriesIds.push(i.MeasureData.seriesId)
+                                }
+                            })
+                        }
+                    }
+
+                    this.visitTaskList.push({
+                        ...item,
+                        StudyList: studyList,
+                        Annotations: annotations,
+                        KeyImages: keyImages,
+                        AnnotationUIDs: annotationUIDs,
+                        IsInit: isInit
+                    })
+                }
+                this.activeTaskId = currentTaskId
+                this.activeTaskIndex = currentTaskIndex
+                this.$nextTick(() => {
+                    this.setInitSeries()
+                })
+
+                this.loading = false
+            } catch (e) {
+                console.log(e)
+                this.loading = false
+            }
+        },
+        // 加载检查及标注信息
+        async loadTaskDetails(taskInfo, taskIndex) {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    const sujectVisitId = taskInfo.VisitId
+                    const taskId = taskInfo.VisitTaskId
+                    // 获取检查信息
+                    const keyImages = []
+                    const res1 = await getReadingVisitStudyList(this.trialId, sujectVisitId, taskId)
+                    let keyStudyIndex = -1
+                    let keySeriesIndex = -1
+                    const arr = res1.Result
+                    arr.forEach((study, studyIndex) => {
+                        study.SeriesList.forEach((series, seriesIndex) => {
+                            const imageIds = []
+                            const stack = []
+                            series.InstanceInfoList.forEach((instance, instanceIndex) => {
+                                if (study.IsCriticalSequence) {
+                                    keyStudyIndex = studyIndex
+                                    keySeriesIndex = seriesIndex
+                                    keyImages.push({ Id: instance.Id, Path: instance.Path, KeyFramesList: instance.KeyFramesList, KeyStudyIndex: studyIndex, KeySeriesIndex: seriesIndex })
+                                } else {
+                                    const i = keyImages.findIndex(k => k.Id === instance.Id)
+                                    if (i > -1) {
+                                        keyImages[i].StudyIndex = studyIndex
+                                        keyImages[i].SeriesIndex = seriesIndex
+                                    }
+                                    const nFrames = instance.NumberOfFrames || 0
+                                    if (nFrames === 0) {
+                                        // 单帧
+                                        stack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`)
+                                    } else {
+                                        // 多帧
+                                        for (let i = 0; i < nFrames; i++) {
+                                            const newImageId = `wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}&frame=${i + 1}`
+                                            stack.push(newImageId)
+                                        }
+                                    }
+                                    imageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`)
+                                    this.instanceInfo[instance.Id] = { taskIndex, studyIndex, seriesIndex }
+                                }
+                            })
+                            series.Stack = stack
+                            series.ImageIds = imageIds
+                            series.SliceIndex = 0
+                            series.LoadedImageCount = 0
+                            series.LoadedImageProgress = 0
+                            series.TaskInfo = Object.assign({}, taskInfo)
+                            series.StudyIndex = studyIndex
+                            series.SeriesIndex = seriesIndex
+                        })
+                    })
+                    if (keyStudyIndex > -1 && keySeriesIndex > -1 && keyImages.length > 0) {
+                        const keyImageIds = []
+                        const keyStack = []
+                        keyImages.forEach(instance => {
+                            if (instance.KeyFramesList.length > 0) {
+                                instance.KeyFramesList.map(i => {
+                                    keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}&frame=${i}`)
+                                })
+                            } else {
+                                keyStack.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`)
+                            }
+                            keyImageIds.push(`wadouri:${this.OSSclientConfig.basePath}${instance.Path}?visitTaskId=${taskId}&instanceId=${instance.Id}`)
+                        })
+                        res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].ImageIds = keyImageIds
+                        res1.Result[keyStudyIndex].SeriesList[keySeriesIndex].Stack = keyStack
+                    }
+                    // 获取标注信息
+                    let res2 = null
+                    if (this.criterionType === 0) {
+                        res2 = await getCustomTag({ visitTaskId: taskId })
+                    } else {
+                        res2 = await getTableAnswerRowInfoList(taskId)
+                    }
+                    const annotationUIDs = []
+                    const annotations = res2.Result.map(i => {
+                        if (typeof i.MeasureData === 'string' && i.MeasureData) {
+                            i.MeasureData = JSON.parse(i.MeasureData)
+                            if (this.criterionType === 0) {
+                                i.MeasureData.id = i.Id
+                            }
+                            annotationUIDs.push(i.MeasureData.annotationUID)
+                        }
+                        return i
+                    })
+                    // return { studyList: arr, annotations: annotations, annotationUIDs, keyImages }
+                    resolve({ studyList: arr, annotations: annotations, annotationUIDs, keyImages })
+                } catch (e) {
+                    console.log(e)
+                    reject(e)
+                }
+            })
+        },
+        // 设置初始化序列信息
+        setInitSeries() {
+            const seriesArr = []
+            let activeStudyIndex = -1
+            let activeSeriesIndex = -1
+            const studyList = this.visitTaskList[this.activeTaskIndex].StudyList.filter(i => i.IsDicom)
+            const seriesList = studyList.map(s => s.SeriesList).flat()
+            if (this.taskInfo.IsReadingTaskViewInOrder === 0) {
+                // 完全随机（默认一个视口，展示第一个序列）
+                const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
+                seriesArr.push(series)
+                activeStudyIndex = series.StudyIndex
+                activeSeriesIndex = series.SeriesIndex
+            } else if (this.taskInfo.IsReadingTaskViewInOrder === 1) {
+                // 按时间顺序（默认基线时显示一个视口，展示第一个序列；随访时显示基线和当前随访的序列）
+                if (this.taskInfo.IsBaseLine) {
+                    // 基线默认显示第一个序列
+                    const series = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex])
+                    seriesArr.push(series)
+                    activeStudyIndex = series.StudyIndex
+                    activeSeriesIndex = series.SeriesIndex
+                } else {
+                    // 随访
+                    const i = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
+                    const baseSeries = this.getRelatedSeries(this.visitTaskList[i])
+                    seriesArr.push(baseSeries)
+                    const followUpSeries = this.getRelatedSeries(this.visitTaskList[this.activeTaskIndex], baseSeries)
+                    seriesArr.push(followUpSeries)
+                    activeStudyIndex = followUpSeries.StudyIndex
+                    activeSeriesIndex = followUpSeries.SeriesIndex
+                }
+            } else if (this.taskInfo.IsReadingTaskViewInOrder === 2) {
+                // 受试者内随机（默认两个视口，显示第一个序列和第二个序列；如果只有一个序列则两个视口均显示这个序列）
+                if (seriesList.length === 1) {
+                    seriesArr.push(seriesList[0], seriesList[0])
+                    activeStudyIndex = seriesList[0].StudyIndex
+                    activeSeriesIndex = seriesList[0].SeriesIndex
+                } else if (seriesArr.length > 1) {
+                    seriesArr.push(seriesList[0], seriesList[1])
+                    activeStudyIndex = seriesList[1].StudyIndex
+                    activeSeriesIndex = seriesList[1].SeriesIndex
+                }
+            }
+
+            if (activeStudyIndex > -1 && activeSeriesIndex > -1) {
+                seriesArr.map((i, index) => {
+                    this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
+                })
+                const visitTaskId = this.visitTaskList[this.activeTaskIndex].VisitTaskId
+                this.lastViewportTaskId = visitTaskId
+                this.currentVisitInfo = this.visitTaskList[this.activeTaskIndex]
+                this.$refs[visitTaskId][0].setSeriesActive(activeStudyIndex, activeSeriesIndex)
+                this.getStudyList(this.currentVisitInfo)
+            }
+        },
         // 影像下载进度回调
         imageLoadProgress(e) {
             const { detail } = e
@@ -1334,23 +1470,23 @@ export default {
             this.$set(series, 'LoadedImageProgress', newLoadedImageProgress)
         },
         addHistoryAnnotations(taskId) {
-            if (this.renderedTaskIds.includes(taskId)) return
-            this.renderedTaskIds.push(taskId)
-            let taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === taskId)
-            if (taskIdx === -1) return
-            const annotations = this.visitTaskList[taskIdx].Annotations
-            annotations.map(i => {
-                if (i.MeasureData) {
-                    const annotation = i.MeasureData
-                    cornerstoneTools.annotation.state.addAnnotation(annotation)
-                    if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
-                        cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
-                    }
-                }
-            })
+            // if (this.renderedTaskIds.includes(taskId)) return
+            // this.renderedTaskIds.push(taskId)
+            // let taskIdx = this.visitTaskList.findIndex(i=>i.VisitTaskId === taskId)
+            // if (taskIdx=== -1) return
+            // const annotations = this.visitTaskList[taskIdx].Annotations
+            // annotations.map(i => {
+            //   if (i.MeasureData) {
+            //     const annotation = i.MeasureData
+            //     cornerstoneTools.annotation.state.addAnnotation(annotation)
+            //     if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
+            //       cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
+            //     }
+            //   }
+            // })
         },
         renderAnnotations(series) {
-            const taskId = series && series.TaskInfo ? series.TaskInfo.VisitTaskId : null
+            const taskId = series.TaskInfo?.VisitTaskId
             if (!taskId || this.renderedTaskIds.includes(taskId)) return
             this.renderedTaskIds.push(taskId)
             const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === taskId)
@@ -1368,7 +1504,7 @@ export default {
         },
         addAnnotationListeners() {
             const debouncedCallback = this.debounce((evt) => {
-                this.annotationModifiedListener(evt)
+                this.criterionType === 0 ? this.customAnnotationModifiedListener(evt) : this.annotationModifiedListener(evt)
             }, 100)
             eventTarget.addEventListener(
                 toolsEvents.ANNOTATION_MODIFIED,
@@ -1378,11 +1514,11 @@ export default {
             )
             eventTarget.addEventListener(
                 toolsEvents.ANNOTATION_COMPLETED,
-                this.annotationCompletedListener
+                this.criterionType === 0 ? this.customAnnotationCompletedListener : this.annotationCompletedListener
             )
             eventTarget.addEventListener(
                 toolsEvents.ANNOTATION_REMOVED,
-                this.annotationRemovedListener
+                this.criterionType === 0 ? this.customAnnotationRemovedListener : this.annotationRemovedListener
             )
             // eventTarget.addEventListener(
             //   toolsEvents.ANNOTATION_ADDED,
@@ -1402,6 +1538,7 @@ export default {
         annotationAddedListener(e) {
 
         },
+
         annotationCompletedListener(e) {
             console.log('Completed')
             if (this.readingTaskState === 2) return
@@ -1421,7 +1558,7 @@ export default {
                 annotation.markTool = annotation.metadata.toolName
 
                 // this.$refs['ecrf'].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
-                // this.$refs[`ecrf_${this.lastViewportTaskId}`][0].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
+                this.$refs[`ecrf_${this.lastViewportTaskId}`][0].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
                 this.markedSeriesIds.push(series.Id)
             }
 
@@ -1431,13 +1568,14 @@ export default {
             console.log('Modified')
             if (this.readingTaskState === 2) return
             const { annotation } = e.detail
+            if (!annotation.highlighted) return
             if (!annotation) return
             if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
             const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
-            // if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-            //     // this.$refs['ecrf'].modifyAnnotation({ annotation, toolName: annotation.metadata.toolName })
-            //     this.$refs[`ecrf_${this.lastViewportTaskId}`][0].modifyAnnotation({ annotation, toolName: annotation.metadata.toolName })
-            // }
+            if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+                // this.$refs['ecrf'].modifyAnnotation({ annotation, toolName: annotation.metadata.toolName })
+                this.$refs[`ecrf_${this.lastViewportTaskId}`][0].modifyAnnotation({ annotation, toolName: annotation.metadata.toolName })
+            }
             this.setToolsPassive()
         },
         annotationRemovedListener(e) {
@@ -1450,7 +1588,122 @@ export default {
                     this.markedSeriesIds.splice(index, 1)
                 }
             }
-            console.log(this.markedSeriesIds)
+        },
+        async customAnnotationCompletedListener(e) {
+            console.log(e, 'e')
+            if (this.readingTaskState === 2) return
+            const { annotation } = e.detail
+            if (!annotation) return
+            const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+            if (i === -1) {
+                this.setToolsPassive()
+                return
+            }
+            if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
+            const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+            if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+                const referencedImageId = annotation.metadata.referencedImageId
+                const params = this.getInstanceInfo(referencedImageId)
+                annotation.visitTaskId = series.TaskInfo.VisitTaskId
+                annotation.studyId = series.StudyId
+                annotation.seriesId = series.Id
+                annotation.instanceId = params.instanceId
+                annotation.sliceThickness = series.SliceThickness
+                annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? null : parseInt(params.frame)
+                annotation.markTool = annotation.metadata.toolName
+                this.markedSeriesIds.push(series.Id)
+                const markName = await this.customPrompt()
+
+                if (markName) {
+                    annotation.data.label = markName
+                    if (annotation.metadata.toolName === 'ArrowAnnotate') {
+                        annotation.data.text = markName
+                    }
+                    this.saveCustomAnnotation(annotation)
+                } else {
+                    this.removeAnnotation(annotation)
+                }
+            }
+
+            this.setToolsPassive()
+        },
+        validMarkName(markName) {
+            const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+            const i = annotations.findIndex(i => i.visitTaskId === this.taskInfo.VisitTaskId && i.data.label === markName)
+            return i > -1
+        },
+        async saveCustomAnnotation(annotation) {
+            try {
+                const measureData = Object.assign({}, annotation)
+                const params = {}
+                params.VisitTaskId = annotation.visitTaskId
+                params.StudyId = annotation.studyId
+                params.SeriesId = annotation.seriesId
+                params.InstanceId = annotation.instanceId
+                params.Id = annotation.id ? annotation.id : ''
+                params.MeasureData = JSON.stringify(measureData)
+                params.NumberOfFrames = annotation.numberOfFrames
+                const res = await submitCustomTag(params)
+                annotation.id = res.Result
+            } catch (e) {
+                console.log(e)
+            }
+        },
+        customAnnotationModifiedListener(e) {
+            if (this.readingTaskState === 2) return
+            const { annotation } = e.detail
+            if (!annotation.highlighted) return
+            if (!annotation) return
+            const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+            if (i === -1) {
+                this.setToolsPassive()
+                return
+            }
+            if (!annotation.data.label) return
+            if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
+            const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+            if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+                this.saveCustomAnnotation(annotation)
+            }
+            this.setToolsPassive()
+        },
+        async customAnnotationRemovedListener(e) {
+            if (this.readingTaskState === 2) return
+            const { annotation } = e.detail
+            if (!annotation) return
+            if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
+                try {
+                    if (this.activeTool === 'Eraser') {
+                        await this.$confirm(
+                            this.$t('trials:trials-list:table:isDeleted') +
+                            annotation.data.label +
+                            '?'
+                        )
+                        if (annotation.id) {
+                            deleteCustomTag(annotation.id)
+                        }
+                    }
+                    const index = this.markedSeriesIds.indexOf(annotation.seriesId)
+                    if (index !== -1) {
+                        this.markedSeriesIds.splice(index, 1)
+                    }
+                    const renderingEngine = getRenderingEngine(renderingEngineId)
+                    for (let i = 0; i < this.cells.length; i++) {
+                        const viewportId = `viewport-${i}`
+                        const viewport = renderingEngine.getViewport(viewportId)
+                        viewport.render()
+                    }
+                } catch (e) {
+                    cornerstoneTools.annotation.state.addAnnotation(annotation)
+                    const renderingEngine = getRenderingEngine(renderingEngineId)
+                    for (let i = 0; i < this.cells.length; i++) {
+                        const viewportId = `viewport-${i}`
+                        const viewport = renderingEngine.getViewport(viewportId)
+                        viewport.render()
+                    }
+                    console.log(e)
+                }
+            }
         },
         removeAnnotation(annotation) {
             cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
@@ -1467,11 +1720,19 @@ export default {
             if (taskIdx === -1) return
             if (!this.visitTaskList[taskIdx].IsCurrentTask) return
             // 获取标注信息
-            const res = await getTableAnswerRowInfoList(visitTaskId)
+            let res = null
+            if (this.criterionType === 0) {
+                res = await getCustomTag({ visitTaskId: visitTaskId })
+            } else {
+                res = await getTableAnswerRowInfoList(visitTaskId)
+            }
             const annotationUIDs = []
             const annotations = res.Result.map(i => {
                 if (typeof i.MeasureData === 'string' && i.MeasureData) {
                     i.MeasureData = JSON.parse(i.MeasureData)
+                    if (this.criterionType === 0) {
+                        i.MeasureData.id = i.Id
+                    }
                     annotationUIDs.push(i.MeasureData.annotationUID)
                 }
                 return i
@@ -1485,10 +1746,18 @@ export default {
             if (taskIdx === -1) return
             if (!this.visitTaskList[taskIdx].IsCurrentTask) return
             // 获取标注信息
-            const res = await getTableAnswerRowInfoList(visitTaskId)
+            let res = null
+            if (this.criterionType === 0) {
+                res = await getCustomTag({ visitTaskId: visitTaskId })
+            } else {
+                res = await getTableAnswerRowInfoList(visitTaskId)
+            }
             const annotations = res.Result.map(i => {
                 if (typeof i.MeasureData === 'string' && i.MeasureData) {
                     i.MeasureData = JSON.parse(i.MeasureData)
+                    if (this.criterionType === 0) {
+                        i.MeasureData.id = i.Id
+                    }
                 }
                 return i
             })
@@ -1500,6 +1769,13 @@ export default {
                     cornerstoneTools.annotation.state.removeAnnotation(i.annotationUID)
                 }
             })
+            annotations.map(i => {
+                if (i.MeasureData) {
+                    const annotation = i.MeasureData
+                    cornerstoneTools.annotation.state.addAnnotation(annotation)
+                    this.markedSeriesIds.push(annotation.seriesId)
+                }
+            })
             const renderingEngine = getRenderingEngine(renderingEngineId)
             for (let i = 0; i < this.cells.length; i++) {
                 const viewportId = `viewport-${i}`
@@ -1513,6 +1789,7 @@ export default {
             if (idx === -1) return
             if (annotations[idx].metadata.toolName === 'ArrowAnnotate') {
                 annotations[idx].data.text = obj.name
+                annotations[idx].data.label = obj.name
             } else {
                 annotations[idx].data.label = obj.name
             }
@@ -1626,6 +1903,52 @@ export default {
 
             return textLines
         },
+        getCircleROIToolTextLines(data, targetId) {
+            const cachedVolumeStats = data.cachedStats[targetId]
+            const {
+                radius,
+                radiusUnit,
+                area,
+                mean,
+                stdDev,
+                max,
+                isEmptyArea,
+                areaUnit,
+                modalityUnit
+            } = cachedVolumeStats
+            const textLines = []
+            if (data.label) {
+                textLines.push(data.label)
+            }
+
+            if (radius) {
+                const radiusLine = isEmptyArea
+                    ? `Radius: Oblique not supported`
+                    : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`
+                textLines.push(radiusLine)
+            }
+
+            if (area) {
+                const areaLine = isEmptyArea
+                    ? `Area: Oblique not supported`
+                    : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`
+                textLines.push(areaLine)
+            }
+
+            if (mean) {
+                textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+            }
+
+            if (max) {
+                textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+            }
+
+            if (stdDev) {
+                textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+            }
+
+            return textLines
+        },
         // 激活工具
         setToolActive(toolName) {
             const toolGroupId = `viewport-${this.activeViewportIndex}`
@@ -1645,7 +1968,7 @@ export default {
         },
         // 激活标注工具
         setAnnotateToolActive(toolName) {
-            if (this.cellType[this.activeViewportIndex] === 'MIP') return
+            if (this.readingTaskState === 2) return
             const toolObj = this.tools.find(i => i.toolName === toolName)
             if (!toolObj || toolObj.isDisabled) return
             const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
@@ -1655,7 +1978,6 @@ export default {
                 if (this.activeTool === toolName) {
                     toolGroup.setToolPassive(this.activeTool)
                     this.activeTool = ''
-                    console.log(toolName, false)
                 } else {
                     if (this.activeTool) {
                         toolGroup.setToolPassive(this.activeTool)
@@ -1664,11 +1986,21 @@ export default {
                         bindings: [{ mouseButton: MouseBindings.Primary }]
                     })
                     this.activeTool = toolName
-                    console.log(toolName, true)
                 }
             }
         },
-
+        setMoreToolActive(toolName) {
+            if (this.readingTaskState === 2) return
+            const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
+            if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+                const toolGroupId = `viewport-${this.activeViewportIndex}`
+                const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+                toolGroup.setToolActive(toolName, {
+                    bindings: [{ mouseButton: MouseBindings.Primary }]
+                })
+                this.activeTool = toolName
+            }
+        },
         setToolsPassive() {
             if (!this.activeTool) return
             const toolGroupIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
@@ -1695,25 +2027,25 @@ export default {
             const isCurrentTask = series.TaskInfo.IsCurrentTask
             const readingTaskState = this.readingTaskState
             if (!isCurrentTask || readingTaskState >= 2) {
-                // this.tools[i].isDisabled = true
-                // e.target.style.cursor = 'not-allowed'
-                // if (this.activeTool) {
-                //     this.setToolEnabled()
-                // }
+                this.tools[i].isDisabled = true
+                e.target.style.cursor = 'not-allowed'
+                if (this.activeTool) {
+                    this.setToolEnabled()
+                }
             } else {
-                // const obj = this.$refs['ecrf'].validTool(toolName, true)
-                // const obj = this.$refs[`ecrf_${this.lastViewportTaskId}`][0].validTool(toolName, true)
-                // this.tools[i].disabledReason = obj.reason
-                // if (!obj.isCanActiveTool) {
-                //     if (this.activeTool === toolName) {
-                //         this.setToolsPassive()
-                //     }
-                //     this.tools[i].isDisabled = true
-                //     e.target.style.cursor = 'not-allowed'
-                // } else {
-                //     this.tools[i].isDisabled = false
-                //     e.target.style.cursor = 'pointer'
-                // }
+                if (this.criterionType === 0) return
+                const obj = this.$refs[`ecrf_${this.lastViewportTaskId}`][0].validTool(toolName, true)
+                this.tools[i].disabledReason = obj.reason
+                if (!obj.isCanActiveTool) {
+                    if (this.activeTool === toolName) {
+                        this.setToolsPassive()
+                    }
+                    this.tools[i].isDisabled = true
+                    e.target.style.cursor = 'not-allowed'
+                } else {
+                    this.tools[i].isDisabled = false
+                    e.target.style.cursor = 'pointer'
+                }
             }
         },
         // 旋转视口
@@ -1759,93 +2091,6 @@ export default {
             viewport.render()
             renderingEngine.render()
         },
-        // 更改视图布局
-        async changeLayout(v) {
-            this.setToolsPassive()
-            this.fullScreenIndex = null
-            this.layout = v
-            const series = this.$refs[`viewport-${this.activeViewportIndex}`][0].series
-            this.cellType = []
-            for (i in this.layout) {
-                this.cellType.push(series.cellType)
-            }
-            const seriesArr = []
-            if (v === 1) {
-                this.rows = 1
-                this.cols = 1
-                this.activeViewportIndex = 0
-                if (typeof series === 'object') {
-                    seriesArr.push(series)
-                }
-            } else if (v === 2) {
-                this.rows = 1
-                this.cols = 2
-                this.activeViewportIndex = 1
-                if (typeof series === 'object') {
-                    seriesArr.push(series)
-                    seriesArr.push(series)
-                }
-            } else if (v === 3) {
-                this.rows = 1
-                this.cols = 2
-                if (series) {
-                    const idx = this.visitTaskList.findIndex(i => i.VisitTaskId === series.TaskInfo.VisitTaskId)
-                    const visitTaskNum = idx > -1 ? this.visitTaskList[idx].VisitTaskNum : -1
-                    if (visitTaskNum > 0) {
-                        let visitTaskIdx = -1
-                        if (this.criterionType === 10) {
-                            visitTaskIdx = this.visitTaskList.findIndex(i => i.VisitTaskNum === visitTaskNum - 1)
-                        } else {
-                            visitTaskIdx = this.visitTaskList.findIndex(i => i.IsBaseLineTask)
-                        }
-                        if (visitTaskIdx > -1) {
-                            if (!this.visitTaskList[visitTaskIdx].IsInit) {
-                                this.sLoading = true
-                                try {
-                                    const res = await this.loadTaskDetails(this.visitTaskList[visitTaskIdx], visitTaskIdx)
-                                    const studyList = res ? res.studyList : []
-                                    const annotations = res ? res.annotations : []
-                                    const keyImages = res ? res.keyImages : []
-                                    const annotationUIDs = res ? res.annotationUIDs : []
-                                    this.$set(this.visitTaskList[visitTaskIdx], 'StudyList', studyList)
-                                    this.$set(this.visitTaskList[visitTaskIdx], 'Annotations', annotations)
-                                    this.$set(this.visitTaskList[visitTaskIdx], 'KeyImages', keyImages)
-                                    this.$set(this.visitTaskList[visitTaskIdx], 'AnnotationUIDs', annotationUIDs)
-                                    this.$set(this.visitTaskList[visitTaskIdx], 'IsInit', true)
-                                    this.sLoading = false
-                                } catch (e) {
-                                    this.sLoading = false
-                                }
-                            }
-                            const relatedSeries = this.getRelatedSeries(this.visitTaskList[visitTaskIdx], series)
-                            seriesArr.push(relatedSeries)
-                            seriesArr.push(series)
-                        }
-                    } else if (visitTaskNum === 0) {
-                        seriesArr.push(series)
-                        seriesArr.push(series)
-                    }
-                }
-                this.activeViewportIndex = 1
-            } else if (v === 4) {
-                this.rows = 2
-                this.cols = 2
-                if (typeof series === 'object') {
-                    seriesArr.push(series)
-                    seriesArr.push(series)
-                    seriesArr.push(series)
-                    seriesArr.push(series)
-                }
-                this.activeViewportIndex = 3
-            }
-            seriesArr.map((i, index) => {
-                this.$refs[`viewport-${index}`][0].setSeriesInfo(i)
-            })
-            this.$nextTick(() => {
-                const renderingEngine = getRenderingEngine(renderingEngineId)
-                renderingEngine.resize(true, false)
-            })
-        },
         // 更改窗宽窗位
         changeVoiRange(v) {
             this.setToolsPassive()
@@ -1934,9 +2179,9 @@ export default {
         bindHotKey() {
             const container = this.$refs['container']
             container.addEventListener('keydown', event => {
-                let idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)
+                const idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)
                 if (idx === -1) return
-                let shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum
+                const shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum
 
                 if (shortcutKeyEnum === 1) {
                     // 前一图像视口
@@ -2027,8 +2272,8 @@ export default {
             })
         },
         fitToType(forceFitToWindow) {
-            this.$refs[`viewport-${this.activeViewportIndex}`][0].resize(forceFitToWindow)
             this.forceFitToWindow = !forceFitToWindow
+            this.$refs[`viewport-${this.activeViewportIndex}`][0].resize(forceFitToWindow)
         },
         // 切换全屏
         toggleFullScreen(e, index) {
@@ -2061,9 +2306,9 @@ export default {
                     this.sLoading = false
                 }
             }
-            this.setToolsPassive()
             let obj = this.visitTaskList[this.activeTaskIndex]
             this.getStudyList(obj)
+            // this.setToolsPassive()
         },
         async toggleTaskByViewport(obj) {
             const i = this.visitTaskList.findIndex(v => v.VisitTaskNum === obj.visitTaskNum)
@@ -2110,8 +2355,9 @@ export default {
                 this.lastViewportTaskId = obj.TaskInfo.VisitTaskId
                 this.currentVisitInfo = obj.TaskInfo
             }
-            this.setToolsPassive()
-            // && obj.isCurrentTask
+            if (obj.TaskInfo.VisitTaskId !== this.taskInfo.VisitTaskId) {
+                this.setToolsPassive()
+            }
         },
         async showMultiFrame(obj) {
             this.$refs[`viewport-${this.activeViewportIndex}`][0].setSeriesInfo(obj, true)
@@ -2148,7 +2394,7 @@ export default {
                 if (baselineSeries.IsMarked) {
                     const i = annotations.findIndex(i => Object.keys(i.MeasureData).length > 0 && i.OrderMarkName === baselineSeries.MeasureData.OrderMarkName)
                     if (i > -1) {
-                        obj = this.getMarkedSeries(studyList, annotations[i])
+                        obj = this.getMarkedSeries(studyList, annotations[i].MeasureData)
                     }
                 }
                 if (Object.keys(obj).length === 0) {
@@ -2192,7 +2438,7 @@ export default {
                 const i = annotations.findIndex(a => Object.keys(a.MeasureData).length > 0)
                 if (i > -1) {
                     // 有标记时，显示带标记影像所在序列
-                    obj = this.getMarkedSeries(studyList, annotations[i])
+                    obj = this.getMarkedSeries(studyList, annotations[i].MeasureData)
                 } else {
                     for (let k = 0; k < studyList.length; k++) {
                         const seriesIdx = studyList[k].SeriesList.findIndex(s => s.SliceThickness && parseInt(s.SliceThickness) === 5)
@@ -2221,21 +2467,21 @@ export default {
         },
         getMarkedSeries(studyList, annotation) {
             let obj = {}
-            const sIdx = studyList.findIndex(s => s.StudyId === annotation.StudyId)
+            const sIdx = studyList.findIndex(s => s.StudyId === annotation.studyId)
             if (sIdx > -1) {
                 const seriesList = studyList[sIdx].SeriesList
-                const seriesIdx = seriesList.findIndex(s => s.Id === annotation.SeriesId)
+                const seriesIdx = seriesList.findIndex(s => s.Id === annotation.seriesId)
                 if (seriesIdx > -1) {
-                    const instanceIdx = seriesList[seriesIdx].InstanceInfoList.findIndex(i => i.Id === annotation.InstanceId)
+                    const instanceIdx = seriesList[seriesIdx].InstanceInfoList.findIndex(i => i.Id === annotation.instanceId)
                     let filterStr = ''
                     if (instanceIdx > -1 && seriesList[seriesIdx].IsExistMutiFrames) {
                         if (seriesList[seriesIdx].InstanceInfoList[instanceIdx].NumberOfFrames > 0) {
-                            filterStr = `frame=${annotation.MeasureData.frame}&instanceId=${annotation.InstanceId}`
+                            filterStr = `instanceId=${annotation.instanceId}&frame=${annotation.numberOfFrames}`
                         } else {
-                            filterStr = `instanceId=${annotation.InstanceId}`
+                            filterStr = `instanceId=${annotation.instanceId}`
                         }
                     } else {
-                        filterStr = `instanceId=${annotation.InstanceId}`
+                        filterStr = `instanceId=${annotation.instanceId}`
                     }
                     const stack = seriesList[seriesIdx].Stack
                     const imageIdIdx = stack.findIndex(is => is.includes(filterStr))
@@ -2313,7 +2559,7 @@ export default {
                         }
                         const annotationIdx = this.visitTaskList[taskIdx].Annotations.findIndex(i => i.OrderMarkName === obj.lesionName)
                         if (annotationIdx > -1) {
-                            firstAddSeries = this.getMarkedSeries(this.visitTaskList[taskIdx].StudyList, this.visitTaskList[taskIdx].Annotations[annotationIdx])
+                            firstAddSeries = this.getMarkedSeries(this.visitTaskList[taskIdx].StudyList, this.visitTaskList[taskIdx].Annotations[annotationIdx].MeasureData)
                         }
                     }
                     if (obj.isMarked) {
@@ -2448,11 +2694,28 @@ export default {
             }
             return params
         },
-        // 箭头工具输入标记名称自定义弹窗
+        // 输入标记名称自定义弹窗
         async customPrompt() {
             try {
+                const that = this
                 // 请输入标记名称
-                const { value } = await this.$prompt(this.$t('trials:noneDicom:message:msg1'))
+                const { value } = await this.$prompt(this.$t('trials:noneDicom:message:msg1'), '', {
+                    showClose: false,
+                    beforeClose: (action, instance, done) => {
+                        if (action === 'confirm') {
+                            const value = instance.inputValue
+                            if (!value) {
+                                that.$message.error(this.$t('trials:customReading:error:validMarkName1'))
+                            } else if (this.validMarkName(value)) {
+                                that.$message.error(this.$t('trials:customReading:error:validMarkName'))
+                            } else {
+                                done()
+                            }
+                        } else {
+                            done()
+                        }
+                    }
+                })
                 return value
             } catch {
                 return null
@@ -2881,9 +3144,10 @@ export default {
             }
 
             .content-wrapper {
-                flex: 1;
+                flex: 1 0 0%;
                 display: flex;
                 flex-direction: row;
+                height: 90%;
             }
 
             .viewports-wrapper {
@@ -2916,6 +3180,7 @@ export default {
 
             .form-wrapper {
                 width: 400px;
+                height: 100%;
                 border: 1px solid #727272;
                 overflow-y: auto;
                 user-select: none;
@@ -3026,4 +3291,4 @@ export default {
         }
     }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index cc73d6e7..8c709022 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -75,7 +75,7 @@
       {{ markers.left }}
     </div>
     <div v-if="isFusion" class="color_bar">
-      <canvas id="colorBar_Canvas" />
+      <canvas :id="`colorBar_Canvas_${viewportId}`" />
       <!-- <div id="colorBar_Canvas" />  -->
     </div>
     <div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)">
@@ -384,7 +384,7 @@ export default {
       //   },
       // });
       const rgbPoints = colorMap.RGBPoints
-      const canvas = document.getElementById('colorBar_Canvas')
+      const canvas = document.getElementById(`colorBar_Canvas_${this.viewportId}`)
       const ctx = canvas.getContext('2d')
       const canvasWidth = 160
       const canvasHeight = 5
@@ -433,9 +433,6 @@ export default {
         if (this.series && obj.Id === this.series.Id && obj.Description === this.series.Description && !isLocate) {
           obj.SliceIndex = this.series.SliceIndex
         }
-        if (this.series) {
-          obj.cellType = this.series.cellType
-        }
         this.series = {}
         let { isFusion, isMip } = option
         this.isFusion = isFusion;
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
index cab09675..cb4befc5 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
@@ -4,7 +4,7 @@
       <!-- 阅片 -->
       <el-tab-pane v-if="taskInfo" :label="$t('trials:reading:tabTitle:review')" name="read">
         <read-page v-if="!readingTool" ref="readPage" />
-        <PetCtReadPage v-else-if="readingTool === 2" />
+        <PetCtReadPage v-else-if="readingTool === 2" ref="readPage" />
       </el-tab-pane>
       <!-- 报告 -->
       <el-tab-pane
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 1c098689..d0d8853c 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -66,7 +66,7 @@
       </el-form-item>
       <!-- 测量工具 -->
       <el-form-item
-        v-if="CriterionType === 0 && form.ReadingTool === 0 && form.ReadingVersionEnum === 1"
+        v-if="CriterionType === 0 && (form.ReadingTool === 0 || form.ReadingTool === 2 ) && form.ReadingVersionEnum === 1"
         :label="$t('trials:readingUnit:readingRules:title:measureTool')"
       >
         <el-checkbox-group 

From 9168ef3ad7db7f84c3e177253a6add7f88c8b9fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 28 Apr 2025 15:55:27 +0800
Subject: [PATCH 2/2] 1

---
 .../reading/dicoms3D/components/PetCtReadPage.vue      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
index fa3ccd90..b697f355 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtReadPage.vue
@@ -257,7 +257,7 @@
                                                         @click="setColorMap(colorMap)">
                                                         <canvas :id="`colorBarCanvas${index}`" />
                                                         <span style="margin-left:5px;font-size: 10px;">{{ colorMap
-                                                        }}</span>
+                                                            }}</span>
 
                                                     </li>
                                                 </ul>
@@ -469,7 +469,7 @@
                 <el-form-item style="text-align:right;">
                     <!-- 取消 -->
                     <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel')
-                    }}</el-button>
+                        }}</el-button>
                     <!-- 确认 -->
                     <el-button type="primary" size="mini" @click="handleSubmitFusionSeries">
                         {{ $t('common:button:confirm') }}</el-button>
@@ -753,7 +753,11 @@ export default {
             })
         },
         voiChange(v) {
-            this.$refs[`viewport-${2}`][0].voiChange(v)
+            this.cellType.forEach((item, index) => {
+                if (item === 'FUSION') {
+                    this.$refs[`viewport-${index}`][0].voiChange(v)
+                }
+            })
         },
         initSlider() {
             var slider = document.getElementById('slider')