Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
         <el-table :data="patientsData" border style="width: 100%;" height="500">
-          <el-table-column prop="date" label="日期" width="70">
-            <template slot-scope="scope">{{getTime(scope.row.created_time)}}</template>
+          <el-table-column prop="dialysis_no" label="透析号" width="80" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
           </el-table-column>
-          <el-table-column prop="name" label="姓名" width="80">
+          <el-table-column prop="name" label="姓名" width="80" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
         </el-table>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
         <el-table :data="DialysisData" style="width: 100%" border>
-          <el-table-column fixed prop="date" label="姓名">
-            <template slot-scope="scope">{{ scope.row.name }}</template>
+          <el-table-column fixed prop="name" label="姓名" width="140">
+            <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
           </el-table-column>
-          <el-table-column prop="name" label="年龄">
-             <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
+          <el-table-column prop="age" label="年龄" width="140">
+             <!-- <template slot-scope="scope">{{ scope.row.id_card_no }}</template> -->
           </el-table-column>
-          <el-table-column prop="province" label="透析号">
-              <template slot-scope="scope">{{ scope.row.dialysis_no }}</template>
+          <el-table-column prop="dialysis_no" label="透析号" width="140">
+              <!-- <template slot-scope="scope">{{ scope.row.dialysis_no }}</template> -->
           </el-table-column>
-          <el-table-column prop="city" label="透析模式">
-              <template slot-scope="scope">{{ scope.row.mode_id }}</template>
+          <el-table-column prop="mode_id" label="透析模式">
+              <template slot-scope="scope">
+                <span>{{ scope.row.mode_id.join("、") }}</span>
+              </template>
            </el-table-column>
-          <el-table-column prop="address" label="透析总次数"></el-table-column>
+          <el-table-column prop="address" label="透析总次数" width="140"></el-table-column>
         </el-table>
 
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[20, 40, 60,80, 100]"
+          :page-sizes="[20, 40, 60, 80, 100]"
           :page-size="10"
           background
           style="margin-top:20px;"
               }
            }
            console.log("dialysislist",dialysislist)
-           this.DialysisData = dialysislist
-           var total = response.data.data.total
-           console.log("total",total)
-           this.total = total
+           var hash = {};
+           var i = 0;
+           var res = [];
+           dialysislist.forEach(function(item) {
+            var patient_id = item.patient_id;
+            hash[patient_id] ? res[hash[patient_id] - 1].mode_id.push(item.mode_id) : hash[patient_id] = ++i && res.push({
+                mode_id: [item.mode_id],
+                patient_id: patient_id,
+                dialysis_no: item.dialysis_no,
+                name:item.name,
+                age:item.id_card_no
+            })
+           });
+           res.map(item => {
+             item.age = this.getAge(item.age)
+           })
+           console.log(res)
+           this.DialysisData = res
+ 
+            var total = response.data.data.total
+            console.log("total",total)
+            this.total = total
          }
       })
-    }
+    },
+    getAge(UUserCard) {
+			if (UUserCard != null && UUserCard != '') {
+				//获取年龄
+				var myDate = new Date();
+				var month = myDate.getMonth() + 1;
+				var day = myDate.getDate();
+				var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+				if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+					age++;
+				}
+				return age;
+			}
+    },
+    onSearch(){}
   },
   created(){
     var nowDate = new Date();