1

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -584,89 +584,89 @@ export default {
 
 
                 let tempArr = [], newArr = []
-                    for (let i = 0; i < scheudleTotal.length; i++) {
-                        if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
-                            newArr.push({
-                                user_name: scheudleTotal[i].user_name,
-                                doctor_id:scheudleTotal[i].doctor_id,
-                                list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
-                            })
-                            tempArr.push(scheudleTotal[i].user_name);
-                        } else {
-                            for (let j = 0; j < newArr.length; j++) {
-                                if (newArr[j].user_name == scheudleTotal[i].user_name) {
-                                    newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
-                                }
+                for (let i = 0; i < scheudleTotal.length; i++) {
+                    if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
+                        newArr.push({
+                            user_name: scheudleTotal[i].user_name,
+                            doctor_id:scheudleTotal[i].doctor_id,
+                            list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
+                        })
+                        tempArr.push(scheudleTotal[i].user_name);
+                    } else {
+                        for (let j = 0; j < newArr.length; j++) {
+                            if (newArr[j].user_name == scheudleTotal[i].user_name) {
+                                newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
                             }
                         }
                     }
+                }
 
-                    newArr.map(item => {
-                        list.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.totalminute = it.totalminute
-                            }
-                        })
+                newArr.map(item => {
+                    list.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.totalminute = it.totalminute
+                        }
                     })
-                    newArr.map(item => {
-                        workday.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.attendance = it.Count
-                            }
-                        })
+                })
+                newArr.map(item => {
+                    workday.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.attendance = it.Count
+                        }
                     })
-                    newArr.map(item => {
-                        noWorkDay.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.absence = it.Count
-                            }
-                        })
+                })
+                newArr.map(item => {
+                    noWorkDay.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.absence = it.Count
+                        }
+                    })
+                })
+                
+                let arr = [...newArr]
+                if(val == 0){
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
                     })
                     
-                    let arr = [...newArr]
-                    if(val == 0){
-                        arr.sort(this.compare('doctor_id'))
-                        this.doctorlist.sort(this.compare('admin_user_id'))
-                        this.doctorlist.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-                        
 
-                        console.log('newArr',arr)
-                        this.tableData = arr
-                    }else if(val == 2){
-                        arr.sort(this.compare('doctor_id'))
-                        this.doctorArr.sort(this.compare('admin_user_id'))
-                        this.doctorArr.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-                        
+                    console.log('newArr',arr)
+                    this.tableData = arr
+                }else if(val == 2){
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorArr.sort(this.compare('admin_user_id'))
+                    this.doctorArr.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    
 
-                        console.log('newArr',arr)
-                        this.tableData = arr
-                    }else if(val == 3){
-                        arr.sort(this.compare('doctor_id'))
-                        this.nurseArr.sort(this.compare('admin_user_id'))
-                        this.nurseArr.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-                        
+                    console.log('newArr',arr)
+                    this.tableData = arr
+                }else if(val == 3){
+                    arr.sort(this.compare('doctor_id'))
+                    this.nurseArr.sort(this.compare('admin_user_id'))
+                    this.nurseArr.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    
 
-                        console.log('newArr',arr)
-                        this.tableData = arr
-                    }
+                    console.log('newArr',arr)
+                    this.tableData = arr
+                }
                     
               }
             })