Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -1942,11 +1942,12 @@ export default {
                   }
                 })
                 let newArr = Object.values(objInfo);
-                console.log("newArrwowoowowowo",newArr)
+                console.log("newArrwowoowowowo",this.records[i].his_advices)
                 if(newArr!=null && newArr.length >0){
                   for(let y=0;y<newArr.length;y++){
                     for(let z=0;z<this.records[i].his_advices.length;z++){
-                       if(newArr[y].new_groupno == this.records[i].his_advices[z].new_groupno){
+                       if(newArr[y].new_groupno == this.records[i].his_advices[z].new_groupno && 
+                          this.records[i].his_advices[z].execution_frequency.indexOf('上机前')==-1){
                           newArr[y].child.push(this.records[i].his_advices[z])
                        }
                     }