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

@@ -56,7 +56,7 @@
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
-          <el-table-column fixed prop="name" label="姓名" width="140">
+          <el-table-column prop="name" label="姓名" width="140">
             <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
           </el-table-column>
           <el-table-column  label="年龄" width="140">
@@ -67,7 +67,7 @@
           </el-table-column>
           <el-table-column prop="mode_id" label="透析模式">
               <template slot-scope="scope">
-                <span>{{ scope.row.child.join("、") }}</span>
+                <span>{{ scope.row.mode_id.join("、") }}</span>
               </template>
            </el-table-column>
           <el-table-column prop="address" label="透析总次数" width="140">
@@ -232,50 +232,7 @@ export default {
          // console.log("totallist",totallist)
           this.total = totallist  
           var prescriptionList = response.data.data.prescriptionList
-          for(let i=0;i<prescriptionList.length;i++){
-            if(prescriptionList[i].mode_id == 1){
-              prescriptionList[i].mode_id = "HD"
-            }else if(prescriptionList[i].mode_id == 2){
-              prescriptionList[i].mode_id = "HDF"
-            }else if(prescriptionList[i].mode_id == 3){
-              prescriptionList[i].mode_id = "HD+HP"
-            }else if(prescriptionList[i].mode_id == 4){
-              prescriptionList[i].mode_id = "HP"
-            }else if(prescriptionList[i].mode_id == 5){
-              prescriptionList[i].mode_id = "HF"
-            }else if(prescriptionList[i].mode_id == 6){
-              prescriptionList[i].mode_id = "SCUF"
-            }else if(prescriptionList[i].mode_id == 7){
-              prescriptionList[i].mode_id = "IUF"
-            }else if(prescriptionList[i].mode_id == 8){
-              prescriptionList[i].mode_id = "HFHD"
-            }else if(prescriptionList[i].mode_id == 9){
-              prescriptionList[i].mode_id = "HFHD+HP"
-            }else if(prescriptionList[i].mode_id == 10){
-              prescriptionList[i].mode_id = "PHF"
-            }else if(prescriptionList[i].mode_id == 11){
-              prescriptionList[i].mode_id = "HFR"
-            }else if(prescriptionList[i].mode_id == 12){
-              prescriptionList[i].mode_id = "HDF+HP"
-            }else if(prescriptionList[i].mode_id == 13){
-              prescriptionList[i].mode_id = "CRRT"
-            }else if(prescriptionList[i].mode_id == 14){
-              prescriptionList[i].mode_id = "腹水回输"
-            }else if(prescriptionList[i].mode_id == 15){
-               prescriptionList[i].mode_id = "HD前置换"
-            }
-            else if(prescriptionList[i].mode_id == 16){
-               prescriptionList[i].mode_id = "HD后置换"
-            }
-            else if(prescriptionList[i].mode_id == 17){
-               prescriptionList[i].mode_id = "HDF前置换"
-            }
-            else if(prescriptionList[i].mode_id == 18){
-               prescriptionList[i].mode_id = "HDF后置换"
-            }else if(prescriptionList[i].mode_id == 19){
-              prescriptionList[i].mode_id = "IUF+HD"
-            }
-          }
+          this.getModeId(prescriptionList)
           
          // console.log("prescriptionList",prescriptionList)
           for(let i=0;i<this.prescriptionList.length;i++){
@@ -296,7 +253,7 @@ export default {
                 dialysis_no:item.dialysis_no,
                 total_dialysis:item.total_dialysis,
                 user_sys_before_count:item.user_sys_before_count,
-                child: []
+                mode_id: []
               }
             }
           })
@@ -305,7 +262,7 @@ export default {
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
-                item.child.push(prescriptionList[i].mode_id)
+                item.mode_id.push(prescriptionList[i].mode_id)
               }
             }
           })
@@ -330,10 +287,28 @@ export default {
     onSearch(){
       getPrescriptionByName(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
          if(response.data.state === 1){
-           var patient =  response.data.data.patient
-           //console.log("patient",patient)
-           var total = response.data.data.total
-           //console.log("total",total)
+           var patients =  response.data.data.patient
+           this.getModeId(patients)
+           console.log("patient",patients)
+           var hash = {};
+           var i = 0;
+           var res = [];
+           patients.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,
+                id_card_no:item.id_card_no,
+                total_dialysis:item.total_dialysis,
+                user_sys_before_count:item.user_sys_before_count,
+            })
+           });
+           this.DialysisData = res
+           var total =  response.data.data.total
+           this.total = res.length
+           console.log("total",total)
          }
       })
     },
@@ -345,12 +320,74 @@ export default {
        getDialysisDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
           if(response.data.state === 1){
             var patients =  response.data.data.patients
-            console.log("patients",patients)
+            this.getModeId(patients)
+            // console.log("patients",patients)
+            var hash = {};
+            var i = 0;
+            var res = [];
+            patients.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,
+                  id_card_no:item.id_card_no,
+                  total_dialysis:item.total_dialysis,
+                  user_sys_before_count:item.user_sys_before_count,
+              })
+            });
+            this.DialysisData = res
+            console.log(res)
             var total =  response.data.data.total
-            console.log("total",total)
+            this.total = res.length
+            // console.log("total",total)
           }
        })
      
+    },
+    getModeId(patients){
+      for(let i=0;i<patients.length;i++){
+        if(patients[i].mode_id == 1){
+          patients[i].mode_id = "HD"
+        }else if(patients[i].mode_id == 2){
+          patients[i].mode_id = "HDF"
+        }else if(patients[i].mode_id == 3){
+          patients[i].mode_id = "HD+HP"
+        }else if(patients[i].mode_id == 4){
+          patients[i].mode_id = "HP"
+        }else if(patients[i].mode_id == 5){
+          patients[i].mode_id = "HF"
+        }else if(patients[i].mode_id == 6){
+          patients[i].mode_id = "SCUF"
+        }else if(patients[i].mode_id == 7){
+          patients[i].mode_id = "IUF"
+        }else if(patients[i].mode_id == 8){
+          patients[i].mode_id = "HFHD"
+        }else if(patients[i].mode_id == 9){
+          patients[i].mode_id = "HFHD+HP"
+        }else if(patients[i].mode_id == 10){
+          patients[i].mode_id = "PHF"
+        }else if(patients[i].mode_id == 11){
+          patients[i].mode_id = "HFR"
+        }else if(patients[i].mode_id == 12){
+          patients[i].mode_id = "HDF+HP"
+        }else if(patients[i].mode_id == 13){
+          patients[i].mode_id = "CRRT"
+        }else if(patients[i].mode_id == 14){
+          patients[i].mode_id = "腹水回输"
+        }else if(patients[i].mode_id == 15){
+            patients[i].mode_id = "HD前置换"
+        }else if(patients[i].mode_id == 16){
+            patients[i].mode_id = "HD后置换"
+        }else if(patients[i].mode_id == 17){
+            patients[i].mode_id = "HDF前置换"
+        }else if(patients[i].mode_id == 18){
+            patients[i].mode_id = "HDF后置换"
+        }else if(patients[i].mode_id == 19){
+          patients[i].mode_id = "IUF+HD"
+        }
+      }
     }
   },
   created(){