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

build/cdn.json

 {
-  "version": "2999.999.13756"
+  "version": "2999.999.13766"
 }

src/pages/main/newActionBar/doctorAdvice.vue

         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
             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 {
             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'
         }
             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]
             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})
         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) {
           return false
         })
       } else {
+        console.log("执行---------------",exceParams)
         ExecDoctorAdvice(exceParams).then(response => {
           if (response.data.state == 0) {
             Toast.fail(response.data.msg)
             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 {
             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'
         }
             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]
             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})
         })
       } else {
 
-
+        console.log("执行--------------",exceParams)
         ExecDoctorAdvice(exceParams).then(response => {
           if (response.data.state == 0) {
             Toast.fail(response.data.msg)
         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