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

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -433,6 +433,9 @@ export default {
         case 3:
           return "住院";
           break;
+        case 4:
+          return "门诊";
+          break;
 
         default:
           return "-";

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -364,6 +364,10 @@
       }
     },
     methods: {
+      jumpDetail(patient_id){
+        this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
+
+      },
       changeProject(val){
         this.query.statistics_type = val
         this.query.page = 1
@@ -442,12 +446,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisBloodPressureTableData(params) {
         this.loading = true
         this.tableData = []

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -8,47 +8,64 @@
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+              <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="search_value"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入病人名字"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
             </el-form-item>
           </el-form>
         </div>
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row
+                      @current-change="handleChange">
+              <el-table-column prop="dialysis_no" label="透析号" width="80">
+                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" width="80">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
             </el-table>
+
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
             <div class="cell clearfix">
               <label class="title" style="text-align:left">
                 <span class="name">血压阶段</span> :
               </label>
-              <el-select
-                v-model="value"
-                placeholder="请选择"
-                @change="chooseType"
-                style="width:110px;margin-right:10px"
-              >
+              <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
+
                 ></el-option>
               </el-select>
               <label class="title">
                 <span class="name">日期查询</span> :
               </label>
               <el-date-picker
-                v-model="listQuery.start_time"
+                v-model="query.start_time"
                 prefix-icon="el-icon-date"
                 @change="changeTime"
                 :editable="false"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
+                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -56,12 +73,13 @@
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
-                v-model="listQuery.end_time"
+                v-model="query.end_time"
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
+                :picker-options="pickerOptions"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -74,18 +92,69 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-                <el-table-column fixed prop="date" label="日期"></el-table-column>
-                <el-table-column prop="name" label="姓名"></el-table-column>
-                <el-table-column prop="province" label="省份"></el-table-column>
-                <el-table-column prop="city" label="市区"></el-table-column>
+              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+                <el-table-column fixed label="日期" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="姓名" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.patient.name}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="状态" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.patient.lapseto == 1 ? '留治':'转出'}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透前血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透析中最低血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透析中最高血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透后血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column fixed="right" label="趋势" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      @click.native.prevent="jumpDetail(scope.row.patient.id)"
+                      type="text"
+                      size="small"
+                    >详情</el-button>
+                  </template>
+                </el-table-column>
+
               </el-table>
 
+
               <el-pagination
                 align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="listQuery.page"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -105,6 +174,11 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+import { getCurrentOrgPatients } from "@/api/common/common";
+import {GetDialysisPatientBloodPressureChartData,GetDialysisBloodPressureTableData} from "@/api/common/statistics"
+import { PostSearch } from '@/api/patient'
+import { uParseTime } from "@/utils/tools";
+
 export default {
   components: {
     LineChart,
@@ -112,77 +186,47 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      patientsData:[],
+      tableData: [
+      ],
+      loading: false,
+      search_value: '',
+      total: '',
+      query: {
+        patient_id: '',
+        statistics_type: 1,
+        start_time: '',
+        end_time: '',
+        limit: 10,
+        page: 1
+      },
+      options: [
+        { value: 1, name: '透前血压' },
+        { value: 2, name: '透后血压' },
+      ],
+
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "患者血压详情" }
       ],
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
+
       chart: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["收缩压", "舒张压"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -195,22 +239,14 @@ export default {
             name: "收缩压",
             type: "line",
             data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
+
             ],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -226,13 +262,13 @@ export default {
           {
             name: "舒张压",
             type: "line",
-            data: ["10", "20", "30", "53.33", "42.86", "100", "60", "27", "97"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -247,97 +283,145 @@ export default {
           }
         ]
       },
-      tableData1: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ]
     };
   },
   methods: {
+    GetDialysisBloodPressureTableData(params) {
+      this.loading = true
+      this.tableData = []
+      GetDialysisBloodPressureTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+
+    },
+    handleChange(val){
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisBloodPressureTableData(this.query)
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+
+    },changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDialysisBloodPressureChartData(this.query)
+        this.GetDialysisBloodPressureTableData(this.query)
+
+      }
+
+    },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.end_time = "";
+      } else {
+        this.query.page = 1;
+        this.GetDialysisBloodPressureChartData(this.query)
+        this.GetDialysisBloodPressureTableData(this.query)
+
+      }
+    },  getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },GetDialysisPatientBloodPressureChartData(params) {
+
+      this.chart.xAxis.data = []
+      this.chart.series[0].data = []
+      this.chart.series[1].data = []
+      GetDialysisPatientBloodPressureChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.chart.xAxis.data.push(resp.data.data[i].date)
+              this.chart.series[0].data.push(resp.data.data[i].systolic_blood_pressure)
+              this.chart.series[1].data.push(resp.data.data[i].diastolic_blood_pressure)
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    }, handleSelect(val) {
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+      this.GetDialysisBloodPressureTableData(this.query)
+
+    },  querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    },getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+        if(response.data.state == 1){
+          var patients = response.data.data.patients
+          this.patientsData = patients
+        }
+      })
+    },
+
     chooseMonth(month) {
       this.monthType = month;
     },
     clickQuality(index) {
       this.quality = index;
     }
