Merge remote-tracking branch 'origin/update' into update_branch

src/api/qcd.js

+import request from '@/utils/request'
+
+export function getdialysistotaldata(params){
+    return request({
+        url:'/api/qcd/dialysistotaldata',
+        method:'get',
+        params:params
+    })
+}
+export function GetProcessIndicatorsData(params){
+    return request({
+        url:'/api/qcd/processindicatorsdata',
+        method:'get',
+        params:params
+    })
+}

src/xt_pages/dialysis/batch_print/batch_print_order.vue

                                         <div class="inline_block" style="float: right;">
                                             医生签名：
                                             <div class="under_line" style="width: 100px;">
-                                                
-                                                <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
-                                                <img class="es-img" :src="setAdminUserES(record.prescription, 'prescription_doctor')" alt="" srcset="" v-else style="height: 20px;">
+                                                <span v-if="!record.advices || typeof(record.advices[0]) == 'undefined' || typeof(record.advices[0][0]) == 'undefined'"></span>
+                                                <span v-else-if="setAdminUserES(record.advices[0][0], 'advice_doctor') == ''">{{getAdminUser(record.advices, 'advice_doctor')}}</span>
+                                                <img class="es-img" :src="setAdminUserES(record.advices[0][0], 'advice_doctor')" alt="" srcset="" v-else style="height: 20px;">
 
                                                 <!-- <img style="height: 20px;" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1552901663505&di=bf12bd343b552c6ccfb2ed12343a3141&imgtype=0&src=http%3A%2F%2Fd.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fe61190ef76c6a7ef7d58560df3faaf51f3de669b.jpg" /> -->
                                             </div>
                                                     &nbsp;{{monitor_record.result}}
                                                 </td>
                                             </tr>
-                                            <!-- 使整个表有7行以上 -->
-                                            <template v-if="record.monitor_records.length < 8">
-                                            <tr v-for="(num) in (8 - record.monitor_records.length)" :key="'8_' + num">
-                                                <td></td>
-                                                <td>/</td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                            </tr>
-                                            </template>
                                         </tbody>
                                     </table>
                                 </td>
                                                 </td>
                                             </tr>
                                             <!-- 使整个表有5行以上 -->
-                                            <template v-if="record.advices.length < 5">
+                                            <!-- <template v-if="record.advices.length < 1">
                                             <tr v-for="(num) in (5 - record.advices.length)" :key="'5_' + num">
                                                 <td>&nbsp;</td>
                                                 <td></td>
                                                 <td></td>
                                                 <td></td>
                                             </tr>
