From 37db1c2a2635335647514d9aa7ca95b27ca2d236 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 8 May 2024 14:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=A1=E6=81=AF=E6=98=AF=E5=90=A6=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/ReportPage.vue           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 5b7729b..9cfe336 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -200,7 +200,7 @@
                         @change="evaluateReasonChange"
                       />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="tumorEvaluate && currentEvaluateResult && parseInt(currentEvaluateResult) !== parseInt(tumorEvaluate)" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:message:msg6').replace('***', $fd('CriterionType', CriterionType)) }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',tumorEvaluate) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',tumorEvaluate) }}</span>{{ $t('trials:readingReport:message:msg7') }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',currentEvaluateResult) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',currentEvaluateResult) }}</span>{{ $t('trials:readingReport:message:msg8') }}</p>
+                      <p v-if="tumorEvaluate && currentEvaluateResult && parseInt(currentEvaluateResult) !== parseInt(tumorEvaluate)" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:message:msg6').replace('***', $fd('CriterionType', CriterionType)) }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',tumorEvaluate) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',tumorEvaluate) }}</span>{{ $t('trials:readingReport:message:msg7') }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',currentEvaluateResult) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',currentEvaluateResult) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',currentEvaluateResult) }}</span>{{ $t('trials:readingReport:message:msg8') }}</p>
                       <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}</p>
                     </template>
                     <!-- <template v-else>
@@ -611,7 +611,7 @@ export default {
               this.currentExistDisease = obj.Answers[this.visitTaskId]
               this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: 15 })
             }
-            if (item.QuestionType === 13 || item.QuestionType === 42) {
+            if (item.QuestionType === 13 || item.QuestionType === 42 || item.QuestionType === 21) {
               this.currentEvaluateResult = obj.Answers[this.visitTaskId]
               this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: item.QuestionType })
             }
@@ -657,7 +657,7 @@ export default {
       }
       this.currentTaskReason = ''
       this.evaluateReasonChange('')
-      var idx = this.answerArr.findIndex(i => i.questionType === 13 || i.questionType === 42)
+      var idx = this.answerArr.findIndex(i => i.questionType === 13 || i.questionType === 42 || i.questionType === 21)
       if (idx > -1) {
         this.answerArr[idx].answer = val
       }
@@ -838,7 +838,7 @@ export default {
         this.answers = []
         var isExistEvaluateResult = false
         this.answerArr.map(item => {
-          if (item.questionType === 13 || item.questionType === 42) {
+          if (item.questionType === 13 || item.questionType === 42 || item.questionType === 21) {
             evaluateResult = item.answer
             isExistEvaluateResult = true
           }
@@ -870,7 +870,7 @@ export default {
           reject()
           return
         }
-        if (isExistEvaluateResult && (evaluateResult !== this.tumorEvaluate) && !evaluateAjustReason) {
+        if (this.tumorEvaluate !== null && isExistEvaluateResult && (evaluateResult !== this.tumorEvaluate) && !evaluateAjustReason) {
           // 请填写整体评估调整原因
           this.$confirm(this.$t('trials:readingReport:message:msg3'), {
             type: 'warning',