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/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 : "/" }}

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

         <td colspan="3">{{info.number}}</td>
       </tr>
       <tr>
+
         <td width="80">姓名</td>
         <td width="80">{{info.psn_name}}</td>
         <td width="80">性别</td>
         <td width="80">出生日期</td>
         <td width="100">{{getBirth(info.certno)}}</td>
         <td width="90">个人电脑号</td>
-        <td width="110"></td>
+        <td width="110">{{info.psn_no}}</td>
         <td width="80">人员类别</td>
+
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
         <td colspan="3" v-else-if="info.psn_type == '1101'">职工在职</td>
         <td colspan="3" v-else-if="info.psn_type == '1102'">公务员在职</td>
         <td colspan="3" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
         <td colspan="3" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
 
-
         <td colspan="3" v-else-if="info.psn_type == '12'">退休人员</td>
         <td colspan="3" v-else-if="info.psn_type == '1201'">职工退休</td>
         <td colspan="3" v-else-if="info.psn_type == '1202'">公务员退休</td>
         <td colspan="3" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
         <td colspan="3" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
 
-
         <td colspan="3" v-else-if="info.psn_type == '13'">离休</td>
         <td colspan="3" v-else-if="info.psn_type == '1300'">离休人员</td>
         <td colspan="3" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
         <td colspan="3" v-else-if="info.psn_type == '1404'">大学生</td>
         <td colspan="3" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
 
-
         <td colspan="3" v-else-if="info.psn_type == '15'">居民(成年)</td>
         <td colspan="3" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
         <td colspan="3" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
         <td>住院号</td>
         <td>{{info.number}}</td>
         <td>科别</td>
-        <td width="100"></td>
+        <td width="100">血透室</td>
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>诊察费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.zc_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_part_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.zc_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>合计</td>