MRI-PDFF测量逻辑更改

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

@@ -303,8 +303,8 @@ export default {
 
       ],
       scrollSyncInfo: { offset: 0 },
-      hideMeasureArr: []
-
+      hideMeasureArr: [],
+      isInitWwwc: true
     }
   },
   computed: {
@@ -565,7 +565,6 @@ export default {
         e.stopPropagation()
         e.preventDefault()
       } else if (this.activeToolName === 'Length' || this.activeToolName === 'Bidirectional' && this.readingTaskState < 2) {
-        console.log(e.detail.image)
         if (!e.detail.image.columnPixelSpacing || !e.detail.image.rowPixelSpacing) {
           // '该影像不具备测量长度所需的必要数据，不能进行长度测量。请选择其他工具进行标注。'
           this.$confirm(this.$t('trials:reading:warnning:msg56'), '', {
@@ -578,6 +577,13 @@ export default {
           e.stopPropagation()
           e.preventDefault()
         }
+      } else if (this.CriterionType === 21 && this.activeToolName === 'Probe' && this.readingTaskState < 2) {
+        if (!(e.detail.image.imageFrame.photometricInterpretation === 'MONOCHROME1' || e.detail.image.imageFrame.photometricInterpretation === 'MONOCHROME2')) {
+          this.$alert(this.$t('trials:MRIPDFF:message:message5'))
+          e.stopImmediatePropagation()
+          e.stopPropagation()
+          e.preventDefault()
+        }
       }
     },
     pointNearTool(e) {
@@ -668,7 +674,7 @@ export default {
     },
     sliderMousemove(e) {
       if (!this.sliderInfo.isMove) return
-      console.log('sliderMousemove')
+      // console.log('sliderMousemove')
       var PX = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
       var boxHeight = this.$refs['sliderBox'].clientHeight
       if (PX < 0) return
@@ -792,6 +798,8 @@ export default {
             } else if (toolType === 'Length') {
               // toolState.data[i].length = this.calculateLenth(toolState.data[i])
             }
+            measureData.largestPixelValue = image.imageFrame.largestPixelValue
+            measureData.imageId = imageId
             measureData.studyId = this.stack.studyId
             measureData.seriesId = this.stack.seriesId
             measureData.instanceId = instanceId
@@ -1024,6 +1032,8 @@ export default {
                 var questionInfo = this.measureData[idx]
                 // const canvas = this.canvas.querySelector('canvas')
                 // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+                measureData.largestPixelValue = image.imageFrame.largestPixelValue
+                measureData.imageId = imageId
                 measureData.studyId = this.stack.studyId
                 measureData.seriesId = this.stack.seriesId
                 measureData.instanceId = instanceId
@@ -1049,6 +1059,7 @@ export default {
     },
     loadImageStack(dicomSeries) {
       return new Promise(resolve => {
+        this.isInitWwwc = true
         this.isCurrentTask = dicomSeries.isCurrentTask
         this.isBaseline = dicomSeries.isBaseLineTask
         this.readingTaskState = dicomSeries.readingTaskState
@@ -1217,7 +1228,7 @@ export default {
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-        // this.resetWwwc()
+        
         resolve()
       })
     },
@@ -1315,6 +1326,9 @@ export default {
         this.scrollSyncInfo.offset = 0
       }
       this.renderMeasuredData(e)
+      if (this.isInitWwwc) {
+        this.resetWwwc()
+      }
     },
     getOrientationMarker(element) {
       const enabledElement = cornerstone.getEnabledElement(element)
@@ -1351,6 +1365,8 @@ export default {
       this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1368,6 +1384,8 @@ export default {
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (e.detail.toolName === 'Bidirectional') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1384,6 +1402,8 @@ export default {
         cornerstoneTools.setToolPassiveForElement(this.canvas, e.detail.toolName)
       } else if (e.detail.toolName === 'Probe') {
         const measureData = {}
+        measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+        measureData.imageId = imageId
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
@@ -1493,6 +1513,8 @@ export default {
           var questionInfo = this.measureData[idx]
           // const canvas = this.canvas.querySelector('canvas')
           // measureData.pictureBaseStr = canvas.toDataURL('image/png', 1)
+          measureData.largestPixelValue = element.image.imageFrame.largestPixelValue
+          measureData.imageId = imageId
           measureData.studyId = this.stack.studyId
           measureData.seriesId = this.stack.seriesId
           measureData.instanceId = instanceId
@@ -1684,6 +1706,8 @@ export default {
     },
 
     resetWwwc() {
+      // console.log('resetWwwc')
+      this.isInitWwwc = true
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
       // viewport.invert = false
@@ -1694,7 +1718,7 @@ export default {
     },
 
     setWwwc(ww, wc) {
-      // console.log('setWwwc', ww, wc)
+      this.isInitWwwc = false
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.voi.windowWidth = ww
       viewport.voi.windowCenter = wc

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue

@@ -205,6 +205,7 @@
 import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
+import * as cornerstone from 'cornerstone-core'
 export default {
   name: 'MeasurementForm',
   props: {
@@ -444,7 +445,12 @@ export default {
           // 维护标记信息
           measureData.data.remark = this.getLesionName(this.orderMark, this.activeQuestionMark)
         }
-        const val = measureData.data.cachedStats.mean / 10
+        // const val = measureData.data.cachedStats.mean / 10
+        let val = parseFloat(measureData.data.cachedStats.mean)
+        // let imagePixelModule = cornerstone.metaData.get('imagePixelModule', measureData.imageId)
+        if (measureData.largestPixelValue >= 500) {
+          val = val / 10
+        }
         this.$set(this.questionForm, measureData.tableQuestionId, val.toFixed(this.digitPlaces))
         data = {
           Id: '',
@@ -574,14 +580,26 @@ export default {
         let params = {}
         if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
           const measureData = this.markList[i].measureData.MeasureData
+          const tableQuestionId = this.markList[i].tableQuestionId
+          if (this.questionForm[tableQuestionId] > 100) {
+            const confirm = await this.$confirm(
+              this.$t('trials:MRIPDFF:message:message4'),
+              {
+                type: 'warning',
+                distinguishCancelAndClose: true
+              }
+            )
+            if (confirm !== 'confirm') return
+          }
           // 上传截图
+          
           DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {
             params = Object.assign({}, this.markList[i].measureData)
             if (val) {
               const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
               params.PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
             }
-            const tableQuestionId = this.markList[i].tableQuestionId
+            
             params.Answer = this.questionForm[tableQuestionId]
             params.MeasureData = JSON.stringify(this.markList[i].measureData.MeasureData)
             loading.close()

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue

@@ -264,7 +264,6 @@ export default {
         if (item.Type === 'table' && item.Id === obj.questionId) {
           var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
           item.TableQuestions.Answers[idx].isMeasurable = obj.isMeasurable
-          console.log(obj.isMeasurable)
           item.TableQuestions.Answers[idx].mean = obj.mean
           item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum