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/batch_print/batch_print_order_seventynine.vue

                           姓 名:{{ record.patient.name }}
                         </div>
                         <div style="flex: 1;">
-                          年 龄:{{getNewAge(record.patient.id_card_no) }}岁
+                          性 别:{{ record.patient.gender == 1 ? "男" : "女" }}
                         </div>
                         <div style="flex: 1;">
-                          性 别:{{ record.patient.gender == 1 ? "男" : "女" }}
+                          年 龄:{{getNewAge(record.patient.id_card_no) }}岁
                         </div>
                         <div style="flex: 1;">
                           透析号:{{ record.patient.dialysis_no }}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                          <td width="50" v-if=" org_id ==0 || org_id ==10164">超滤率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683  && org_id!=0">超滤量<br />(ml)</td>
+                          <td width="50" v-if=" org_id ==0 || org_id ==10489">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                                        : ""
                                    }}
                          </td>
-                          <td v-if="org_id!=10683&& org_id!=0">
+                          <td v-if="org_id!=10683">
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
                               monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

                     姓 名:{{ patientInfo.name ? patientInfo.name : "/" }}
                   </div>
                   <div style="flex: 1;">
-                    年 龄:{{ getAge(patientInfo) }}岁
+                    性 别:{{ patientInfo.gender ? patientInfo.gender : "/" }}
                   </div>
                   <div style="flex: 1;">
-                    性 别:{{ patientInfo.gender ? patientInfo.gender : "/" }}
+                    年 龄:{{ getAge(patientInfo) }}岁
                   </div>
                   <div style="flex: 1;">
                     透析号:{{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "/" }}