+  },created() {
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = this.$route.query.id
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetDialysisPatientBloodPressureChartData(this.query)
+    this.GetDialysisBloodPressureTableData(this.query)
+    this.getCurrentOrgPatients()
+
   }
 };
 </script>

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -90,7 +90,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData"  :height="tableHeight"   v-loading="loading">
+              <el-table :data="tableData"    v-loading="loading">
                 <el-table-column  fixed label="透析日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
@@ -469,10 +469,7 @@
       }
     },
     methods: {
-      jumpDetail(patient_id){
-        this.$router.push("/dqc/bloodpressure/detail?id="+patient_id)
 
-      },
       changeProject(val){
         this.query.statistics_type = val
         this.query.page = 1
@@ -552,12 +549,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisProcessIndexTableData(params) {
         this.loading = true
         this.tableData = []

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -375,6 +375,10 @@
       }
     },
     methods: {
+      jumpDetail(patient_id){
+        this.$router.push("/qcd/indicatorControlAnalysis/weightDetails?id="+patient_id)
+
+      },
       changeProject(val){
         this.query.statistics_type = val
         this.query.page = 1
@@ -453,12 +457,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisWeightTableData(params) {
         this.loading = true
         this.tableData = []

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -8,47 +8,66 @@
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+              <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="search_value"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入病人名字"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
+
             </el-form-item>
           </el-form>
         </div>
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row
+                      @current-change="handleChange">
+              <el-table-column prop="dialysis_no" label="透析号" width="80">
+                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" width="80">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
             </el-table>
+
+
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
             <div class="cell clearfix">
               <label class="title" style="text-align:left">
-                <span class="name">血压阶段</span> :
+                <span class="name">体重类型</span> :
               </label>
-              <el-select
-                v-model="value"
-                placeholder="请选择"
-                @change="chooseType"
-                style="width:110px;margin-right:10px"
-              >
+              <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
+
                 ></el-option>
               </el-select>
               <label class="title">
                 <span class="name">日期查询</span> :
               </label>
               <el-date-picker
-                v-model="listQuery.start_time"
+                v-model="query.start_time"
                 prefix-icon="el-icon-date"
                 @change="changeTime"
                 :editable="false"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
+                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -56,12 +75,13 @@
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
-                v-model="listQuery.end_time"
+                v-model="query.end_time"
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
+                :picker-options="pickerOptions"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -74,18 +94,68 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-                <el-table-column fixed prop="date" label="日期"></el-table-column>
-                <el-table-column prop="name" label="姓名"></el-table-column>
-                <el-table-column prop="province" label="省份"></el-table-column>
-                <el-table-column prop="city" label="市区"></el-table-column>
+              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+                <el-table-column fixed label="日期" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.assessment_date | parseTime("{y}-{m}-{d}") }}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="姓名" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.patient.name}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="干体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.dry_weight?scope.row.dry_weight:''}}
+
+                    <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="前次透后体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.last_after_weight?scope.row.last_after_weight:''}}
+
+                    <!--<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透前体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.weight_before?scope.row.weight_before:''}}
+
+                    <!--<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透后体重" align="center">
+                  <template slot-scope="scope">
+                    <!--<div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>-->
+                    {{scope.row.after.weight_after?scope.row.after.weight_after:''}}
+
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="体重增加" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{scope.row.weight_before - scope.row.last_after_weight}}</div>
+
+                    <!--{{scope.row.weight_before - scope.row.last_after_weight}}-->
+                    <!--<div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
               </el-table>
 
               <el-pagination
                 align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="listQuery.page"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -105,6 +175,13 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+
