src/utils/dcmUpload/dcmjs.js

@@ -8535,7 +8535,7 @@
 	        for (i = 0; i < frames; i++) {
 	          var _needsPadding = Boolean(value[i].byteLength & 1);
 
-	        //   startOffset.push(binaryStream.size);
+	          startOffset.push(binaryStream.size);
 	          var frameBuffer = value[i],
 	              frameStream = new ReadBufferStream(frameBuffer);
 	          var fragmentsLength = 1;

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

@@ -157,8 +157,8 @@
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
         :title="addOrEdit.title" width="500px">
         <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :questions="qsList"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-            :question-form="qsForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
             @resetFormItemData="resetFormItemData" />
           <el-form-item style="text-align: right">
             <el-button size="small" @click="addOrEdit.visible = false">

src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue

@@ -107,7 +107,7 @@
       </el-form-item>
     </template>
 
-    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item" :questions="questions"
+    <QuestionTableFormItem v-for="item in question.Childrens" :key="item.Id" :question="item"
       :question-form="questionForm" :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
       @resetFormItemData="resetFormItemData" />
   </div>
@@ -129,12 +129,6 @@ export default {
         return []
       }
     },
-    questions: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
     readingTaskState: {
       type: Number,
       required: true
@@ -161,7 +155,6 @@ export default {
         }
         this.$emit('setFormItemData', { key: question.Id, val: v })
       }
-      this.resetChildValue(question, this.questions)
     },
     resetChild(obj) {
       obj.forEach(i => {
@@ -171,17 +164,6 @@ export default {
         }
       })
     },
-    resetChildValue(obj, arr) {
-      arr.some(item => {
-        if (item.ParentId === obj.Id) {
-          this.$emit('resetFormItemData', item.Id)
-        }
-        if (item.Childrens && item.Childrens.length > 0) {
-          this.resetChildValue(obj, item.Childrens)
-        }
-        return item.ParentId === obj.Id
-      })
-    },
     limitBlur(valueType, value) {
       if (isNaN(parseInt(value))) {
         value = null

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue

@@ -486,8 +486,8 @@ export default {
       }
     })
     DicomEvent.$on('operateImageMarker', (data) => {
-      let { operateStateEnum, QuestionId, picturePath, visitTaskId } = data
+      let { operateStateEnum, QuestionId, picturePath } = data
-      if (this.question.Id === QuestionId && visitTaskId === this.visitTaskId) {
+      if (this.question.Id === QuestionId) {
         this.operateImageMarker({ operateStateEnum, question: this.question, picturePath })
       }
     })
@@ -842,33 +842,17 @@ export default {
                   break;
               }
             } else {
-              switch (rules.CustomCalculateMark) {
+              if (this.questionForm[o.TableQuestionId] === 'NE') {
-                case 15:
+                isNE = true
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+              }
-                    num = Math.abs(this.questionForm[o.TableQuestionId])
+              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  }
+                num = parseFloat(this.questionForm[o.TableQuestionId])
-                  else {
+              } else {
-                    isNAN = true
+                isNAN = true
-                  }
+              }
-                  if (this.questionForm[o.TableQuestionId] === 'NE') {
+              if (!isNaN(num)) {
-                    isNE = true
+                dataArr.push(num)
-                  }
-                  break;
-                default:
-                  if (this.questionForm[o.TableQuestionId] === 'NE') {
-                    isNE = true
-                  }
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num = parseFloat(this.questionForm[o.TableQuestionId])
-                  } else {
-                    isNAN = true
-                  }
-                  if (!isNaN(num)) {
-                    dataArr.push(num)
-                  }
-                  break;
               }
-
             }
           } else {
             if (this.questionForm[o.TableQuestionId] === 'NE') {
@@ -955,7 +939,7 @@ export default {
                 break;
               case 15:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  num = Math.abs(this.questionForm[o.TableQuestionId])
+                  num = Math.abs(num)
                 }
                 else {
                   isNAN = true

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue

@@ -643,7 +643,7 @@ export default {
             if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
             const isTableMode = item.TableQuestionId
             if (!isTableMode && this.questionsMarkStatus[item.QuestionId] && !this.questionsMarkStatus[item.QuestionId].isSaved && this.questionsMarkStatus[item.QuestionId].isMarked) {
-              DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath, visitTaskId: this.visitTaskId })
+              DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath })
               break
             }
           }

src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue

@@ -535,15 +535,7 @@ export default {
                     }
                   })
                   num = arr1.length === 0 ? 0 : Math.min(...arr1)
-                  break;
+                  break
-                case 15:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num = Math.abs(this.questionForm[o.TableQuestionId])
-                  }
-                  else {
-                    isNAN = true
-                  }
-                  break;
               }
             } else {
               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -632,7 +624,7 @@ export default {
                 break;
               case 15:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                  num = Math.abs(this.questionForm[o.TableQuestionId])
+                  num = Math.abs(num)
                 }
                 break;
             }
@@ -645,7 +637,7 @@ export default {
         return 'NE'
       }
       if (isNAN) {
-        return false
+        return null
       }
       if (rules.ValueType === 2) {
         num = num * 100

src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue

@@ -148,15 +148,7 @@ export default {
             })
           break
         case 21:
-          searchData.ReadingExportType = 21
+          searchData.ReadingExportType = 18
-          getTumor_CDISC_Export(searchData)
-            .then((res) => { })
-            .catch(() => {
-              this.loading = false
-            })
-          break
-        case 22:
-          searchData.ReadingExportType = 22
           getTumor_CDISC_Export(searchData)
             .then((res) => { })
             .catch(() => {

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -389,7 +389,7 @@
               @change="(v) => CustomCalculateMarkChange(v)">
               <div>
                 <el-radio v-for="item of $d.CustomCalculateMark"
-                  v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14 || item.value === 15"
+                  v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14"
                   :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
@@ -451,10 +451,9 @@
               <template slot-scope="scope">
                 <!-- 添加 -->
                 <el-button icon="el-icon-plus" size="mini" circle :title="$t('trials:readingUnit:qsList:title:add')"
-                  @click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
+                  @click="addCustomCalculateMark(scope.$index)" />
                 <!-- 删除 -->
-                <el-button icon="el-icon-minus" size="mini" circle
+                <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
-                  :disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
                   :title="$t('trials:readingUnit:qsList:title:delete')"
                   @click="deleteCustomCalculateMark(scope.$index)" />
               </template>
@@ -895,7 +894,7 @@ export default {
     },
     CustomCalculateMarkChange() {
       this.isShow = false
-      if ((this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) && this.form.CustomCalculateMark < 15) {
+      if (this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) {
         this.form.CalculateQuestions = [
           {
             IsTable: false,

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -221,7 +221,7 @@
             <el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
               @change="(v) => CustomCalculateMarkChange(v)">
               <div>
-                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4 || item.value >= 15"
+                <el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4"
                   :key="`CustomCalculateMark${item.value}`" :label="item.value">
                   {{ item.label }}
                 </el-radio>
@@ -259,9 +259,8 @@
             <el-table-column :label="$t('common:action:action')" prop="TableQuestionId" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button icon="el-icon-plus" size="mini" circle :title="$t('common:button:add')"
-                  @click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
+                  @click="addCustomCalculateMark(scope.$index)" />
-                <el-button icon="el-icon-minus" size="mini" circle
+                <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
-                  ::disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
                   :title="$t('common:button:delete')" @click="deleteCustomCalculateMark(scope.$index)" />
               </template>
             </el-table-column>