Merge branch 'master' into 'master'

结算统计增加出院诊断

See merge request lighter/vue-intergration-platform!146

src/views/medical-insurance/allpatient/SetlStatistics.vue

@@ -83,6 +83,7 @@
       <el-table-column label="个人现金支出" prop="psnCashPay"></el-table-column>
       <el-table-column label="大病支出" prop="hifmiPay"></el-table-column>
       <el-table-column label="医惠保支出" prop="sbjjPay"></el-table-column>
+      <el-table-column label="出院诊断" prop="cyzd"></el-table-column>
     </el-table>
     <el-pagination
         :current-page="currentPage"
@@ -387,7 +388,8 @@ export default {
           acctPay: '个人账户支出',
           psnCashPay: '个人现金支出',
           hifmiPay: '大病支出',
-          sbjjPay: '医惠保支出'
+          sbjjPay: '医惠保支出',
+          cyzd: '出院诊断'
         }
         Export(setldetails.value, title, filterDialogTitle.value)
       }