+import { getCurrentOrgPatients } from "@/api/common/common";
+import {GetDialysisPatientWeightChartData,GetDialysisWeightTableData} from "@/api/common/statistics"
+import { PostSearch } from '@/api/patient'
+import { uParseTime } from "@/utils/tools";
+
+
 export default {
   components: {
     LineChart,
@@ -112,77 +189,49 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      patientsData:[],
+      tableData: [
+      ],
+      loading: false,
+      search_value: '',
+      total: '',
+      query: {
+        patient_id: '',
+        statistics_type: 1,
+        start_time: '',
+        end_time: '',
+        limit: 10,
+        page: 1
+      },
+      options: [
+        { value: 1, name: '干体重' },
+        { value: 2, name: '透前体重' },
+        { value: 3, name: '体重增加' },
+        { value: 4, name: '透后体重' },
+      ],
+
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "患者血压详情" }
       ],
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
+
       chart: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["透前体重", "透后体重"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -192,25 +241,17 @@ export default {
         },
         series: [
           {
-            name: "透前体重",
+            name: "",
             type: "line",
             data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
+
             ],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -223,112 +264,8 @@ export default {
               }
             }
           },
-          {
-            name: "透后体重",
-            type: "line",
-            data: ["10", "20", "30", "53.33", "42.86", "100", "60", "27", "97"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
-            },
-            //配置样式
-            itemStyle: {
-              normal: {
-                color: "#dd7383", //折点颜色
-                lineStyle: {
-                  color: "#dd7383" //折线颜色
-                }
-              }
-            }
-          }
         ]
       },
-      tableData1: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ]
     };
   },
   methods: {
@@ -337,7 +274,136 @@ export default {
     },
     clickQuality(index) {
       this.quality = index;
-    }
+    },  changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDialysisPatientWeightChartData(this.query)
+
+    },
+    handleChange(val){
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisWeightTableData(this.query)
+      this.GetDialysisPatientWeightChartData(this.query)
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+
+    },
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDialysisPatientWeightChartData(this.query)
+        this.GetDialysisWeightTableData(this.query)
+
+      }
+
+    },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.end_time = "";
+      } else {
+        this.query.page = 1;
+        this.GetDialysisPatientWeightChartData(this.query)
+        this.GetDialysisWeightTableData(this.query)
+
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },GetDialysisWeightTableData(params) {
+      this.loading = true
+      this.tableData = []
+      GetDialysisWeightTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    GetDialysisPatientWeightChartData(params) {
+      this.chart.xAxis.data = []
+      this.chart.series[0].data = []
+      GetDialysisPatientWeightChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.chart.xAxis.data.push(resp.data.data[i].date)
+              this.chart.series[0].data.push(resp.data.data[i].value)
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    },
+    handleSelect(val) {
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisPatientWeightChartData(this.query)
+      this.GetDialysisWeightTableData(this.query)
+
+    },
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    }, getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+        if(response.data.state == 1){
+          var patients = response.data.data.patients
+          this.patientsData = patients
+        }
+      })
+    },
+  },created() {
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = this.$route.query.id
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetDialysisPatientWeightChartData(this.query)
+    this.GetDialysisWeightTableData(this.query)
+    this.getCurrentOrgPatients()
+
   }
 };
 </script>

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -10,24 +10,25 @@
           <el-tab-pane label="护士" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+          <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:20px"               @change="changeDoctor"
