Browse Source

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

28169 4 months ago
parent
commit
bebd371d23

+ 4 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue View File

1947
                   for(let y=0;y<newArr.length;y++){
1947
                   for(let y=0;y<newArr.length;y++){
1948
                     for(let z=0;z<this.records[i].his_advices.length;z++){
1948
                     for(let z=0;z<this.records[i].his_advices.length;z++){
1949
                        if(newArr[y].new_groupno == this.records[i].his_advices[z].new_groupno && 
1949
                        if(newArr[y].new_groupno == this.records[i].his_advices[z].new_groupno && 
1950
-                          this.records[i].his_advices[z].execution_frequency.indexOf('上机前')==-1){
1950
+                          this.records[i].his_advices[z].execution_frequency.indexOf('上机前')==-1 &&
1951
+                          this.records[i].his_advices[z].delivery_way.indexOf('口服') ==-1 && 
1952
+                          this.records[i].his_advices[z].delivery_way!='中药口服' && 
1953
+                          this.records[i].his_advices[z].advice_name.indexOf('胰岛素') ==-1){
1951
                           newArr[y].child.push(this.records[i].his_advices[z])
1954
                           newArr[y].child.push(this.records[i].his_advices[z])
1952
                        }
1955
                        }
1953
                     }
1956
                     }