Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

2024-05-31 14:09:36 +08:00 · 2024-05-31 14:09:36 +08:00 · 7e7e374e38
parent 1b66fd6573 31b1b1e3b6
commit 7e7e374e38
8 changed files with 76 additions and 11 deletions
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@ -66,6 +66,38 @@
            </template>
          </el-input>
        </template>
+        <template v-else-if="question.QuestionType === 56">
+          <el-select
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 "
+            clearable
+            @change="((val)=>{formItemChange(val, question)})"
+          >
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              v-show="(pet5PS*1=== -1) || (pet5PS*1!== -1 && item.value !== 4)"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </el-select>
+        </template>
+        <template v-else-if="question.QuestionType === 57">
+          <el-select
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 "
+            clearable
+            @change="((val)=>{formItemChange(val, question)})"
+          >
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              v-show="(pet5PS*1=== -1) || (pet5PS*1!== -1 && item.value !== 1)"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </el-select>
+        </template>
        <!-- 输入框 -->
        <el-input
          v-else-if="question.Type==='input'"
@ -234,6 +266,7 @@
        :reading-task-state="readingTaskState"
        :question-form="questionForm"
        :visit-task-id="visitTaskId"
+        :pet5PS="pet5PS"
        :lung-is-inside-volume="lungIsInsideVolume"
        :liver-is-inside-volume="liverIsInsideVolume"
        @setFormItemData="setFormItemData"
@ -276,7 +309,11 @@ export default {
    liverIsInsideVolume: {
      type: Boolean,
      default: true
-    }
+    },
+    pet5PS: {
+      type: String,
+      default: ''
+    },
  },
  data() {
    return {
@ -297,6 +334,13 @@ export default {
      handler(v) {
        // console.log(v)
      }
+    },
+    pet5PS: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        // console.log(v)
+      }
    }
  },
  mounted() {
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@ -14,6 +14,7 @@
          :question-form="questionForm"
          :reading-task-state="readingTaskState"
          :visit-task-id="visitTaskId"
+          :pet5PS="questionForm[pet5PSId]"
          :lung-is-inside-volume="lungIsInsideVolume"
          :liver-is-inside-volume="liverIsInsideVolume"
          @setFormItemData="setFormItemData"
@ -64,6 +65,7 @@ export default {
      lungIsInsideVolume: true,
      liverIsInsideVolume: true,
      uptakeFromBaselineId: '',
+      focalFDGId: '',
      baseLinePET5PS: null,
      liverRender: true,
      lungRender: true
@ -231,6 +233,10 @@ export default {
            // 与基线相比摄取值变化
            this.uptakeFromBaselineId = i.Id
          }
+          if (i.QuestionType === 57) {
+            // 骨髓中存在局灶性FDG亲和病灶的证据
+            this.focalFDGId = i.Id
+          }
          if (i.Childrens && i.Childrens.length > 0) {
            this.setChild(i.Childrens)
          }
@ -573,6 +579,7 @@ export default {
      if (obj.key === this.pet5PSId) {
        this.setPet5PSCommentDisplay()
        this.setUptakeFormBaseline()
+        this.setfocalFDG()
      }
    },
    setPet5PSCommentDisplay() {
@ -604,11 +611,19 @@ export default {
          } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
            this.questionForm[this.uptakeFromBaselineId] = '2'
          }
+        } else if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.uptakeFromBaselineId] === '4') {
+          this.questionForm[this.uptakeFromBaselineId] = ''
        } else if (this.questionForm[this.pet5PSId] === '' || this.questionForm[this.pet5PSId] === null) {
          this.questionForm[this.uptakeFromBaselineId] = ''
        }
      }
    },
+    setfocalFDG() {
+      console.log('setfocalFDG')
+      if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.focalFDGId] === '1') {
+        this.questionForm[this.focalFDGId] = ''
+      } 
+    },
    setpet5PS() {
      console.log('setpet5PS')
      // 无需标记，自主选择   1分
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@ -781,7 +781,8 @@ export default {
      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
      var criterionType = this.$router.currentRoute.query.criterionType
      var readingTool = this.$router.currentRoute.query.readingTool
-      var path = `/readingDicoms?trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+      var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      const routeData = this.$router.resolve({ path })
      window.open(routeData.href, '_blank')
    },
--- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
@ -356,11 +356,12 @@ export default {
      var readingTool = this.$router.currentRoute.query.readingTool
      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
      var path = ''
      if (readingTool === 0) {
-        path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      } else {
-        path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      }
      const routeData = this.$router.resolve({ path })
      var newWindow = window.open(routeData.href, '_blank')
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@ -360,9 +360,10 @@ export default {
      var readingTool = this.$router.currentRoute.query.readingTool
      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
      var path = ''
      if (readingTool === 0) {
-        path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      } else {
        path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      }
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
@ -353,11 +353,12 @@ export default {
      var readingTool = this.$router.currentRoute.query.readingTool
      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
      var path = ''
      if (readingTool === 0) {
-        path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      } else {
-        path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      }
      const routeData = this.$router.resolve({ path })
      var newWindow = window.open(routeData.href, '_blank')
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
@ -347,11 +347,12 @@ export default {
      var readingTool = this.$router.currentRoute.query.readingTool
      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
      var path = ''
      if (readingTool === 0) {
-        path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      } else {
-        path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
      }
      const routeData = this.$router.resolve({ path })
      var newWindow = window.open(routeData.href, '_blank')
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@ -460,15 +460,16 @@ export default {
      try {
        var token = getToken()
        var visitTaskId = row.VisitTaskId
+        var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
        var criterionType = this.$router.currentRoute.query.criterionType
        var readingTool = this.$router.currentRoute.query.readingTool
        readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
        var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
        var path = ''
        if (readingTool === 0) {
-          path = `/readingDicoms?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+          path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
        } else {
-          path = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+          path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
        }
        const routeData = this.$router.resolve({ path })
        this.openWindow = window.open(routeData.href, '_blank')