diff --git a/public/dashboard/index.html b/public/dashboard/index.html
index 7d931ef..595d258 100644
--- a/public/dashboard/index.html
+++ b/public/dashboard/index.html
@@ -137,76 +137,15 @@
                 <!-- 最新出院信息 -->
                 <div class="lists">
                     <h2>最新出院信息</h2>
-                    <table class="fx" width="100%" border='0' cellpadding='0' cellspacing='0'>
-                        <tr>
-                            <td width="25%" style="padding-left: 15px;">周**</td>
-                            <td width="60%">第一人民医院内科楼132床</td>
-                            <td width="15%"><span class="ways">已结算</span></td>
-                        </tr>
-                        <tr>
-                            <td width="25%" style="padding-left: 15px;">张**</td>
-                            <td width="60%">武进中医院75床</td>
-                            <td width="15%"><span class="ways">已结算</span></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td><span></span></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td><span></span></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td><span></span></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td><span></span></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td><span></span></td>
-                        </tr>
+                    <table class="fx outOrder" width="100%" border='0' cellpadding='0' cellspacing='0'>
+
                     </table>
                 </div>
                 <!-- 最新投诉信息 -->
                 <div class="lists">
-                    <h2>最新投诉信息</h2>
-                    <table class="fx" width="100%" border='0' cellpadding='0' cellspacing='0'>
-                        <tr>
-                            <td width="50%" style="padding-left: 15px;">陈**投诉袁护工</td>
-                            <td width="50%">武进中医院</td>
-                        </tr>
-                        <tr>
-                            <td width="50%" style="padding-left: 15px;"></td>
-                            <td width="50%"></td>
-                        </tr>
-                        <tr>
-                            <td width="50%" style="padding-left: 15px;"></td>
-                            <td width="50%"></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                        </tr>
+                    <h2>最新评价信息</h2>
+                    <table class="fx tip" width="100%" border='0' cellpadding='0' cellspacing='0'>
+
                     </table>
                 </div>
                 <!-- 上月满意度评价分析 -->
@@ -316,7 +255,11 @@
                     name: '未陪护'
                 },
             ]
+            var monthChartX = []
+            var monthChartY = []
+            var incomeChart = []
             var projectChartX = []
+            var projectChartYperson = []
             var projectChartY = []
             $(function() {
                 getStatistic()
@@ -371,13 +314,53 @@
                                 name: '未陪护'
                             }
                         ]
+                        // 本月陪护订单分析
+                        var monthsArr = datas.monthAccompany
+                        monthsArr.map(item=>{
+                            monthChartX.push(item.name)
+                            monthChartY.push(item.total)
+                        })
+                        // 本月营收分析
+                        var incomes = datas.income
+                        incomes.map(item=>{
+                            incomeChart.push({
+                                name:item.name,
+                                value:parseFloat(item.total)
+                            })
+                        })
                         // 陪护统计表
                         var projects = datas.project
                         projects.map(item=>{
                             projectChartX.push(item.name)
+                            projectChartYperson.push(item.paramedic_total)
                             projectChartY.push(item.total)
                         })
+                        // 最近订单 lastOrder
 
+                        // 最新出院  outOrder
+                        var outs = datas.outOrder
+                        $(".outOrder").empty("")
+                        outs.map(item=>{
+                            var contactName = item.contact?
+                            item.contact.charAt(0) + item.contact.slice(1).replace(new RegExp(item.contact.charAt(1), "g"), '*')
+                            :'**'
+                            $(".outOrder").append("<tr><td width='25%' style='padding-left: 15px;'>"
+                            +contactName+"</td><td width='60%'>"+item.project.name+"</td>"+
+                            "<td width='15%'><span class='ways'>"+item.status_name+"</span></td>"+
+                            "</tr>")
+                        })
+                        // 最新评价
+                        var tips = datas.tip
+                        $(".tip").empty("")
+                        tips.map(item=>{
+                            var contactName = item.contact?
+                            item.contact.charAt(0) + item.contact.slice(1).replace(new RegExp(item.contact.charAt(1), "g"), '*')
+                            :'**'
+                            $(".tip").append("<tr><td width='50%' style='padding-left: 15px;'>"+
+                            contactName+"评价:"+item.comment+"</td>"+
+                            "<td width='30%' style='text-align:right;vertical-align: top;'><span class='ways'>"+item.project.name+"</span></td>"+
+                            "</tr>")
+                        })
                         console.log("result", result)
                         initChart()
                     },
@@ -454,7 +437,7 @@
                                 fontSize: '14px'
                             }
                         },
-                        data: projectChartX,
+                        data: monthChartX,
                     },
                     yAxis: {
                         axisLine: {
@@ -495,16 +478,15 @@
                             }
                         },
 
-                        data: projectChartY,
-                    }
-                    // , {
-                    //     name: '陪护订单量',
-                    //     type: 'pictorialBar',
-                    //     barGap: '-100%',
-                    //     symbolPosition: 'end',
-                    //     symbolSize: 50,
-                    //     symbolOffset: [0, '-120%'],
-                    // },
+                        data: monthChartY,
+                    }, {
+                        name: '陪护订单量',
+                        type: 'pictorialBar',
+                        barGap: '-100%',
+                        symbolPosition: 'end',
+                        symbolSize: 50,
+                        symbolOffset: [0, '-120%'],
+                    },
                     ]
                 };
                 var myChart2 = echarts.init(document.getElementById('byph'));
@@ -520,39 +502,7 @@
                         radius: '70%',
                         center: ['50%', '50%'],
                         color: ["#ffb22f", "#ff4954", "#01babb"],
-                        data: [{
-                                value: 75,
-                                name: '一院'
-                            },
-                            {
-                                value: 60,
-                                name: '市中'
-                            },
-                            {
-                                value: 30,
-                                name: '武进南院'
-                            },
-                            {
-                                value: 25,
-                                name: '阳湖院'
-                            },
-                            {
-                                value: 30,
-                                name: '康复医院'
-                            },
-                            {
-                                value: 20,
-                                name: '妇幼院'
-                            },
-                            {
-                                value: 25,
-                                name: '武中'
-                            },
-                            {
-                                value: 18,
-                                name: '溧阳院'
-                            }
-                        ].sort(function(a, b) {
+                        data: incomeChart.sort(function(a, b) {
                             return a.value - b.value;
                         }),
                         roseType: 'radius',
@@ -604,7 +554,7 @@
                     },
                     xAxis: {
                         type: 'category',
-                        data: ['一院', '市中', '武进南院', '阳湖院', '康复医院', '妇幼院', '武中', '溧阳院'],
+                        data: projectChartX,
                         axisLine: {
                             show: true,
                             lineStyle: {
@@ -651,7 +601,7 @@
                     series: [{
                             type: 'bar',
                             name: '陪护单数',
-                            data: [336, 150, 42, 156, 42, 30, 54, 45],
+                            data: projectChartY,
                             itemStyle: {
                                 color: '#ffb22f',
                             }
@@ -659,7 +609,7 @@
                         {
                             type: 'bar',
                             name: '总护工数',
-                            data: [288, 130, 35, 125, 38, 30, 50, 40],
+                            data: projectChartYperson,
                             itemStyle: {
                                 color: '#0087ff'
                             }