+          >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in doctor_options"
+              :key="item.id"
+              :label="item.user_name"
+              :value="item.admin_user_id"
             ></el-option>
           </el-select>
           <el-select
-            v-model="value"
+            v-model="query.statistics_type"
             placeholder="请选择"
-            @change="chooseType"
+            @change="changeProject"
             style="width:120px;margin-right:20px"
           >
             <el-option
-              v-for="item in options"
+              v-for="item in project_options"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
@@ -35,12 +36,13 @@
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="listQuery.start_time"
+            v-model="query.start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -48,11 +50,12 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="listQuery.end_time"
+            v-model="query.end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            style="width: 196px;"
+            :picker-options="pickerOptions"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -62,31 +65,53 @@
         </div>
         <div class="tableTitle">统计图</div>
         <div>
-          <line-chart :options="chart"></line-chart>
+          <line-chart :options="bar"></line-chart>
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="date" label="日期"></el-table-column>
-            <el-table-column prop="name" label="姓名"></el-table-column>
-            <el-table-column prop="province" label="省份"></el-table-column>
-            <el-table-column prop="city" label="市区"></el-table-column>
-            <el-table-column prop="address" label="地址"></el-table-column>
-            <el-table-column prop="zip" label="邮编"></el-table-column>
+          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+            <el-table-column fixed label="姓名" align="center">
+              <template slot-scope="scope">
+                {{scope.row.user_name}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="治疗人次" align="center">
+              <template slot-scope="scope">
+                {{scope.row.p_count?scope.row.p_count:''}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="病程记录" align="center">
+              <template slot-scope="scope">
+                {{scope.row.course_count?scope.row.course_count:''}}
+
+                <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
+              </template>
+            </el-table-column>
+
+            <el-table-column label="抢救记录" align="center">
+              <template slot-scope="scope">
+                {{scope.row.rescue_count?scope.row.rescue_count:''}}
+
+                <!--{{scope.row.last_after_weight?scope.row.last_after_weight:''}}-->
+
+                <!--<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>-->
+              </template>
+            </el-table-column>
+
+            <el-table-column label="合计" align="center">
+              <template slot-scope="scope">
+                {{scope.row.p_count + scope.row.course_count + scope.row.rescue_count?scope.row.p_count + scope.row.course_count + scope.row.rescue_count:''}}
+
+                <!--<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>-->
+              </template>
+            </el-table-column>
+
           </el-table>
 
-          <el-pagination
-            align="right"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listQuery.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
         </div>
       </div>
     </div>
@@ -97,6 +122,9 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+
+import {GetDoctorWorkloadChartData,GetDoctorWorkloadTableData,GetAllAdminUser} from "@/api/common/statistics";
+
 export default {
   components: {
     BreadCrumb,
@@ -104,6 +132,32 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      tableData: [
+      ],
+      loading: false,
+      total: '',
+      query: {
+        admin_user_id: "",
+        statistics_type: 1,
+        start_time: "",
+        end_time: "",
+        limit:20,
+        page:1,
+      },
+
+
+      doctor_options:[],
+      project_options:[
+        {value:1, name:"治疗"},
+        {value:2, name:"病程记录"},
+        {value:3, name:"抢救记录"}
+      ],
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "工作量分析统计" },
@@ -116,122 +170,19 @@ export default {
         page: 1,
         limit: 10
       },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
+
       value: "请选项",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ],
-      chart: {
+      bar: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["次数"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["达标", "未达标"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -241,15 +192,15 @@ export default {
         },
         series: [
           {
-            name: "次数",
+            name: "",
             type: "bar",
-            data: ["78.57", "50"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -293,14 +244,115 @@ export default {
     };
   },
   methods: {
-    changeTime() {},
+    changeDoctor(val){
+      this.query.admin_user_id = val
+      this.query.page = 1
+      this.GetDoctorWorkloadTableData(this.query)
+
+    },
+    GetAllDoctor(){
+      GetAllAdminUser().then(response => {
+        if (response.data.state == 1) {
+          var adminUser = response.data.data.admin
+          this.admin_user  = adminUser
+          for (let i = 0; i < adminUser.length; i++){
+            if(adminUser[i].user_type == 2){
+              this.doctor_options.push(adminUser[i])
+            }
+          }
+        } else {
+          this.$message.error('请求数据失败')
+          return false
+        }
+      })
+
+    },
+    changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDoctorWorkloadChartData(this.query)
+      // this.GetDialysisProcessIndexTableData(this.query)
+
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+      this.GetDoctorWorkloadTableData(this.query)
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+      this.GetDoctorWorkloadTableData(this.query)
+    },GetDoctorWorkloadTableData(params) {
+      this.loading = true
+      this.tableData = []
+      GetDoctorWorkloadTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDoctorWorkloadChartData(this.query)
+        this.GetDoctorWorkloadTableData(this.query)
+
+      }
+
+    },  GetDoctorWorkloadChartData(params) {
+
+      this.bar.xAxis.data = []
+      this.bar.series[0].data = []
+      GetDoctorWorkloadChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+
+            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){
+
+                this.bar.series[0].data.push(resp.data.data[i].p_count)
+
+              }else if(this.query.statistics_type == 2){
+                this.bar.series[0].data.push(resp.data.data[i].course_count)
+
+              }else if(this.query.statistics_type == 3){
+                this.bar.series[0].data.push(resp.data.data[i].rescue_count)
+
+              }
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    },
     changeEndTime(val) {
       var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
+        this.query.end_time = "";
       } else {
+        this.query.page = 1;
+        this.GetDoctorWorkloadChartData(this.query)
+        this.GetDoctorWorkloadTableData(this.query)
+
       }
     },
     handleClick() {
@@ -308,6 +360,21 @@ export default {
         this.$router.push({ path: "/qcd/workAnalysis/nurse" });
       }
     }
+  },created(){
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = 0
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetAllDoctor()
+    this.GetDoctorWorkloadChartData(this.query)
+    this.GetDoctorWorkloadTableData(this.query)
+
+
   }
 };
 </script>

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -10,24 +10,25 @@
           <el-tab-pane label="护士" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+          <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:20px"               @change="changeNurse"
+          >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in nurse_options"
+              :key="item.id"
+              :label="item.user_name"
+              :value="item.admin_user_id"
             ></el-option>
           </el-select>
           <el-select
-            v-model="value"
+            v-model="query.statistics_type"
             placeholder="请选择"
-            @change="chooseType"
+            @change="changeProject"
             style="width:120px;margin-right:20px"
           >
             <el-option
-              v-for="item in options"
+              v-for="item in project_options"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
@@ -35,12 +36,13 @@
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="listQuery.start_time"
+            v-model="query.start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -48,11 +50,12 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="listQuery.end_time"
+            v-model="query.end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            style="width: 196px;"
+            :picker-options="pickerOptions"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -62,254 +65,368 @@
         </div>
         <div class="tableTitle">统计图</div>
         <div>
-          <line-chart :options="chart"></line-chart>
+          <line-chart :options="bar"></line-chart>
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="date" label="日期"></el-table-column>
-            <el-table-column prop="name" label="姓名"></el-table-column>
-            <el-table-column prop="province" label="省份"></el-table-column>
-            <el-table-column prop="city" label="市区"></el-table-column>
-            <el-table-column prop="address" label="地址"></el-table-column>
-            <el-table-column prop="zip" label="邮编"></el-table-column>
+          <!--<el-table :data="tableData" style="width: 100%" :height="tableHeight">-->
+            <!--<el-table-column fixed label="姓名" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.user_name}}-->
+
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="治疗人次" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.p_count?scope.row.p_count:''}}-->
+
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="病程记录" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.course_count?scope.row.course_count:''}}-->
+
+                <!--&lt;!&ndash;{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="抢救记录" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.rescue_count?scope.row.rescue_count:''}}-->
+
+                <!--&lt;!&ndash;{{scope.row.last_after_weight?scope.row.last_after_weight:''}}&ndash;&gt;-->
+
+                <!--&lt;!&ndash;<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="合计" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.p_count + scope.row.course_count + scope.row.rescue_count?scope.row.p_count + scope.row.course_count + scope.row.rescue_count:''}}-->
+
+                <!--&lt;!&ndash;<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+
+          <!--</el-table>-->
+          <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+            <el-table-column fixed label="姓名" align="center">
+              <template slot-scope="scope">
+                {{scope.row.user_name}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="穿刺" align="center">
+              <template slot-scope="scope">
+                {{scope.row.puncture_count?scope.row.puncture_count:''}}
+
+              </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">
+                {{scope.row.cure_count?scope.row.cure_count:''}}
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="宣教/小结" align="center">
+              <template slot-scope="scope">
+                {{scope.row.mission_count?scope.row.mission_count:''}}
+              </template>
+            </el-table-column>
+
+            <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:''}}
+              </template>
+            </el-table-column>
           </el-table>
 
