Merge branch 'vue_statistics_branch'

src/api/common/statistics.js

@@ -0,0 +1,157 @@
+import request from '@/utils/request'
+
+export function GetDialysisProcessIndexChartData(params) {
+  return request({
+    url: '/api/dialysisprocessindex/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+export function GetDialysisProcessIndexTableData(params) {
+  return request({
+    url: '/api/dialysisprocessindex/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function GetDialysisWatchChartData(params) {
+  return request({
+    url: '/api/dialysiswatch/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function GetDialysisWatchTableData(params) {
+  return request({
+    url: '/api/dialysiswatch/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function GetDialysisBloodPressureChartData(params) {
+  return request({
+    url: '/api/dialysisbloodpressure/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function GetDialysisBloodPressureTableData(params) {
+  return request({
+    url: '/api/dialysisbloodpressure/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+export function GetDialysisPatientBloodPressureChartData(params) {
+  return request({
+    url: '/api/patientdialysisbloodpressure/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+export function GetDialysisWeightChartData(params) {
+  return request({
+    url: '/api/dialysisweight/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetDialysisWeightTableData(params) {
+  return request({
+    url: '/api/dialysisweight/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function GetDialysisPatientWeightChartData(params) {
+  return request({
+    url: '/api/patientdialysisweight/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetDoctorWorkloadChartData(params) {
+  return request({
+    url: '/api/doctorworkload/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetDoctorWorkloadTableData(params) {
+  return request({
+    url: '/api/doctorworkload/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetNurseWorkloadChartData(params) {
+  return request({
+    url: '/api/nurseworkload/chart',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetNurseWorkloadTableData(params) {
+  return request({
+    url: '/api/nurseworkload/table',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function GetAllAdminUser() {
+  return request({
+    url: '/api/adminuser/all',
+    method: 'get',
+  })
+}
+
+export function GetDefalutPatient() {
+  return request({
+    url: '/api/defalutpatient/get',
+    method: 'get',
+  })
+}
+
+
+
+
+
+
+

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -846,6 +846,9 @@ export default {
         : 0;
 
       data["is_eat"] = this.form.is_eat ? parseFloat(this.form.is_eat) : 0;
+      data["cvc_a"] = this.form.cvc_a ? parseFloat(this.form.cvc_a) : 0;
+      data["cvc_v"] = this.form.cvc_v ? parseFloat(this.form.cvc_v) : 0;
+
       console.log("data", data);
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -9,15 +9,28 @@
         <div class="cell clearfix">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:110px"></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>
-          <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
+          <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px">
             <el-option
               v-for="item in options"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
@@ -25,7 +38,7 @@
             <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"
@@ -38,7 +51,7 @@
           ></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"
@@ -54,8 +67,14 @@
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
             <el-table :data="tableData" border style="width: 100%;" height="500">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+              <el-table-column prop="date" label="日期" width="100">
+
+
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" width="100">
+
+
+              </el-table-column>
             </el-table>
           </div>
           <div style="padding-left:10px;flex:1">
@@ -65,7 +84,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border v-loading="loading">
                 <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>
@@ -78,7 +97,7 @@
                 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
@@ -96,255 +115,304 @@
 
 
 <script>
-import echarts from "echarts";
-import NewNav from "../indicatorControlAnalysis/components/NewNav";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    LineChart,
-    BreadCrumb,
-    NewNav
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "指标评估统计" },
-        { path: false, name: "透析过程指标统计" }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      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: "王小虎"
-        }
-      ],
-      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
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
-        xAxis: {
-          data: ["达标", "未达标"]
+  import echarts from 'echarts'
+  import NewNav from '../indicatorControlAnalysis/components/NewNav'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import LineChart from '../../qcd/components/LineChart'
+  import {
+    GetDefalutPatient,
+    GetDialysisProcessIndexChartData,
+    GetDialysisProcessIndexTableData
+  } from '@/api/common/statistics'
+
+  export default {
+    components: {
+      LineChart,
+      BreadCrumb,
+      NewNav
+    },
+    data() {
+      return {
+        loading: false,
+        search_value: '',
+        total: '',
+        query: {
+          patient_id: '',
+          statistics_type: 1,
+          start_time: '',
+          end_time: '',
+          limit: 10,
+          page: 1
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        options: [
+          { value: 1, name: '透前体重' },
+          { value: 2, name: '透后体重' },
+          { value: 3, name: '透前收缩压' },
+          { value: 4, name: '透前舒张压' },
+          { value: 5, name: '透前脉率' },
+          { value: 6, name: '透后收缩压' },
+          { value: 7, name: '透后舒张压' },
+          { value: 8, name: '透后脉率' },
+          { value: 9, name: '透析方式' },
+          { value: 10, name: '抗凝剂' }
+        ],
+        crumbs: [
+          { path: false, name: '科室质控' },
+          { path: false, name: '指标评估统计' },
+          { path: false, name: '透析过程指标统计' }
+        ],
+        tableData: [],
+        tableData1: [],
+        chart: {
+          title: {
+            text: 'ECharts 入门示例'
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "line",
-            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: {
-              //通常情况下：
+            show: false
+          },
+          series: [
+            {
+              name: '',
+              type: 'line',
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: '{c}次'
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
 
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#A9E0F3', '#9FBDFC'],
 
-                    ["#FFD7C0", "#FF9994"]
-                  ];
+                      ['#FFD7C0', '#FF9994']
+                    ]
 
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
-                  }
+                    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] }
-                  ]);
+                    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] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        },
+        bar: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            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']
+                    ]
+
+                    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)'
+                }
+              }
+            }
+          ]
+        }
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+      }
+    },
+    methods: {
+      changeTime() {
+
+      }, changeEndTime() {
+
+      }, GetDialysisProcessIndexTableData(params) {
+        this.loading = true
+        this.tableData = []
+        GetDialysisProcessIndexTableData(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 => {
+
+          })
+      },
+      GetDialysisProcessIndexChartData(params) {
+        this.chart.xAxis.data = []
+        this.chart.series[0].data = []
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetDialysisProcessIndexChartData(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
+                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 {
+                for (let i = 0; i < resp.data.data.length; i++) {
+                  this.bar.xAxis.data.push(resp.data.data[i].name)
+                  this.bar.series[0].data.push(resp.data.data[i].total)
+                }
+              }
+            } else {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      handleSelect(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisProcessIndexChartData(this.query)
+        this.GetDialysisProcessIndexTableData(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([])
           }
-        ]
+        })
+      },
+      chooseWay(way) {
+        this.wayType = way
       }
-    };
-  },
-  methods: {
-    chooseWay(way) {
-      this.wayType = way;
+    }, 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.GetDialysisProcessIndexChartData(this.query)
+      this.GetDialysisProcessIndexTableData(this.query)
+
     }
   }
-};
 </script>
 
 <style lang="scss" scoped>
-.tableTitle {
-  font-size: 16px;
-  color: #000;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .tableTitle {
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 </style>
 <style lang="scss">
-.page_process {
+  .page_process {
+
   .el-button--medium {
     padding: 10px 8px;
   }
+
   .el-form-item {
     margin-bottom: 0;
   }
-}
+
+  }
 </style>

src/xt_pages/workforce/template.vue

@@ -121,7 +121,6 @@
           <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
                           :patients="patients"></template-table>
         </el-tab-pane>
-        、
 
         <el-tab-pane name="second" :disabled="template_mode.mode != 2">
           <span slot="label"> 第二周 </span>