src/views/dictionary/template/components/TableQsForm.vue

@@ -327,26 +327,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
-          <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.TableQuestionType === 0" label="默认值">
-          <el-select v-model="form.DefaultValue" clearable>
-            <el-option
-              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
@@ -628,8 +608,7 @@ export default {
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
         ExportIdentification: 0,
-        ExportResult: [],
-        DefaultValue:null
+        ExportResult: []
         // IsEnable: true
       },
       rules: {
@@ -933,7 +912,6 @@ export default {
       form.ClassifyAlgorithms = null
       form.ExportIdentification = 0
       form.ExportResult = []
-      form.DefaultValue = null
     },
     close() {
       this.$emit('close')

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

@@ -1195,7 +1195,7 @@ export default {
     })
     DicomEvent.$on('addAnnotation', async obj => {
       this.tmpData = Object.assign({}, obj.question)
-      // await this.imageLocation(obj.locateInfo)
+      await this.imageLocation(obj.locateInfo)
       this.setToolActive('Probe', true, null, 'tableQuestion')
     })
     window.addEventListener('beforeunload', () => {

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

@@ -149,7 +149,7 @@
         <el-radio-group
           v-else-if="qs.Type==='radio'"
           v-model="questionForm[qs.Id]"
-          :disabled="!isCurrentTask || readingTaskState>=2 || (qs.QuestionMark === 1105 && isDisabledMeasurableRadio)"
+          :disabled="!isCurrentTask || readingTaskState>=2"
           @change="((val)=>{formItemChange(val, qs)})"
         >
           <template v-if="qs.DictionaryCode.length > 0">
@@ -272,8 +272,7 @@ export default {
       markList: [],
       digitPlaces: 2,
       isMeasurableId: '',
-      isExitsMarks: false,
-      isDisabledMeasurableRadio: false
+      isExitsMarks: false
     }
   },
   mounted() {
@@ -319,13 +318,11 @@ export default {
       this.originalQuestionForm = { ...this.questionForm }
       this.markList = []
       this.isExitsMarks = false
-      this.isDisabledMeasurableRadio = false
       if (this.answers.TableQuestionMarkList) {
         let arr = JSON.parse(this.answers.TableQuestionMarkList)
         arr.map(i=>{
           if (i.MeasureData) {
             this.isExitsMarks = true
-            this.isDisabledMeasurableRadio = true
           }
           this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1})
         })
@@ -374,6 +371,38 @@ export default {
         return ''
       }
     },
+    getOrganInfoList(isLymphNodes = null) {
+      return new Promise(async resolve => {
+        // var param = {
+        //   trialId: this.trialId,
+        //   visitTaskId: this.visitTaskId,
+        //   lesionType: this.lesionType,
+        //   isEnable: true
+        // }
+        // if (isLymphNodes !== undefined && isLymphNodes !== null) {
+        //   param.isLymphNodes = isLymphNodes
+        // }
+        // getTrialOrganList(param).then(res => {
+        //   this.organList = res.Result
+        //   resolve()
+        // })
+        if (!sessionStorage.getItem('organList')) {
+          await store.dispatch('reading/getOrganInfo', this.visitTaskId)
+        }
+        var organList = sessionStorage.getItem('organList') ? JSON.parse(sessionStorage.getItem('organList')) : []
+        var idx = organList.findIndex(i => i.LesionType === this.lesionType)
+        if (idx > -1) {
+          organList = organList[idx].OrganList
+
+          if (!isNaN(parseInt(isLymphNodes))) {
+            this.organList = organList.filter((item) => item.IsLymphNodes === parseInt(isLymphNodes))
+          } else {
+            this.organList = organList
+          }
+        }
+        resolve()
+      })
+    },
     async formItemChange(v, qs) {
       // 维护平均值、是否可测量等信息
       this.$set(this.questionForm, 'saveTypeEnum', 1)
@@ -384,11 +413,6 @@ export default {
           let meanId = this.getQuestionId(1104)
           this.$set(this.questionForm, meanId, newMean ? newMean : '')
         } 
-      } else if (qs.QuestionMark === 1105) {
-        if (!v) {
-          let meanId = this.getQuestionId(1104)
-          this.$set(this.questionForm, meanId, 'NA')
-        }
       }
       const isMeasurable = this.getQuestionVal(1105)
       this.$emit('resetQuestions', { mean, isMeasurable, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
@@ -403,7 +427,7 @@ export default {
         mean = sum / 3
       }
 
-      return mean ? mean.toFixed(this.digitPlaces) : '';
+      return mean ? mean.toFixed(this.digitPlaces) : null;
     },
     setMeasureData(measureData, isInit = false) {
       return new Promise(resolve => {
@@ -451,17 +475,11 @@ export default {
           this.markList[i].saveEnum = 0
           this.markList[i].measureData = data
         }
-        this.isDisabledMeasurableRadio = true
+        
         resolve()
       })
     },
     addAnnotation(qs) {
-      // 判断是否有测量数据未保存
-      let i = this.markList.findIndex(i=>i.saveEnum === 0)
-      if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
-        this.$message.warning(this.$t('trials:MRIPDFF:message:message3'))
-        return
-      }
       let orderMarkName = this.getLesionName(this.orderMark, qs.QuestionMark)
       this.activeQuestionId = qs.Id
       this.activeQuestionMark= qs.QuestionMark
@@ -483,9 +501,6 @@ export default {
         return false
       }
     },
-    getIsExitsMarks() {
-      return this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false
-    },
     async removeAnnotation(qs) {
       let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
       DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.markList[i].measureData.OrderMarkName, lesionType: null, markTool: 'Probe', readingTaskState: this.readingTaskState, isMarked: true })
@@ -509,7 +524,6 @@ export default {
       this.$set(this.questionForm, this.markList[i].tableQuestionId, '')
       let meanId = this.getQuestionId(1104)
       this.$set(this.questionForm, meanId, '')
-      this.isDisabledMeasurableRadio = this.getIsExitsMarks()
     },
     locateAnnotation(qs) {
       let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
@@ -684,7 +698,7 @@ export default {
         let l3Id = this.getQuestionId(1103)
         this.$set(this.questionForm, l3Id, '')
         let meanId = this.getQuestionId(1104)
-        this.$set(this.questionForm, meanId, 'NA')
+        this.$set(this.questionForm, meanId, '')
       }
       
       const loading = this.$loading({ fullscreen: true })
@@ -730,7 +744,7 @@ export default {
             const isMeasurable = this.getQuestionVal(1105)
             const mean = this.getQuestionVal(1104)
             this.$emit('resetQuestions', { isMeasurable, mean, saveTypeEnum: this.questionForm.saveTypeEnum,rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-            this.$emit('close')
+            // this.$emit('close')
             DicomEvent.$emit('getReportInfo', true)
             DicomEvent.$emit('setMeasuredToolsPassive')
             if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && isResetMarks) {

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

@@ -548,19 +548,6 @@ export default {
                     if (item.Childrens[liverSegmentIdx].Answer.length > 0) {
                       let v = item.Childrens[liverSegmentIdx].Answer[0].Answer
                       obj.QuestionName = this.$fd(item.Childrens[liverSegmentIdx].DictionaryCode, parseInt(v))
-                      let Answers = {}
-                      let mean = item.Childrens.findIndex(i => i.QuestionMark === 1104)
-                      if (mean > -1) {
-                        this.visitTaskList.forEach(v => {
-                          const o = item.Childrens[mean].Answer.find(v1 => {
-                            return v1.VisitTaskId === v.VisitTaskId
-                          })
-                          if (o) {
-                            Answers[o.VisitTaskId] = o.Answer
-                          }
-                        })
-                      }
-                      this.$set(obj, 'Answers', Answers)
                     }
                   }
                 }