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

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

@@ -802,7 +802,11 @@ export default {
     if (this.petctWindow) {
       this.petctWindow.close()
     }
-    window.removeEventListener('beforeunload')
+    window.removeEventListener('beforeunload', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
   },
   methods: {
     getWwcTpl() {

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

@@ -907,6 +907,7 @@ export default {
         await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: questionsObj.measureData, questionId: questionsObj.questionId, rowIndex: questionsObj.rowIndex })
 
         questionsObj.measureData.data.remark = lesionMark
+        lesionObj.MarkTool = questionsObj.measureData.type
         lesionObj.MeasureData = JSON.stringify(questionsObj.measureData)
       }
 

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

@@ -69,7 +69,7 @@
               @focus="focusQs = {...qs}"
               @change="((val)=>{formItemChange(val, qs)})"
             >
-              <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
+              <template v-if="qs.Unit" slot="append">
                 {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
               </template>
             </el-input>
@@ -296,7 +296,7 @@ export default {
       } else if (!reg.test(value) || (parseInt(value) > 99 || parseInt(value) <= 0)) {
         callback(new Error(this.$t('trials:readingPGWC:warnning:msg1')))
       } else if (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber)) {
-        callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber))
+        callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber + this.$fd('ValueUnit', 3)))
       } else {
         callback()
       }

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

@@ -64,7 +64,7 @@
                             {{ item.TableQuestions.Answers[i].lesionType }}
                           </div>
                           <div v-if="!isNaN(parseInt(item.TableQuestions.Answers[i].lesionNum)) && item.LesionType === 4" style="margin-left:10px;">
-                            {{ item.TableQuestions.Answers[i].lesionNum }}
+                            {{ item.TableQuestions.Answers[i].lesionNum }}{{$fd('ValueUnit', 3)}}
                           </div>
                         </div>
                       </div>

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

@@ -24,7 +24,7 @@
             {{ $t('trials:readingReport:button:refresh') }}
           </el-button>
           <el-button
-            v-if="readingTaskState<2 && CriterionType !== 10"
+            v-if="readingTaskState<2"
             type="primary"
             size="small"
             @click="handleSave(true)"
@@ -96,7 +96,7 @@
             </template>
             <template slot-scope="scope">
               <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) ? '#f66' : '#fff'}">
-                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
+                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,21,42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
                   <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
                     <el-select
@@ -150,6 +150,25 @@
                       </template>
                     </el-select>
                   </template>
+                  <!-- 访视点肿瘤评估 -->
+                  <template v-else-if="!task.IsBaseLine && scope.row.QuestionType=== 21">
+                    <el-select
+                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                      v-model="currentEvaluateResult"
+                      size="mini"
+                      @change="handleEvaluateResultChange"
+                    >
+                      <template>
+                        <el-option
+                          v-for="item of $d[ scope.row.DictionaryCode]"
+                          v-show="task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1"
+                          :key="item.id"
+                          :value="item.value"
+                          :label="item.label"
+                        />
+                      </template>
+                    </el-select>
+                  </template>
                   <!-- <template v-else-if="task.IsBaseLine && scope.row.QuestionType=== 13">
                     {{ $fd(scope.row.DictionaryCode, currentEvaluateResult) }}
                   </template> -->

src/views/trials/trials-panel/reading/dicoms/index.vue

@@ -134,24 +134,24 @@
         <!-- 提示 -->
         {{ $t('trials:iRecist:warnning:msg44') }}
       </span>
-      <div>
-        <div>
+      <div style="line-height: 24px;">
+        <div style="font-size: 14px;font-weight: bold;">
           <!-- 您确定当前访视的整体评估结果为PD。根据《独立影像评估章程》，该访视进入iRECIST阅片环节。请对新病灶进行重新评估： -->
           {{ $t('trials:iRecist:warnning:msg45') }}
         </div>
-        <div style="color: #f44336;font-size: 12px;margin: 5px;">
+        <div style="color: #f44336;font-size: 13px;margin: 5px;">
           <!-- （1）新病灶可转为：新靶病灶、新非靶病灶、其它既往新病灶。 -->
           {{ $t('trials:iRecist:warnning:msg46') }}
         </div>
-        <div style="color: #f44336;font-size: 12px;margin: 5px;">
+        <div style="color: #f44336;font-size: 13px;margin: 5px;">
           <!-- （2）新靶病灶：状态为明确的新病灶才能转换为新靶病灶。新靶病灶的选择规则与RECIST1.1相同；如果当前病灶已有标记，但不符合新靶病灶的要求，请清除标记，重新标注。 -->
           {{ $t('trials:iRecist:warnning:msg47') }}
         </div>
-        <div style="color: #f44336;font-size: 12px;margin: 5px;">
+        <div style="color: #f44336;font-size: 13px;margin: 5px;">
           <!-- （3）新非靶病灶：状态为明确的新病灶才能转换为新非靶病灶。新靶病灶的选择规则与RECIST1.1相同。 -->
           {{ $t('trials:iRecist:warnning:msg48') }}
         </div>
-        <div style="color: #f44336;font-size: 12px;margin: 5px;">
+        <div style="color: #f44336;font-size: 13px;margin: 5px;">
           <!-- （4）其它既往新病灶：系统会自动将状态为疑似、消失的新病灶，转换为其它既往新病灶，无需修改。 -->
           {{ $t('trials:iRecist:warnning:msg49') }}
         </div>
@@ -345,7 +345,7 @@ export default {
           this.activeName = 'read'
           this.tabs = [this.activeName]
         }
-        if (!this.isConfirmTaskReminder && res.Result.IsBaseLineTask ) {
+        if (!this.isConfirmTaskReminder && res.Result.IsBaseLineTask && parseInt(this.criterionType) !== 10) {
           this.handleConfirmReminder()
         }
         if (this.firstTaskReadingCategory === 1 && res.Result.ReadingCategory === 1 && this.isReadingTaskViewInOrder && flag) {