新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1774,7 +1774,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402">
+                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1946,7 +1946,7 @@
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402">
+                 <tr v-if="org_id == 10402 || org_id == 0 || org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>

src/xt_pages/dialysis/details/consumable/dialysisParameterCountPrint.vue

@@ -40,8 +40,8 @@
                </tr>
               </tbody>
             </table>
-            
-         
+
+
 
           </div>
         </div>
@@ -103,7 +103,7 @@
      this.getDialysisParameterGoodList()
     },
     methods: {
-    
+
      getTimeOne(val) {
         if(val == ""){
         return ""
@@ -134,7 +134,7 @@
             this.startdialogVisible = true
             var list = response.data.data.list
             console.log("list232323223222wid",list)
-            
+
             var anticoagulantList = []
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
@@ -226,7 +226,7 @@
                 hisarr[i].count = hisarr[i].child.length
                 this.tableList.push(hisarr[i])
               }
-             
+
             }
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
@@ -234,8 +234,8 @@
             var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-              
-               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
+
+               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])
              }
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
               dialyzerPerfusionApparaArr.push(list[i].dialyzer_perfusion_apparatus_arr[z])
@@ -250,7 +250,7 @@
             console.log("透析器",dialysisDialyszersArr)
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
             console.log("灌流器",dialysisIrrigationArr)
-             
+
            let obj = {}
            let objOne = {}
            let objTwo = {}
@@ -271,15 +271,15 @@
               a.specification_name = i
               Arr.push(a);
             }
-          
+
            for(let i=0;i<dialyzerPerfusionApparaArr.length;i++){
             if(objOne[dialyzerPerfusionApparaArr[i]]){
                 objOne[dialyzerPerfusionApparaArr[i]] +=1
              }else{
               objOne[dialyzerPerfusionApparaArr[i]] = 1
-             }   
+             }
            }
-           
+
            for (let i in objOne) {
               let a = {};
               a[i] = objOne[i];
@@ -294,7 +294,7 @@
               objTwo[dialysisIrrigationArr[i]] +=1
              }else{
               objTwo[dialysisIrrigationArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objTwo) {
@@ -322,7 +322,7 @@
               objThree[dialysisStrainerArr[i]] +=1
              }else{
               objThree[dialysisStrainerArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objThree) {
@@ -333,13 +333,14 @@
               a.specification_name = i
               Arr.push(a);
             }
-           
-         
+
+
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){
                  this.tableList.push(Arr[i])
               }
             }
+
            }
         })
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4359,6 +4359,19 @@ export default {
         }
       
         console.log("时间我我我哦我我",this.doctor_advices)
+        if(this.org_id == 10265){
+          var docArr = []
+          if(this.doctor_advices!=null && this.doctor_advices.length>0){
+            for(let i=0;i<this.doctor_advices.length;i++){
+              if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
+                  docArr.push(this.doctor_advices[i])
+              }
+            }
+          }
+          this.doctor_advices = [] 
+          this.doctor_advices = docArr
+        }
+       
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;