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

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -127,13 +127,6 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="换药" align="center">
-              <template slot-scope="scope">
-                {{scope.row.change_medicine_count?scope.row.change_medicine_count:''}}
-
-                <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
-              </template>
-            </el-table-column>
 
             <el-table-column label="治疗" align="center">
               <template slot-scope="scope">
@@ -151,7 +144,7 @@
 
             <el-table-column label="合计" align="center">
               <template slot-scope="scope">
-                {{scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count:''}}
+                {{scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count:''}}
               </template>
             </el-table-column>
           </el-table>
@@ -200,8 +193,7 @@
         project_options:[
           {value:1, name:"治疗"},
           {value:2, name:"穿刺"},
-          {value:3, name:"换药"},
-          {value:4, name:"宣教/小结"},
+          {value:3, name:"宣教/小结"},
         ],
         crumbs: [
           { path: false, name: "质控管理" },
@@ -401,25 +393,15 @@
 
               for (let i = 0;  i < resp.data.data.length;i++){
                 this.bar.xAxis.data.push(resp.data.data[i].user_name)
-                if(this.query.statistics_type == 1){
-
+                if(this.query.statistics_type == 2){
                   this.bar.series[0].data.push(resp.data.data[i].puncture_count)
                   this.percent.push(resp.data.data[i].puncture_ratio)
-
-                }else if(this.query.statistics_type == 2){
-
-                  this.bar.series[0].data.push(resp.data.data[i].change_medicine_count)
-                  this.percent.push(resp.data.data[i].change_medicine_ratio)
-
-
-                }else if(this.query.statistics_type == 3){
+                }else if(this.query.statistics_type == 1){
                   this.bar.series[0].data.push(resp.data.data[i].cure_count)
                   this.percent.push(resp.data.data[i].cure_ratio)
-
-                }else if(this.query.statistics_type == 4){
+                }else if(this.query.statistics_type == 3){
                   this.bar.series[0].data.push(resp.data.data[i].mission_count)
                   this.percent.push(resp.data.data[i].mission_ratio)
-
                 }
               }
               this.getArrLength(this.bar.xAxis.data)