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

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -292,7 +292,7 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0){
+                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0 && this.org_id!=10633){
                         if(this.project[index].project.length > 0){
                             this.project[index].project.map(it => {
                             let obj = {

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1365,11 +1365,11 @@ export default {
           name = ""
        }
 
-       if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0){
+       if(this.org_id == 9671 || this.org_id == 10340){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name} });
        }
 
-       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0){
+       if(this.org_id != 9671 && this.org_id != 10340){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
        }