From 8ebf10b373ff4f23f600ed760249e234ebcf96d5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 19 Jun 2024 18:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/NoneDicomsCanvas.vue    | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
index e978c706..3930c6c0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
@@ -76,6 +76,7 @@
   </div>
 </template>
 <script>
+import { getTableAnswerRowInfoList } from '@/api/trials'
 import { on, off } from 'element-ui/src/utils/dom'
 import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
 import store from '@/store'
@@ -222,16 +223,27 @@ export default {
     getCanvasData() {
       return new Promise(async resolve => {
         this.visitTaskId = this.$router.currentRoute.query.visitTaskId
-        this.canvasData = []
-        await store.dispatch('reading/getMeasuredData', this.visitTaskId)
-        await store.dispatch('reading/getNoneDicomMeasuredData', this.visitTaskId).then(res => {
-          res.forEach(item => {
-            if (item && item.MeasureData) {
-              this.canvasData.push(item.MeasureData)
+        this.canvasData = [] 
+        let res = await getTableAnswerRowInfoList(this.visitTaskId)
+        res.Result.forEach(el => {
+          if (!el.IsDicomReading){
+            if (el.MeasureData) {
+              el.MeasureData = JSON.parse(el.MeasureData)
+              el.MeasureData.data.remark = el.OrderMarkName
+              this.canvasData.push(el.MeasureData)
             }
-          })
-          sessionStorage.setItem('measureData', this.canvasData)
+          }  
         })
+        sessionStorage.setItem('measureData', this.canvasData)
+        // await store.dispatch('reading/getMeasuredData', this.visitTaskId)
+        // await store.dispatch('reading/getNoneDicomMeasuredData', this.visitTaskId).then(res => {
+        //   res.forEach(item => {
+        //     if (item && item.MeasureData) {
+        //       this.canvasData.push(item.MeasureData)
+        //     }
+        //   })
+        //   sessionStorage.setItem('measureData', this.canvasData)
+        // })
         resolve()
       })
     },