-          <el-pagination
-            align="right"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listQuery.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
         </div>
       </div>
     </div>
   </div>
 </template>
-
 <script>
-import echarts from "echarts";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    BreadCrumb,
-    LineChart
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "工作量分析统计" },
-        { path: false, name: "护士" }
-      ],
-      activeName: "second",
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
-      value: "请选项",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
+  import echarts from "echarts";
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import LineChart from "../../qcd/components/LineChart";
+
+  import {GetNurseWorkloadChartData,GetNurseWorkloadTableData,GetAllAdminUser} from "@/api/common/statistics";
+
+  export default {
+    components: {
+      BreadCrumb,
+      LineChart
+    },
+    data() {
+      return {
+        pickerOptions: {
+          disabledDate(time) {
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+            return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+          }
         },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+        tableData: [
+        ],
+        loading: false,
+        total: '',
+        query: {
+          admin_user_id: "",
+          statistics_type: 1,
+          start_time: "",
+          end_time: "",
+          limit:20,
+          page:1,
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+
+
+        nurse_options:[],
+        project_options:[
+          {value:1, name:"治疗"},
+          {value:2, name:"穿刺"},
+          {value:3, name:"换药"},
+          {value:4, name:"宣教/小结"},
+        ],
+        crumbs: [
+          { path: false, name: "科室质控" },
+          { path: false, name: "工作量分析统计" },
+          { path: false, name: "医生" }
+        ],
+        activeName: "first",
+        listQuery: {
+          start_time: "",
+          end_time: "",
+          page: 1,
+          limit: 10
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+
+        value: "请选项",
+        bar: {
+          title: {
+            text: "ECharts 入门示例"
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "bar",
-            data: ["78.57", "50"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: "{value} %"
             },
-            //配置样式
-            itemStyle: {
-              //通常情况下：
-
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
-                  ];
-
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
-                  }
-
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: colorList[index][0] },
-                    // { offset: 0.5, color: colorList[index][1] },
-                    { offset: 1, color: colorList[index][1] }
-                  ]);
-                },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+            show: false
+          },
+          series: [
+            {
+              name: "",
+              type: "bar",
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: "top",
+                  formatter: "{c}"
+                }
               },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ["#A9E0F3", "#9FBDFC"],
+
+                      ["#FFD7C0", "#FF9994"]
+                    ];
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                    var index = params.dataIndex;
+                    if (params.dataIndex >= colorList.length) {
+                      index = params.dataIndex % colorList.length;
+                    }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[index][0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[index][1] }
+                    ]);
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+                },
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: "rgba(0, 0, 0, 0.5)"
+                }
               }
             }
