From 472599c663b93f92732620e5ee7e16e4387a2128 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 10 Sep 2024 11:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A3=80=E9=AA=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadDicomAndNonedicom/dicomFile.vue       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index dc26511f..227c2fb4 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -661,17 +661,23 @@ export default {
           return this.$message.warning(
             this.$t('trials:uploadDicomList:message:maxFileSize')
           )
-        let StudyInstanceUidList = []
+        let StudyInstanceUidList = [],
+          confirmMessage = null
         for (let i = 0; i < checkFiles.length; i++) {
           let item = checkFiles[i]
           var dicom = await parseDicom(item, 'StudyInstanceUid')
           let has = true,
             has2 = false,
             has3 = false
+
           if (!this.VisitTaskId) {
             has = this.StudyInstanceUidList.some(
               (item) => item.StudyInstanceUid === dicom.StudyInstanceUid
             )
+            if (!has)
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:hasNotStudyUid'
+              )
           } else {
             has2 = this.StudyInstanceUidList.some((item) => {
               return (
@@ -685,6 +691,10 @@ export default {
                 item.VisitTaskId !== this.VisitTaskId
               )
             })
+            if (has2 || has3)
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:visitTaskIdNormal'
+              )
           }
 
           if (!has || has2 || has3) {
@@ -714,11 +724,14 @@ export default {
               this.hasOtherStudy = true
               checkFiles.splice(i, 1)
               i--
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:uploadOtherSubject'
+              )
             }
           }
         }
         if (this.hasOtherStudy) {
-          this.$confirm(this.$t('upload:dicom:confirmMessage:hasNotStudyUid'), {
+          this.$confirm(confirmMessage, {
             type: 'warning',
             distinguishCancelAndClose: true,
             confirmButtonText: this.$t('common:button:confirm'),