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.13754"
+  "version": "2999.999.13755"
 }

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -1958,7 +1958,7 @@ export default {
         }
         const advicearr = []
         for(let i in this.doctor_advices){
-          if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
+          if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服' && this.doctor_advices[i].advice_name.indexOf('胰岛素')==-1){
             if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
               advicearr.push(this.doctor_advices[i])
             }

src/pages/main/today/TodayTab.vue

@@ -1424,7 +1424,7 @@ export default {
 
                 //针对 濉溪杏康血液透析中心
                 if(this.$store.getters.user.template_info.org_id == 10721){
-                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1){
+                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1 && his_doctor_advices[i].advice_name.indexOf("胰岛素")==-1){
                     doctor_advices.push(his_doctor_advices[i])
                   }
                 }else{
@@ -1436,7 +1436,7 @@ export default {
                   doctor_advices = []
                   //针对 濉溪杏康血液透析中心
                   if(this.$store.getters.user.template_info.org_id == 10721){
-                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1){
+                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1 && his_doctor_advices[i].advice_name.indexOf("胰岛素")==-1){
                       doctor_advices.push(his_doctor_advices[i])
                     }
                   }else{