From efe3d937b4dbbe38db0aa49949970ac586096f67 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:16:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/medical-feedback/components/ChatForm.vue       | 7 +++----
 .../reading/mim-medical-audit/components/ChatForm.vue      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index ccf2b913..3907976a 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,9 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
-                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
 
               </template>
               <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
@@ -60,7 +59,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
                 <div>{{ record.Content }}</div>
               </template>
 
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 58a8f22f..7e4f6b7b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,9 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt)">
-                <div v-if="record.MedicalDialogCloseEnum!== null">{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-                <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
 
               </template>
               <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
@@ -60,7 +59,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 

From e0f42e815ebf71eee91366c02da36d3556ffe09b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:26:03 +0800
Subject: [PATCH 2/2] 1

---
 .../medical-feedback/components/ChatForm.vue       | 14 +++++++-------
 .../mim-medical-audit/components/ChatForm.vue      | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 3907976a..5abce1aa 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,12 +11,9 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
+                  111
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
                   <ol style="font-weight: bold;">
@@ -59,11 +56,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content ">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 7e4f6b7b..bb717a57 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,11 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
-
-              </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
+              
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -59,11 +56,14 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              </template>
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
+              <template v-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>