Merge remote-tracking branch 'origin/20220812' into 20220812

src/xt_pages/data/components/addDrugs.vue

@@ -621,7 +621,7 @@
           is_user:"2",
           sum_count:"",
           sum_in_count:"",
-          is_pharmacy:0,//是否通过药房发药
+          is_pharmacy:1,//是否通过药房发药
         },
 
         rules: {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -792,7 +792,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290&&org_id!=9675">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
                       灌流器：
                       <div
                         class="under_line"
@@ -805,10 +805,10 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id==10290||org_id==9675">
+                    <div class="inline_block" style="flex: 1" v-if="org_id==10290">
                       透析器/灌流器：
                       <div
-                        class="under_line"78
+                        class="under_line"
                         style="width: 100px; text-align: center"
                       >
                         {{