-                                            </template>
+                                            </template> -->
                                         </tbody>
                                     </table>
                                 </td>
             if (resp.state == 1) {
                 this.records = this.records.concat(resp.data.schedules);
                 for (const recordIndex in this.records) {
+                    var dlegh = 0;
+                    if(this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length<8) {
+                        dlegh = 8 - this.records[recordIndex].monitor_records.length;
+                    }else {
+                        dlegh = 8;
+                    }
+                    if (dlegh>0) {
+                        if(typeof(this.records[recordIndex].monitor_records) =='undefined' || this.records[recordIndex].monitor_records==null) {
+                            this.records[recordIndex].monitor_records = [];
+                        }
+                        for (let index = 0; index < dlegh; index++) {
+                            this.records[recordIndex].monitor_records.push([]);
+                        }
+                    }
+
+                
                     var childMap = {};
                     for (const index in this.records[recordIndex].advices) {
                         if (this.records[recordIndex].advices[index].parent_id == 0) {
                     var rightAdvice = [];
                     var adlen = advices.length;
 
-                    debugger
                     var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen+1) / 2;
                     for (var i = 0; i < halfLen; i++) {
                         leftAdvice.push(advices[i]);
             }
         },
         setAdminUserES(key, id) {
-            if (key == null || typeof(key) == 'undefined' || typeof(key[id]) == 'undefined') {
+            if (typeof(key) == 'undefined' || key == null || typeof(key[id]) == 'undefined') {
                 return ''
             }
             if (key[id] == 0) {
             }
         },
         getAdminUser(key, id) {
-            if (key == null || typeof(key) == 'undefined' || typeof(key[id]) == 'undefined') {
+            if (typeof(key) == 'undefined' || key == null || typeof(key[id]) == 'undefined') {
                 return ''
             }
             if (key[id] == 0) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

           </tr>
 
           <!-- 使整个表有5行以上 -->
-          <template v-if="advices.length < 5">
+          <!-- <template v-if="advices.length < 5">
           <tr v-for="(num) in (5 - advices.length)" :key="'5_' + num">
               <td>&nbsp;</td>
               <td></td>
               <td></td>
               <td></td>
           </tr>
-          </template>
+          </template> -->
           </tbody>
         </table>
 

src/xt_pages/qcd/components/BarChart.vue

+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+const animationDuration = 6000
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    },
+    title:{
+      type: String,
+      default: 'chart'
+    },
+    options:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      chartOptions:{},
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHanlder = debounce(() => {
+      if (this.chart) {
+        this.chart.resize() 
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHanlder)
+    this.chart.dispose()
+    this.chart = null
+  },
+  created(){
+  },
+  watch:{
+    "options":function(){
+      this.chartOptions = this.options;
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize() 
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    }
+  },
+  methods: {
+    initChart() {
+      console.log("this.chartOptions", this.chartOptions);
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.chart.setOption({
+        title: {
+            text: this.title,
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data:  this.chartOptions.xAxis,
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: '',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: this.chartOptions.series,
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>

src/xt_pages/qcd/components/PieChart.vue

+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '320px'
+    },
+    title:{
+      type: String,
+      default: 'chart'
+    },
+    options:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      chartOptions:{},
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHanlder = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHanlder)
+    this.chart.dispose()
+    this.chart = null
+  },
+  created(){
+    this.chartOptions = this.options;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        title: {
+            text: this.title,
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: this.chartOptions.legend,
+        },
+        calculable: true,
+        series: [
+          {
+            name: '',
+            type: 'pie',
+            roseType: 'radius',
+            radius: [15, 95],
+            center: ['50%', '38%'],
+            data: this.chartOptions.series,
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  },
+  watch:{
+    "options":function(){
+      this.chartOptions = this.options;
+      this.initChart()
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize() 
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    }
+    
+  } 
+}
+</script>

src/xt_pages/qcd/dialysisTotal.vue

+<template>
+  <div class="app-container">
+    <div class="cell">
+      <label class="title">
+        <span class="name">日期查询</span> :
+      </label>
+      <el-date-picker
+        v-model="listQuery.start_time"
+        prefix-icon="el-icon-date"
+        @change="changeTime"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        :picker-options="pickerOptions"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+      ></el-date-picker>
+      <span class>-</span>
+      <el-date-picker
+        v-model="listQuery.end_time"
+        prefix-icon="el-icon-date"
+        @change="changeTime"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        :picker-options="pickerOptions"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+      ></el-date-picker>
+    </div>
+    <div class="cell clearfix">
+      <label class="title">
+        <span class="name">统计方式</span> :
+      </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.value==statisticalMethod?'active':''"
+            @click="selectStatisticalMethod(item.value)"
+            v-for="item in statisticalMethods"
+            :key="item.value"
+          >{{item.label}}</li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix">
+      <label class="title">
+        <span class="name">转归状态</span> :
+      </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.lapseto==lapsetoType?'active':''"
+            @click="selectLapseTo( item.lapseto)"
+            v-for="item in lapsetoState"
+            :key="item.value"
+          >{{item.label}}</li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="cell">
+      <label class="title">
+        <span class="name">透析模式</span> :
+      </label>
+      <el-select v-model="listQuery.mode_id" placeholder="请选择" @change="changeModel()">
+        <el-option label="全部" value></el-option>
+        <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+      </el-select>
+    </div>
+
+    <h4 class="hui">统计图</h4>
+    <hr class="huixiao">
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="24">
+        <div class="chart-wrapper">
+            <bar-chart :title="totitle + batotal +'人次'" :options="modesData" />
+        </div>
+      </el-col>
+    </el-row>
+
+    <h4 class="hui">统计表</h4>
+    <hr class="huixiao">
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;margin-top: 10px;"
+    >
+      <el-table-column label="日期" min-width="80" property="date" align="center"></el-table-column>
+      <el-table-column
+        :label="modeOptions[1].name"
+        v-if="listQuery.mode_id==1||listQuery.mode_id==''"
+        property="data[1].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[2].name"
+        v-if="listQuery.mode_id==2||listQuery.mode_id==''"
+        property="data[2].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[3].name"
+        v-if="listQuery.mode_id==3||listQuery.mode_id==''"
+        property="data[3].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[4].name"
+        v-if="listQuery.mode_id==4||listQuery.mode_id==''"
+        property="data[4].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[5].name"
+        v-if="listQuery.mode_id==5||listQuery.mode_id==''"
+        property="data[5].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[6].name"
+        v-if="listQuery.mode_id==6||listQuery.mode_id==''"
+        property="data[6].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[7].name"
+        v-if="listQuery.mode_id==7||listQuery.mode_id==''"
+        property="data[7].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[8].name"
+        v-if="listQuery.mode_id==8||listQuery.mode_id==''"
+        property="data[8].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[9].name"
+        v-if="listQuery.mode_id==9||listQuery.mode_id==''"
+        property="data[9].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[10].name"
+        v-if="listQuery.mode_id==10||listQuery.mode_id==''"
+        property="data[10].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[11].name"
+        v-if="listQuery.mode_id==11||listQuery.mode_id==''"
+        property="data[11].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[12].name"
+        v-if="listQuery.mode_id==12||listQuery.mode_id==''"
+        property="data[12].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[13].name"
+        v-if="listQuery.mode_id==13||listQuery.mode_id==''"
+        property="data[13].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[14].name"
+        v-if="listQuery.mode_id==14||listQuery.mode_id==''"
+        property="data[14].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[15].name"
+        v-if="listQuery.mode_id==15||listQuery.mode_id==''"
+        property="data[15].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[16].name"
+        v-if="listQuery.mode_id==16||listQuery.mode_id==''"
+        property="data[16].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[17].name"
+        v-if="listQuery.mode_id==17||listQuery.mode_id==''"
+        property="data[17].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        :label="modeOptions[18].name"
+        v-if="listQuery.mode_id==18||listQuery.mode_id==''"
+        property="data[18].number"
+        align="center"
+      ></el-table-column>
+      <el-table-column label="总数" min-width="80" property="total" align="center"></el-table-column>
+    </el-table>
+
+    <!-- <pagi-nation title="分页"></pagi-nation> -->
+
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="listQuery.pate"
+      :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>
+</template>
+
+
+<script>
+import { getdialysistotaldata } from "@/api/qcd";
+import BarChart from "./components/BarChart";
+export default {
+  name: "dialysisTotal",
+  data() {
+    return {
+      total: 0,
+      totitle:'全部',
+      batotal:0,
+      modesData: {
+        xAxis:[],
+        series:[],
+      },
+      listQuery: {
+        start_time: "",
+        end_time: "",
+        page: 1,
+        limit: 10,
+        lapseto: 0,
+        statistical_method: 0,
+        mode_id: ""
+      },
+      modeOptions: {},
+      tableData: [],
+      statisticalMethod: 0,
+      statisticalMethods: [
+        { value: 0, label: "全部" },
+        { value: 1, label: "开始透析" },
+        { value: 2, label: "排班" }
+      ],
+      lapsetoType: 0,
+      lapsetoState: [
+        { value: 0, label: "全部", source: 0, lapseto: 0 },
+        { value: 1, label: "转出", source: 0, lapseto: 2 },
+        { value: 2, label: "留治", source: 0, lapseto: 1 }
+      ],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "今天",
+            onClick(picker) {
+              picker.$emit("pick", new Date());
+            }
+          },
+          {
+            text: "昨天",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit("pick", date);
+            }
+          },
+          {
+            text: "一周前",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", date);
+            }
+          },
+          {
+            text: "清空",
+            onClick(picker) {
+              picker.$emit("pick");
+            }
+          }
+        ]
+      }
+    };
+  },
+  created() {
+    this.modeOptions = this.$store.getters.treatment_mode;
+
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.listQuery.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 3);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.listQuery.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.getList();
+  },
+  methods: {
+    getList() {
+      getdialysistotaldata(this.listQuery).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.tableData = [];
+          var dtd = response.data.data.dtd;
+          var dd = {};
+          for (const index in dtd) {
+            if (!(dtd[index].date in dd)) {
+              dd[dtd[index].date] = {};
+            }
+            if (
+              !(dtd[index].mode_id in dd[dtd[index].date]) &&
+              dtd[index].mode_id != "0"
+            ) {
+              dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
+            }
+          }
+          for (const key in dd) {
+            var total = 0;
+            for (const mkey in this.modeOptions) {
+              if (mkey in dd[key]) {
+                dd[key][mkey].mode = this.modeOptions[mkey].name;
+                total += parseInt(dd[key][mkey].number);
+              } else {
+                dd[key][mkey] = {
+                  mode: this.modeOptions[mkey].name,
+                  mode_id: mkey,
+                  number: 0,
+                  date: key
+                };
+              }
+            }
+            this.tableData.push({ date: key, data: dd[key], total: total });
+          }
+          this.total = response.data.data.total;
+
+          this.modesData = {
+            xAxis:[],
+            series:[],
+          };
+          var ttd = response.data.data.ttd;
+          var modeMap = {};
+          var batotal = 0;
+          for (const index in ttd) {
+            if (ttd[index].mode_id == "0") {
+              continue;
+            }
+            modeMap[ttd[index].mode_id] = ttd[index];
+          }
+          for (const key in this.modeOptions) {
+            this.modesData.xAxis.push(this.modeOptions[key].name);
+            if (key in modeMap) {
+              this.modesData.series.push( parseInt(modeMap[key].number));
+              batotal += parseInt(modeMap[key].number);
+            } else {
+              this.modesData.series.push(0);
+            }
+          }
+          this.batotal = batotal;
+        }
+      });
+    },
+    changeTime() {
+      this.getList();
+    },
+    selectStatisticalMethod(type) {
+      this.statisticalMethod = type;
+      this.listQuery.statistical_method = type;
+      if (type == 1) {
+          this.totitle = '总透析';
+      }else if(type == 2) {
+          this.totitle = '总排班';
+      }else {
+          this.totitle = '全部';
+      }
+      this.getList();
+    },
+    selectLapseTo(lapseto) {
+      this.lapsetoType = lapseto;
+      this.listQuery.lapseto = lapseto;
+      this.getList();
+    },
+    changeModel() {
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    }
+  },
+  components: {
+    BarChart
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container {
+//   margin: 20px;
+    margin-bottom: 50px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .hui {
+    color: #909399;
+    margin-bottom: 5px;
+  }
+  .huixiao {
+    border: solid 1px #ebeef5;
+  }
+  .el-pagination {
+    float: right !important;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
+    .title {
+      width: 80px;
+      display: inline-block;
+      font-weight: normal;
+      color: #909399;
+      padding: 6px 0;
+      font-weight: 700;
+      .name {
+        width: 60px;
+        text-align: justify;
+        text-justify: distribute-all-lines;
+        text-align-last: justify;
+        -moz-text-align-last: justify;
+        -webkit-text-align-last: justify;
+        display: inline-block;
+      }
+    }
+    .time {
+      -webkit-box-flex: 1;
+      -ms-flex: 1;
+      flex: 1;
+      ul {
+        padding: 0;
+        margin: 0;
+        li {
+          float: left;
+          list-style: none;
+          cursor: pointer;
+          padding: 6px 10px;
+          color: #606266;
+          border-radius: 4px;
+          margin: 0 4px 0 0;
+          &:hover {
+            background: #409eff;
+            color: #fff;
+          }
+        }
+        .active {
+          background: #409eff;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+</style>

src/xt_pages/qcd/processIndicators.vue

+<template>
+  <div class="app-container">
+    <div class="cell">
+      <label class="title">
+        <span class="name">日期查询</span> :
+      </label>
+      <el-date-picker
+        v-model="listQuery.start_time"
+        prefix-icon="el-icon-date"
+        @change="changeTime"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        :picker-options="pickerOptions"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+      ></el-date-picker>
+      <span class>-</span>
+      <el-date-picker
+        v-model="listQuery.end_time"
+        prefix-icon="el-icon-date"
+        @change="changeTime"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        :picker-options="pickerOptions"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+      ></el-date-picker>
+    </div>
+    <div class="cell clearfix">
+      <label class="title">
+        <span class="name">透析龄</span> :
+      </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.value==dialysisAge?'active':''"
+            @click="selectdialysisAges(item.value)"
+            v-for="item in dialysisAgeOptions"
+            :key="item.value"
+          >{{item.label}}</li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix">
+      <label class="title">
+        <span class="name">转归状态</span> :
+      </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.lapseto==lapsetoType?'active':''"
+            @click="selectLapseTo( item.lapseto)"
+            v-for="item in lapsetoState"
+            :key="item.value"
+          >{{item.label}}</li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="cell">
+      <label class="title">
+        <span class="name">检验项目</span> :
+      </label>
+      <el-select v-model="listQuery.project_id" placeholder="请选择" @change="changeModel()">
+        <el-option label="全部" value=""></el-option>
+        <el-option v-for="item in projectOptions" :key="item.project_id" :label="item.project_name" :value="item.project_id"></el-option>
+      </el-select>
+    </div>
+
+    <h4 class="hui">统计图</h4>
+    <hr class="huixiao">
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="24">
+        <div class="chart-wrapper">
+            <pie-chart title="完成情况" :options="CompletionOptions"/>
+        </div>
+      </el-col>
+    </el-row>
+
+    <h4 class="hui">统计表</h4>
+    <hr class="huixiao">
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      :span-method="mergeSpan"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;margin-top: 10px;"
+    >
+      
+      <el-table-column label="透析号" min-width="80" property="patient_id" align="center">
+        <template slot-scope="scope"><span>{{getPatientDialysisNo(scope.row.patient_id)}}</span></template>
+      </el-table-column>
+      <el-table-column label="姓名" min-width="80" property="patient_id" align="center">
+        <template slot-scope="scope"><span>{{getPatientName(scope.row.patient_id)}}</span></template>
+      </el-table-column>
+      <el-table-column label="检查项目" min-width="80" property="project_id" align="center">
+        <template slot-scope="scope"><span>{{getProjectName(scope.row.project_id)}}</span></template>
+      </el-table-column>
+      <el-table-column label="检查日期" min-width="80" property="inspect_date" align="center">
+        <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagi-nation title="分页"></pagi-nation> -->
+
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="listQuery.pate"
+      :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>
+</template>
+
+
+<script>
+import { GetProcessIndicatorsData  } from "@/api/qcd";
+import PieChart from './components/PieChart'
+import {uParseTime} from "@/utils/tools";
+export default {
+  name: "dialysisTotal",
+  data() {
+    return {
+      total: 0,
+      projectOptions:{},
+      patientMap:{},
+        CompletionOptions:{
+            legend:[],
+            series:[],
+        },
+      listQuery: {
+        start_time: "",
+        end_time: "",
+        page: 1,
+        limit: 10,
+        lapseto: 0,
+        project_id:'',
+        dialysis_age:0,
+      },
+      tableData: [],
+      tableRowData:[],
+      lapsetoType: 0,
+      lapsetoState: [
+        { value: 0, label: "全部", source: 0, lapseto: 0 },
+        { value: 1, label: "转出", source: 0, lapseto: 2 },
+        { value: 2, label: "留治", source: 0, lapseto: 1 }
+      ],
+      dialysisAge: 0,
+      dialysisAgeOptions: [
+        { value: 0, label: "全部" },
+        { value: 1, label: "大于三个月" },
+        { value: 2, label: "小于三个月" }
+      ],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "今天",
+            onClick(picker) {
+              picker.$emit("pick", new Date());
+            }
+          },
+          {
+            text: "昨天",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit("pick", date);
+            }
+          },
+          {
+            text: "一周前",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", date);
+            }
+          },
+          {
+            text: "清空",
+            onClick(picker) {
+              picker.$emit("pick");
+            }
+          }
+        ]
+      }
+    };
+  },
+  created() {
+
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.listQuery.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 3);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.listQuery.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.getList();
+  },
+  methods: {
+    getList() {
+      GetProcessIndicatorsData(this.listQuery).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.tableData = [];
+          this.tableRowData = [];
+          this.total = response.data.data.total;
+          var unfinishedcount = response.data.data.unfinishedcount;
+          var finishedcount = this.total - unfinishedcount;
+          this.CompletionOptions = {
+            legend:[],
+            series:[],
+          };
+          this.CompletionOptions.legend.push('定时完成人次');
+          this.CompletionOptions.series.push({
+                value:finishedcount,name:'定时完成人次'
+            });
+          this.CompletionOptions.legend.push('未时完成人次');
+          this.CompletionOptions.series.push({
+                value:unfinishedcount,name:'未时完成人次'
+            });
+
+          
+        
+          var references = response.data.data.references;
+          for (const index in references) {
+            if (references[index].project_id in this.projectOptions) {
+              continue;  
+            }
+            this.$set(this.projectOptions, references[index].project_id, references[index]);
+          }
+
+          var patients = response.data.data.patients;
+          for (const index in patients) {
+            if (patients[index].id in this.patientMap) {
+              continue;  
+            }
+            this.$set(this.patientMap, patients[index].id, patients[index]);
+          }
+          var temInspections = {};
+          var inspections = response.data.data.inspections;
+          for (const index in inspections) {
+            var key = inspections[index].inspect_date + '_' + inspections[index].patient_id;
+            if (!(key in temInspections)) {
+              temInspections[key] = {};
+            }
+            if (inspections[index].project_id in temInspections[key]) {
+              continue;
+            }
+            temInspections[key][inspections[index].project_id] = inspections[index];
+          }
+          var rowIndex = 0;
+          var childIndex = 0;
+          for (const key in temInspections) {
+            this.tableRowData.push(1);
+            var parentIndex = rowIndex;
+            childIndex = 0;
+            for (const child in temInspections[key]) {
+              this.tableData.push(temInspections[key][child]);
+              if(childIndex>0) {
+                this.tableRowData[parentIndex] += 1;
+                this.tableRowData.push(0);
+              }
+              childIndex++;
+              rowIndex++;
+            }
+          }
+
+        }
+      });
+    },
+    changeTime() {
+      this.getList();
+    },
+    selectLapseTo(lapseto) {
+      this.lapsetoType = lapseto;
+      this.listQuery.lapseto = lapseto;
+      this.getList();
+    },
+    selectdialysisAges(type) {
+      this.dialysisAge = type;
+      this.listQuery.dialysis_age = type;
+      this.getList();
+    },
+    changeModel() {
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ""
+    },
+    getProjectName(id) {
+      return (id in this.projectOptions) ? this.projectOptions[id].project_name:'';
+    },
+    getPatientName(id) {
+      return (id in this.patientMap) ? this.patientMap[id].name:'';
+    },
+    getPatientDialysisNo(id) {
+      return (id in this.patientMap) ? this.patientMap[id].dialysis_no:'';
+    },
+    mergeSpan({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 3) {
+        const _row = this.tableRowData[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
+  },
+  components: {
+      PieChart
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container {
+//   margin: 20px;
+    margin-bottom: 50px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .hui {
+    color: #909399;
+    margin-bottom: 5px;
+  }
+  .huixiao {
+    border: solid 1px #ebeef5;
+  }
+  .el-pagination {
+    float: right !important;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
+    .title {
+      width: 80px;
+      display: inline-block;
+      font-weight: normal;
+      color: #909399;
+      padding: 6px 0;
+      font-weight: 700;
+      .name {
+        width: 60px;
+        text-align: justify;
+        text-justify: distribute-all-lines;
+        text-align-last: justify;
+        -moz-text-align-last: justify;
+        -webkit-text-align-last: justify;
+        display: inline-block;
+      }
+    }
+    .time {
+      -webkit-box-flex: 1;
+      -ms-flex: 1;
+      flex: 1;
+      ul {
+        padding: 0;
+        margin: 0;
+        li {
+          float: left;
+          list-style: none;
+          cursor: pointer;
+          padding: 6px 10px;
+          color: #606266;
+          border-radius: 4px;
+          margin: 0 4px 0 0;
+          &:hover {
+            background: #409eff;
+            color: #fff;
+          }
+        }
+        .active {
+          background: #409eff;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+</style>

src/xt_pages/workforce/components/template_table.vue

 
             for (let index = 0; index < this.template.items.length; index++) {
                 const template_item = this.template.items[index];
+                if (template_item.patient == null) {
+                    continue;
+                }
 
                 for (let d_i = 0; d_i < this.opera_device_numbers.length; d_i++) {
                     const device_number = this.opera_device_numbers[d_i];
                         cell_item.pid = template_item.patient_id
                         cell_item.name = template_item.patient.name
                         cell_item.treat_mode_id = template_item.treat_mode
-                        cell_item.treat_mode = this.treat_modes[template_item.treat_mode].name
+                        cell_item.treat_mode = template_item.treat_mode?this.treat_modes[template_item.treat_mode].name:''
                         device_number.total += 1
 
                         // origin_device_numbers 初始化时数据应该是和 opera_device_numbers 一样的，这里就不再用一个 for 遍历 origin_device_numbers 重复 opera_device_numbers 的操作了
                         o_cell_item.pid = template_item.patient_id
                         o_cell_item.name = template_item.patient.name
                         o_cell_item.treat_mode_id = template_item.treat_mode
-                        o_cell_item.treat_mode = this.treat_modes[template_item.treat_mode].name
+                        o_cell_item.treat_mode = template_item.treat_mode?this.treat_modes[template_item.treat_mode].name:''
                         o_device_number.total += 1
 
                         break
                         message: "已保存",
                         type: "success",
                     })
+                    this.template.items = resp.data.items
                 } else {
                     this.$message.error(resp.msg)
                 }

src/xt_permission.js

 
 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()