From f6eab06c78172b01a979876d95101c1e4690cb20 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 26 Feb 2024 17:23:16 +0800
Subject: [PATCH] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  71 ++++----
 .../dicoms/components/Fusion/QuestionItem.vue |   2 +-
 .../dicoms/components/Fusion/Questions.vue    |  89 +++++-----
 .../components/Fusion/TableQuestionItem.vue   | 167 +++++++++---------
 .../components/Fusion/TableQuestions.vue      |   2 -
 .../components/Fusion/tools/CircleROITool.js  |  10 +-
 6 files changed, 177 insertions(+), 164 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 01a8b054..f9317df0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -690,46 +690,46 @@ export default {
       })
 
       const debouncedCallback = this.debounce((e) => {
-        const { annotation } = e.detail
-        const { cachedStats } = annotation.data
-        var isNotValidAnnotationNum = 0
-        for (const volumeId in cachedStats) {
-          var statObj = cachedStats[volumeId]
-          var arr = Object.keys(statObj)
-          if (arr.length < 2) {
-            ++isNotValidAnnotationNum
-          }
-        }
-        if (isNotValidAnnotationNum === 0) {
-          this.onAnnotationModified(e)
-        } else {
-          // console.log('异常标记：', annotation)
-          // const { remark } = annotation.data
-          // if (remark === 'Liver' || remark === 'Mediastinum') {
-          //   this.$refs['questions'].setOutsideMeasuredData(annotation)
-          // } else {
-          //   this.$refs['tableQuestions'].setOutsideMeasuredData(annotation)
-          // }
-          // 移除标记
-          this.removeAnnotation({ otherMeasureData: annotation })
-          const { remark } = annotation.data
-          // 清除病灶上的标记信息
-          if (remark === 'Liver' || remark === 'Mediastinum') {
-            this.$refs['questions'].clearMeasuredData(remark)
-            // 激活工具
-            this.setNonTargetMeasurementStatus({ status: true, toolName: 'CircleROI' })
-          } else {
-            this.$refs['tableQuestions'].clearMeasuredData()
-            // 激活工具
-            this.setBasicToolActive('CircleROI')
-          }
-        }
+        // const { annotation } = e.detail
+        this.onAnnotationModified(e)
+        // const { cachedStats } = annotation.data
+        // var isNotValidAnnotationNum = 0
+        // for (const volumeId in cachedStats) {
+        //   var statObj = cachedStats[volumeId]
+        //   var arr = Object.keys(statObj)
+        //   if (arr.length < 2) {
+        //     ++isNotValidAnnotationNum
+        //   }
+        // }
+        // if (!annotation.isHandleOutsideImage) {
+        //   this.onAnnotationModified(e)
+        // } else {
+        //   // console.log('异常标记：', annotation)
+        //   // const { remark } = annotation.data
+        //   // if (remark === 'Liver' || remark === 'Mediastinum') {
+        //   //   this.$refs['questions'].setOutsideMeasuredData(annotation)
+        //   // } else {
+        //   //   this.$refs['tableQuestions'].setOutsideMeasuredData(annotation)
+        //   // }
+        //   // 移除标记
+        //   // this.removeAnnotation({ otherMeasureData: annotation })
+        //   // const { remark } = annotation.data
+        //   // // 清除病灶上的标记信息
+        //   // if (remark === 'Liver' || remark === 'Mediastinum') {
+        //   //   this.$refs['questions'].clearMeasuredData(remark)
+        //   //   // 激活工具
+        //   //   this.setNonTargetMeasurementStatus({ status: true, toolName: 'CircleROI' })
+        //   // } else {
+        //   //   this.$refs['tableQuestions'].clearMeasuredData()
+        //   //   // 激活工具
+        //   //   this.setBasicToolActive('CircleROI')
+        //   // }
+        // }
       }, 120)
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_MODIFIED, (e) => {
         debouncedCallback(e)
       })
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_SELECTION_CHANGE, (e) => {
-        console.log(e)
         const { detail } = e
         const { selection } = detail
         if (selection && selection.length > 0) {
@@ -833,7 +833,6 @@ export default {
       if (this.isNonTargetMeasurement || annotation.data.remark === 'Liver' || annotation.data.remark === 'Mediastinum') {
         this.$refs['questions'].setMeasuredData(measureData)
       } else {
-        console.log('onAnnotationAdded')
         this.$refs['tableQuestions'] && this.$refs['tableQuestions'].setMeasuredData(measureData)
       }
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 1ddd5548..3374aeb2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -234,7 +234,7 @@
   </div>
 </template>
 <script>
-import { uploadReadingAnswerImage } from '@/api/trials'
+// import { uploadReadingAnswerImage } from '@/api/trials'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 730aef42..1419ed08 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -60,7 +60,8 @@ export default {
       suvmaxId: '',
       questionFormChangeState: false,
       questionFormChangeNum: 0,
-      isInsideVolume: true
+      lungIsInsideVolume: true,
+      liverIsInsideVolume: true
     }
   },
   computed: {
@@ -196,7 +197,7 @@ export default {
     handleSave() {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
-        if (!this.isInsideVolume) {
+        if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
           this.$alert('当前标记在图像外，不允许保存！', '提示', {
             callback: action => {
               this.$message({
@@ -308,7 +309,51 @@ export default {
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
     setMeasuredData(measurement) {
-      this.isInsideVolume = true
+      if (measurement.data.isHandleOutsideImage) {
+        this.setOutsideMeasuredData(measurement)
+      } else {
+        var idx = -1
+        if (this.currentQsId) {
+          // 新增
+          idx = this.measurements.findIndex(i => i.QuestionId === this.currentQsId)
+          this.currentQsId = ''
+        } else {
+          // 编辑
+          idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.data.remark)
+        }
+        if (idx === -1) return
+        var obj = this.measurements[idx]
+        var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
+        obj.QuestionType === 51 ? this.liverIsInsideVolume = true : obj.QuestionType === 52 ? this.lungIsInsideVolume = true : ''
+        measurement.data.data.remark = remark
+        this.measurements[idx].OtherMeasureData = measurement.data
+        this.measurements[idx].OtherMarkTool = measurement.data.metadata.toolName
+
+        //  添加标记
+        var data = {
+          OtherMeasureData: measurement.data,
+          QuestionId: obj.QuestionId,
+          VisitTaskId: this.visitTaskId,
+          OrderMarkName: remark
+        }
+        if (measurement.type === 'CircleROI') {
+          const suvMax = measurement.suvMax
+          this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+          var pet5PS = this.setpet5PS()
+          this.questionForm[this.pet5PSId] = pet5PS
+          this.calculatePet5PS = pet5PS
+          this.setPet5PSCommentDisplay()
+        }
+        FusionEvent.$emit('addOrUpdateAnnotations', { data })
+        this.questionFormChangeState = true
+      }
+    },
+    setOutsideMeasuredData(measurement) {
+      console.log('setOutsideMeasuredData: ', measurement)
+      if ((measurement.data.remark === 'Liver' && this.liverIsInsideVolume === false) || (measurement.data.remark === 'Mediastinum' && this.lungIsInsideVolume === false)) {
+        return
+      }
+
       var idx = -1
       if (this.currentQsId) {
         // 新增
@@ -321,6 +366,7 @@ export default {
       if (idx === -1) return
       var obj = this.measurements[idx]
       var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
+      obj.QuestionType === 51 ? this.liverIsInsideVolume = false : obj.QuestionType === 52 ? this.lungIsInsideVolume = false : ''
       measurement.data.data.remark = remark
       this.measurements[idx].OtherMeasureData = measurement.data
       this.measurements[idx].OtherMarkTool = measurement.data.metadata.toolName
@@ -333,43 +379,6 @@ export default {
         OrderMarkName: remark
       }
       if (measurement.type === 'CircleROI') {
-        const suvMax = measurement.suvMax
-        this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-        var pet5PS = this.setpet5PS()
-        this.questionForm[this.pet5PSId] = pet5PS
-        this.calculatePet5PS = pet5PS
-        this.setPet5PSCommentDisplay()
-      }
-      FusionEvent.$emit('addOrUpdateAnnotations', { data })
-      this.questionFormChangeState = true
-    },
-    setOutsideMeasuredData(measurement) {
-      this.isInsideVolume = false
-      var idx = -1
-      if (this.currentQsId) {
-        // 新增
-        idx = this.measurements.findIndex(i => i.QuestionId === this.currentQsId)
-        this.currentQsId = ''
-      } else {
-        // 编辑
-        idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.remark)
-      }
-      if (idx === -1) return
-      var obj = this.measurements[idx]
-      var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
-      measurement.data.remark = remark
-      this.measurements[idx].OtherMeasureData = measurement
-      this.measurements[idx].OtherMarkTool = measurement.metadata.toolName
-
-      //  添加标记
-      var data = {
-        OtherMeasureData: measurement,
-        QuestionId: obj.QuestionId,
-        VisitTaskId: this.visitTaskId,
-        OrderMarkName: remark
-      }
-      if (measurement.metadata.toolName === 'CircleROI') {
-        // const suvMax = measurement.suvMax
         this.$set(this.questionForm, obj.QuestionId, null)
         var pet5PS = this.setpet5PS()
         this.questionForm[this.pet5PSId] = pet5PS
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 7bed9b4f..68fc9234 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -521,97 +521,104 @@ export default {
       this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
     },
     setMeasureData(measureData, isInit = false) {
-      console.log('setMeasureData')
-      this.isInsideVolume = true
       return new Promise(resolve => {
-        if (measureData) {
-          // 获取SUVmax(20)
-          var SUVmax = measureData.suvMax ? measureData.suvMax : null
-          var suvObj = this.questions.find(i => i.QuestionMark === 20)
-          this.$set(this.questionForm, suvObj.Id, SUVmax)
-          var data = {}
-          measureData.data.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
-          // measureData.data.data.studyId = measureData.studyId
-          // measureData.data.data.seriesId = measureData.seriesId
-          // measureData.data.data.instanceId = measureData.instanceId
-          // measureData.data.data.viewportId = measureData.viewportId
-          // measureData.data.data.questionId = this.parentQsId
-          // measureData.data.data.rowIndex = this.questionForm.RowIndex
-          data = {
-            // OtherStudyId: measureData.studyId,
-            // OtherSeriesId: measureData.seriesId,
-            // OtherInstanceId: measureData.instanceId,
-            OtherMeasureData: measureData.data,
-            QuestionId: this.parentQsId,
-            RowIndex: this.questionForm.RowIndex,
-            RowId: this.questionForm.RowId,
-            VisitTaskId: this.visitTaskId,
-            OrderMarkName: measureData.data.data.remark
-          }
-          FusionEvent.$emit('addOrUpdateAnnotations', { data })
-        }
-        if (!isInit) {
-          // if (this.questionForm.RowId) {
-          //   this.$set(this.questionForm, 'saveTypeEnum', 1)
-          // } else {
-          //   this.$set(this.questionForm, 'saveTypeEnum', 0)
-          // }
-          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
-          if (this.questionForm.OtherMeasureData) {
-            var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+        if (measureData.data.isHandleOutsideImage) {
+          this.setOutsideMeasuredData(measureData)
+        } else {
+          this.isInsideVolume = true
 
-            if (annotation && this.firstRenderAnnotation) {
-              for (const k in annotation.data.cachedStats) {
-                if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
-                  this.firstRenderAnnotation = false
-                  break
+          if (measureData) {
+            // 获取SUVmax(20)
+            var SUVmax = measureData.suvMax ? measureData.suvMax : null
+            var suvObj = this.questions.find(i => i.QuestionMark === 20)
+            this.$set(this.questionForm, suvObj.Id, SUVmax)
+            var data = {}
+            measureData.data.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+            // measureData.data.data.studyId = measureData.studyId
+            // measureData.data.data.seriesId = measureData.seriesId
+            // measureData.data.data.instanceId = measureData.instanceId
+            // measureData.data.data.viewportId = measureData.viewportId
+            // measureData.data.data.questionId = this.parentQsId
+            // measureData.data.data.rowIndex = this.questionForm.RowIndex
+            data = {
+              // OtherStudyId: measureData.studyId,
+              // OtherSeriesId: measureData.seriesId,
+              // OtherInstanceId: measureData.instanceId,
+              OtherMeasureData: measureData.data,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId,
+              OrderMarkName: measureData.data.data.remark
+            }
+            FusionEvent.$emit('addOrUpdateAnnotations', { data })
+          }
+          if (!isInit) {
+            // if (this.questionForm.RowId) {
+            //   this.$set(this.questionForm, 'saveTypeEnum', 1)
+            // } else {
+            //   this.$set(this.questionForm, 'saveTypeEnum', 0)
+            // }
+            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+            if (this.questionForm.OtherMeasureData) {
+              var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+
+              if (annotation && this.firstRenderAnnotation) {
+                for (const k in annotation.data.cachedStats) {
+                  if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
+                    this.firstRenderAnnotation = false
+                    break
+                  }
                 }
               }
-            }
-          } else {
-            this.firstRenderAnnotation = false
-          }
-          if (!this.firstRenderAnnotation) {
-            if (this.questionForm.RowId) {
-              this.$set(this.questionForm, 'saveTypeEnum', 1)
             } else {
-              this.$set(this.questionForm, 'saveTypeEnum', 0)
+              this.firstRenderAnnotation = false
+            }
+            if (!this.firstRenderAnnotation) {
+              if (this.questionForm.RowId) {
+                this.$set(this.questionForm, 'saveTypeEnum', 1)
+              } else {
+                this.$set(this.questionForm, 'saveTypeEnum', 0)
+              }
+            } else {
+              this.$set(this.questionForm, 'saveTypeEnum', 2)
+              this.$emit('close')
             }
-          } else {
-            this.$set(this.questionForm, 'saveTypeEnum', 2)
-            this.$emit('close')
           }
-        }
-        this.$set(this.questionForm, 'OtherMeasureData', measureData.data)
-        var isLymph = this.getQuestionVal(2)
-        isLymph = !isNaN(parseInt(isLymph)) ? parseInt(isLymph) : null
-        const lesionPart = this.getQuestionVal(8)
-        const lesionOrgan = this.getQuestionVal(6)
-        var suvMax = this.getQuestionVal(20)
-        this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-        this.toolType = measureData.type
-        if (this.questionForm.MeasureData) {
-          // if (measureData.type === 'Bidirectional') {
-          //   this.organList = []
-          //   this.getOrganInfoList(1)
-          // } else if (measureData.type === 'Length') {
-          //   // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
-          //   this.organList = []
-          //   this.getOrganInfoList(0)
-          // } else {
-          //   this.organList = []
-          //   this.getOrganInfoList()
-          // }
-          this.organList = []
-          this.getOrganInfoList()
-        } else {
-          this.organList = []
-          this.getOrganInfoList()
+          this.$set(this.questionForm, 'OtherMeasureData', measureData.data)
+          var isLymph = this.getQuestionVal(2)
+          isLymph = !isNaN(parseInt(isLymph)) ? parseInt(isLymph) : null
+          const lesionPart = this.getQuestionVal(8)
+          const lesionOrgan = this.getQuestionVal(6)
+          var suvMax = this.getQuestionVal(20)
+          this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+          this.toolType = measureData.type
+          if (this.questionForm.MeasureData) {
+            // if (measureData.type === 'Bidirectional') {
+            //   this.organList = []
+            //   this.getOrganInfoList(1)
+            // } else if (measureData.type === 'Length') {
+            //   // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            //   this.organList = []
+            //   this.getOrganInfoList(0)
+            // } else {
+            //   this.organList = []
+            //   this.getOrganInfoList()
+            // }
+            this.organList = []
+            this.getOrganInfoList()
+          } else {
+            this.organList = []
+            this.getOrganInfoList()
+          }
         }
         resolve()
       })
     },
     setOutsideMeasuredData(measureData) {
+      if (this.isInsideVolume === false) {
+        return
+      }
       this.isInsideVolume = false
       var suvObj = this.questions.find(i => i.QuestionMark === 20)
       this.$set(this.questionForm, suvObj.Id, '')
@@ -627,7 +634,6 @@ export default {
       const lesionOrgan = this.getQuestionVal(6)
       var suvMax = this.getQuestionVal(20)
       this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-      this.toolType = measureData.type
       if (this.questionForm.MeasureData) {
         this.organList = []
         this.getOrganInfoList()
@@ -742,7 +748,6 @@ export default {
         }
         // suv测量值可以测量为0，但不能与病灶、肝脏、纵隔血池绑定。
         if (this.questionForm.OtherMeasureData) {
-          console.log(this.questionForm.OtherMeasureData)
           var suvmax = this.getQuestionVal(20)
           if (suvmax === 0) {
             this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 4889e51e..5db80056 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -520,7 +520,6 @@ export default {
       return
     },
     getUnSaveTarget() {
-      console.log('getUnSaveTarget')
       this.unSaveTargets = []
       this.tableQuestions.map(item => {
         if (item.TableQuestions && item.TableQuestions.Answers) {
@@ -532,7 +531,6 @@ export default {
           })
         }
       })
-      // console.log(this.unSaveTargets)
       return this.unSaveTargets
     },
     getAllUnSaveLesions() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
index 69a70a6c..216614a5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
@@ -18,7 +18,7 @@ const {
 } = cornerstoneTools
 // const { getWorldWidthAndHeightFromTwoPoints } = utilities.planar
 // const { roundNumber } = utilities
-const { hideElementCursor } = cursors.elementCursor
+const { hideElementCursor,resetElementCursor } = cursors.elementCursor
 const { getAnnotations,addAnnotation } = annotation.state
 const { isAnnotationVisible } = annotation.visibility
 const { isAnnotationLocked } = annotation.locking
@@ -428,7 +428,6 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
     enabledElement,
     modalityUnitOptions
   ) => {
-    console.log('_calculateCachedStats')
     const data = annotation.data
     const { viewportId, renderingEngineId } = enabledElement
   
@@ -549,12 +548,15 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
           perimeter: (2 * Math.PI * (worldWidth / 2)) / scale,
           modalityUnit
         }
+        annotation.isHandleOutsideImage = false
       } else {
-        this.isHandleOutsideImage = false
+        this.isHandleOutsideImage = true
   
         cachedStats[targetId] = {
-          Modality: metadata.Modality
+          Modality: metadata.Modality,
+          areaUnit: getCalibratedAreaUnits(null, image)
         }
+        annotation.isHandleOutsideImage = true
       }
     }