陈少旭 7 kuukautta sitten
vanhempi
commit
a6a7f0643a

+ 18 - 1
src/xt_pages/outpatientCharges/statementPrint.vue Näytä tiedosto

1698
                     that.info['zc_cost_part_self_total'] = 0
1698
                     that.info['zc_cost_part_self_total'] = 0
1699
                   }
1699
                   }
1700
 
1700
 
1701
-
1701
+                  if(response.data.data.huliCostTotal){
1702
+                    that.info['huli_cost_total'] =
1703
+                      response.data.data.huliCostTotal
1704
+                  }else{
1705
+                    that.info['huli_cost_total'] = 0
1706
+                  }
1707
+                  if(response.data.data.huliCostSelfTotal){
1708
+                    that.info['huli_cost_self_total'] =
1709
+                      response.data.data.huliCostSelfTotal
1710
+                  }else{
1711
+                    that.info['huli_cost_self_total'] = 0
1712
+                  }
1713
+                  if(response.data.data.huliCostPartSelfTotal){
1714
+                    that.info['huli_cost_part_self_total'] =
1715
+                      response.data.data.huliCostPartSelfTotal
1716
+                  }else{
1717
+                    that.info['huli_cost_part_self_total'] = 0
1718
+                  }
1702
                   that.info['date'] = response.data.data.date
1719
                   that.info['date'] = response.data.data.date
1703
                   that.info['number'] = response.data.data.number
1720
                   that.info['number'] = response.data.data.number
1704
                   that.info['order_infos'] = response.data.data.order_infos
1721
                   that.info['order_infos'] = response.data.data.order_infos

+ 8 - 7
src/xt_pages/outpatientCharges/statementTemplate/printOne.vue Näytä tiedosto

238
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
238
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
239
       </tr>
239
       </tr>
240
       <tr>
240
       <tr>
241
-        <td>特殊治疗费</td>
242
-        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
243
-        <td style="text-align:right;padding-right:10px;">0</td>
244
-        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
241
+        <td>护理费</td>
242
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>
243
+        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>
244
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>
245
         <td>诊察费</td>
245
         <td>诊察费</td>
246
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_total}}</td>
246
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_total}}</td>
247
         <td style="text-align:right;padding-right:10px;">{{info.zc_cost_self_total}}</td>
247
         <td style="text-align:right;padding-right:10px;">{{info.zc_cost_self_total}}</td>
248
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_part_self_total}}</td>
248
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.zc_cost_part_self_total}}</td>
249
       </tr>
249
       </tr>
250
+
250
       <tr>
251
       <tr>
251
         <td>合计</td>
252
         <td>合计</td>
252
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
253
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
253
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
254
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
254
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
255
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
255
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
256
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
256
-          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)+ parseFloat(info.zc_cost_total)).toFixed(2) }}
257
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)+ parseFloat(info.zc_cost_total) +parseFloat(info.huli_cost_total)).toFixed(2) }}
257
         </td>
258
         </td>
258
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
259
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
259
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
260
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
260
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
261
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
261
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
262
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
262
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_self_total)).toFixed(2)}}
263
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_self_total) + parseFloat(info.huli_cost_self_total)).toFixed(2)}}
263
         </td>
264
         </td>
264
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
265
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
265
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
266
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
266
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
267
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
267
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
268
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
268
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
269
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
269
-          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.zc_cost_part_self_total)).toFixed(2)}}
270
+          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.zc_cost_part_self_total) + parseFloat(info.huli_cost_part_self_total)).toFixed(2)}}
270
         </td>
271
         </td>
271
 
272
 
272
         <td>报销比例</td>
273
         <td>报销比例</td>