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

src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue

@@ -11,8 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              <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>

src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue

@@ -11,8 +11,8 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
-                <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
+              <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>

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -260,7 +260,11 @@ export default {
       if (Object.keys(this.medicalReviewInfo).length > 0) {
         for (const k in this.form) {
           if (this.medicalReviewInfo.hasOwnProperty(k)) {
-            this.form[k] = this.medicalReviewInfo[k];
+            if (k === 'IsHaveQuestion' && this.medicalReviewInfo.AuditState === 0) {
+              this.form[k] = null
+            } else {
+              this.form[k] = this.medicalReviewInfo[k]
+            }
           }
         }
         this.fileList = [];