From 7bbf60dd7cc26b2e3d0709397ae7fae9ca96a843 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Mar 2024 14:15:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E4=B8=8B=E4=B8=80=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/qc-check/components/qualityAssurance.vue     |  4 ++--
 src/views/trials/trials-panel/visit/qc-check/index.vue | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 365da61e..bfd8d2f9 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1417,7 +1417,7 @@ export default {
             trialId: this.trialId,
             SubjectId: this.data.SubjectId
           }).then(res => {
-            if (res.Result) {
+            if (res.Result&&res.Result.VisitId) {
               this.$confirm(this.$t('trials:qcQuality:title:title2', '', {
                 showCancelButton: false
               })).then(() => {
@@ -1426,7 +1426,7 @@ export default {
                   SubjectId: this.data.SubjectId
                 }).then(res => {
                   this.$emit('getList')
-                  this.$emit('nextTask')
+                  this.$emit('nextTask',res.Result.VisitId);
                 })
               })
             } else {
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index c5ac6174..332b6862 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -923,9 +923,15 @@ export default {
             })
         }).catch(() => {})
     },
-    nextTask() {
+    nextTask(visitId = null) {
       this.loading = true
-      getNextQCInfo({ trialId: this.trialId }).then(res => {
+      let obj = {
+        trialId: this.trialId
+      }
+      if(visitId){
+        obj.visitId = visitId;
+      }
+      getNextQCInfo(obj).then(res => {
         this.loading = false
         this.qcVisible = false
         if (res.Result) {

From c31a92fbaa26e71486e19e1e6fceddae567a4308 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Mar 2024 14:45:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E6=97=A0=E5=90=8E=E7=BB=AD=E4=BB=BB=E5=8A=A1=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/qc-check/components/qualityAssurance.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index bfd8d2f9..6021d0b3 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1430,6 +1430,7 @@ export default {
                 })
               })
             } else {
+              this.$emit('getList')
               this.$alert('没有后续质控任务')
             }
           })