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

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -915,6 +915,17 @@ export default {
             response.data.data.treatCostSelfTotal
           that.info['treat_cost_part_self_total'] =
             response.data.data.treatCostPartSelfTotal
+
+
+
+          that.info['huli_cost_total'] = response.data.data.hiliCostTotal
+          that.info['huli_cost_self_total'] =
+            response.data.data.hiliCostSelfTotal
+          that.info['huli_cost_part_self_total'] =
+            response.data.data.hiliCostPartSelfTotal
+
+
+
           that.info['date'] = response.data.data.date
           that.info['number'] = response.data.data.number
           that.info['order_infos'] = response.data.data.order_infos

src/xt_pages/outpatientTool/components/print9919.vue

@@ -235,31 +235,32 @@
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-        <td style="text-align:right;padding-right:10px;"></td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-        <td style="text-align:right;padding-right:10px;"></td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td>护理费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>
       </tr>
+
       <tr>
         <td>合计</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total) + parseFloat(info.huli_cost_total)).toFixed(2) }}
         </td>
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.huli_cost_self_total)).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-          parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.huli_cost_part_self_total)).toFixed(2)}}
         </td>
 
         <td>报销比例</td>