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

src/xt_pages/outpatientDoctorStation/print.vue

@@ -14,18 +14,20 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 9675">
-        <printSix
-          v-if="org_id != 10088 && org_id != 10215"
-          v-bind:childResponse="childResponse"
-          :advicePrint="advicePrint"
-          :ids="ids"
-          :patient="patient"
-          :hisPatient="hisPatient"
-          :doctorPorject="doctorPorject"
-          :patient_id="patient_id"
-          :record_date="record_date"
-          :prescription_id="prescription_id"
-        ></printSix>
+        <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+
+        <!--        <printSix-->
+<!--          v-if="org_id != 10088 && org_id != 10215"-->
+<!--          v-bind:childResponse="childResponse"-->
+<!--          :advicePrint="advicePrint"-->
+<!--          :ids="ids"-->
+<!--          :patient="patient"-->
+<!--          :hisPatient="hisPatient"-->
+<!--          :doctorPorject="doctorPorject"-->
+<!--          :patient_id="patient_id"-->
+<!--          :record_date="record_date"-->
+<!--          :prescription_id="prescription_id"-->
+<!--        ></printSix>-->
         <printFour
           v-if="org_id == 10088"
           v-bind:childResponse="childResponse"