Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13756"
+  "version": "2999.999.13766"
 }

src/pages/main/newActionBar/doctorAdvice.vue

@@ -488,14 +488,17 @@ export default {
         exceParams = {
           groupno: 0,
           advice_id: this.currentAdviceIdsStr,
-          execution_time: exceTime
+          execution_time: exceTime,
+          patient_id:this.$route.query.patient_id,
         }
       } else {
         var group = this.advice_groups[this.current_group_index]
         exceParams = {
           groupno: group.group_no <= 0 ? 0 : group.group_no,
           advice_id: group.group_no <= 0 ? group.advices[0].id : 0,
-          execution_time: exceTime
+          execution_time: exceTime,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
         }
       }
       exceParams['mode'] = 8
@@ -634,7 +637,8 @@ export default {
             groupno: 0,
             advice_id: this.currentAdviceIdsStr,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
           exceParams['mode'] = '6'
         } else {
@@ -648,7 +652,8 @@ export default {
             groupno: group.group_no <= 0 ? 0 : group.group_no,
             advice_id: str,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
           exceParams['mode'] = '6'
         }
@@ -659,7 +664,8 @@ export default {
             groupno: 0,
             advice_id: this.currentAdviceIdsStr,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
         } else {
           var group = this.advice_groups[this.current_group_index]
@@ -669,7 +675,8 @@ export default {
             groupno: group.group_no <= 0 ? 0 : group.group_no,
             advice_id: group.group_no <= 0 ? group.advices[0].id : 0,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
         }
         Toast.loading({forbidClick: true, duration: 0})
@@ -680,7 +687,8 @@ export default {
         let data = {
           execution_time: exceTime,
           project_id: this.advice_groups[this.current_group_index].advices[0].id,
-          record_date:this.$route.query.date
+          record_date:this.$route.query.date,
+          patient_id:this.$route.query.patient_id,
         }
         execProject(data).then(response => {
           if (response.data.state == 0) {
@@ -713,6 +721,7 @@ export default {
           return false
         })
       } else {
+        console.log("执行---------------",exceParams)
         ExecDoctorAdvice(exceParams).then(response => {
           if (response.data.state == 0) {
             Toast.fail(response.data.msg)
@@ -1120,7 +1129,8 @@ export default {
             groupno: 0,
             advice_id: this.currentAdviceIdsStr,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
           exceParams['mode'] = '6'
         } else {
@@ -1134,7 +1144,8 @@ export default {
             groupno: group.group_no <= 0 ? 0 : group.group_no,
             advice_id: str,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
           exceParams['mode'] = '6'
         }
@@ -1145,7 +1156,8 @@ export default {
             groupno: 0,
             advice_id: this.currentAdviceIdsStr,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
         } else {
           var group = this.advice_groups[this.current_group_index]
@@ -1155,7 +1167,8 @@ export default {
             groupno: group.group_no <= 0 ? 0 : group.group_no,
             advice_id: group.group_no <= 0 ? group.advices[0].id : 0,
             execution_time: exceTime,
-            record_date:this.$route.query.date
+            record_date:this.$route.query.date,
+            patient_id:this.$route.query.patient_id,
           }
         }
         Toast.loading({forbidClick: true, duration: 0})
@@ -1197,7 +1210,7 @@ export default {
         })
       } else {
 
-
+        console.log("执行--------------",exceParams)
         ExecDoctorAdvice(exceParams).then(response => {
           if (response.data.state == 0) {
             Toast.fail(response.data.msg)
@@ -1329,14 +1342,18 @@ export default {
         exceParams = {
           groupno: 0,
           advice_id: this.currentAdviceIdsStr,
-          execution_time: exceTime
+          execution_time: exceTime,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
         }
       } else {
         var group = this.advice_groups[this.current_group_index]
         exceParams = {
           groupno: group.group_no <= 0 ? 0 : group.group_no,
           advice_id: group.group_no <= 0 ? group.advices[0].id : 0,
-          execution_time: exceTime
+          execution_time: exceTime,
+          patient_id:this.$route.query.patient_id,
+          record_date:this.$route.query.date,
         }
       }
       exceParams['mode'] = 8