-          }
-        ]
-      }
-    };
-  },
-  methods: {
-    changeTime() {},
-    changeEndTime(val) {
-      var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
-      if (time < 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
-      } else {
-      }
+          ]
+        }
+      };
     },
-    handleClick() {
-      if (this.activeName == "first") {
-        this.$router.push({ path: "/qcd/workAnalysis/doctor" });
+    methods: {
+      changeNurse(val){
+        this.query.admin_user_id = val
+        this.query.page = 1
+        this.GetNurseWorkloadTableData(this.query)
+
+      },
+      GetAllNurse(){
+        GetAllAdminUser().then(response => {
+          if (response.data.state == 1) {
+            var adminUser = response.data.data.admin
+            this.admin_user  = adminUser
+            for (let i = 0; i < adminUser.length; i++){
+              if(adminUser[i].user_type == 3){
+                this.nurse_options.push(adminUser[i])
+              }
+            }
+          } else {
+            this.$message.error('请求数据失败')
+            return false
+          }
+        })
+
+      },
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetNurseWorkloadChartData(this.query)
+        // this.GetDialysisProcessIndexTableData(this.query)
+
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit;
+        this.GetNurseWorkloadTableData(this.query)
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+        this.GetNurseWorkloadTableData(this.query)
+      },GetNurseWorkloadTableData(params) {
+        this.loading = true
+        this.tableData = []
+        GetNurseWorkloadTableData(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              this.loading = false
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.tableData.push(resp.data.data[i])
+              }
+            } else {
+              this.loading = false
+            }
+          })
+          .catch(error => {
+
+          })
+      },
+      changeTime(val) {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+        if (time > 0) {
+          this.$message.error("结束时间不能小于开始时间");
+          this.query.start_time = "";
+        } else {
+          // this.getDialysisList()
+          this.query.page = 1;
+          this.GetNurseWorkloadChartData(this.query)
+          this.GetNurseWorkloadTableData(this.query)
+
+        }
+
+      },  GetNurseWorkloadChartData(params) {
+
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetNurseWorkloadChartData(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+
+              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){
+
+                  this.bar.series[0].data.push(resp.data.data[i].puncture_count)
+
+                }else if(this.query.statistics_type == 2){
+
+                  this.bar.series[0].data.push(resp.data.data[i].change_medicine_count)
+
+
+                }else if(this.query.statistics_type == 3){
+                  this.bar.series[0].data.push(resp.data.data[i].cure_count)
+
+                }else if(this.query.statistics_type == 4){
+                  this.bar.series[0].data.push(resp.data.data[i].mission_count)
+
+                }
+              }
+
+            } else {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      changeEndTime(val) {
+        var time =
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+        if (time < 0) {
+          this.$message.error("结束时间不能小于开始时间");
+          this.query.end_time = "";
+        } else {
+          this.query.page = 1;
+          this.GetNurseWorkloadChartData(this.query)
+          this.GetNurseWorkloadTableData(this.query)
+
+        }
+      },
+      handleClick() {
+        if (this.activeName == "first") {
+          this.$router.push({ path: "/qcd/workAnalysis/doctor" });
+        }
       }
+    },created(){
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+      this.query.patient_id = 0
+      this.query.end_time = year + '-' + month + '-' + day
+      this.query.start_time = year + '-' + last_month + '-' + day
+      this.query.statistics_type = 1
+      this.GetAllNurse()
+      this.GetNurseWorkloadChartData(this.query)
+      this.GetNurseWorkloadTableData(this.query)
+
+
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //  store.dispatch('VerifyConfigList', []).then(() => {
-  //    next()
-  // })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //  store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //    next()
-  //  })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+   store.dispatch('VerifyConfigList', []).then(() => {
+     next()
+  })
+  }
+  if (store.getters.permission_routers === undefined) {
+   store.dispatch('xt_GenerateRoutes', []).then(() => {
+     next()
+   })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start();