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

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -857,7 +857,7 @@
                             : "/"
                         }}
                          </span>
-                         {{dialysisOrder.dialysis_irrigation  }}
+                         {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
 
                       </div>
                     </div>
@@ -2088,7 +2088,7 @@
                       导管：
                       <div
                         class="under_line"
-                        style="min-width: 120px; text-align: center"
+                        style="width: 120px; text-align: center;white-space: normal"
                       >
                         {{
                           afterdialysis.catheter ? afterdialysis.catheter : "/"
@@ -2519,6 +2519,7 @@
                   </div>
                 </td>
               </tr>
+              <!--  -->
               <tr v-if="(org_id ==10677 || org_id == 0) && dialysisOrder.quality_nurse_id>0">
                 <td colspan="7" >
                   <div

src/xt_pages/hospitalStation/index.vue

@@ -242,10 +242,12 @@ export default {
       loadingone: false,
       read_loading: false,
       registers: [
+        { value: 240101, label: '门诊视同住院' },
         { value: 21, label: '普通住院' },
         // {value: 12, label: '门诊挂号'},
         // {value: 13, label: '急诊'},
         { value: 14, label: '门诊慢性病' }
+
         // {value: 15, label: '门诊统筹'},
         // {value: 16, label: '门诊慢性病'},
         // {value: 21, label: '普通住院'}

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -7,7 +7,7 @@
         <div>透析号：{{ patient.dialysis_no }}</div>
         <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
         <div>年龄：{{ patient.age }} 岁</div>
-        <div v-if="$store.getters.xt_user.org_id  != 0">处方日期：{{ gettime(order.setl_time) }}
+        <div v-if="$store.getters.xt_user.org_id  == 10644">处方日期：{{ gettime(order.setl_time) }}
           <!-- {{ hospital.in_hosptial_time }} 至
           {{ hospital.out_hosptial_time }} -->
         </div>