Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1859,9 +1859,12 @@
                         </td>
 
 
-                        <td v-if="org_id == 10375 || org_id == 0"><br />
+                        <td v-if="org_id == 10375"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
+                        <td v-if="org_id == 10489 || org_id == 0"><br />
+                          {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}
+                        </td>
                         <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
                           <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
@@ -1871,9 +1874,6 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td v-if="org_id == 10489 || org_id == 0"><br />
-                          {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
-                        </td>
                         <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id == 0"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 || org_id == 0">

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -38,6 +38,7 @@
         <td colspan="3">{{info.number}}</td>
       </tr>
       <tr>
+
         <td width="80">姓名</td>
         <td width="80">{{info.psn_name}}</td>
         <td width="80">性别</td>
@@ -47,22 +48,21 @@
         <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>
@@ -74,7 +74,6 @@
         <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>
@@ -96,7 +95,7 @@
         <td>住院号</td>
         <td>{{info.number}}</td>
         <td>科别</td>
-        <td width="100"></td>
+        <td width="100">血透室</td>
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
@@ -245,8 +244,8 @@
         <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>