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

src/api/common/common.js

     params: params
   })
 }
+
+export function getAllMajorInspection(params) {
+  return request({
+    url: '/com/api/getallmajorInspection',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientList(startime, endtime, limit, page) {
+  const params = {
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+  return request({
+    url: '/com/api/getpatientlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientDetailCheck(id, startime, endtime) {
+  const params = {
+    id: id,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/getPatientDetailCheck',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SearchDetailCheck(keyword, startime, endtime) {
+  const params = {
+    keyword: keyword,
+    startime: startime,
+    endtime: endtime
+  }
+
+  return request({
+    url: '/com/api/searchdetailcheck',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getNormData(params) {
+  return request({
+    url: '/com/api/getnormdata',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getFirstQuarter(lapseto, startime, endtime) {
+  const params = {
+    lapseto: lapseto,
+    startime: startime,
+    endtime: endtime
+  }
+  console.log('params', params)
+  return request({
+    url: '/com/api/getfirstquarter',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getProjectList(params) {
+  console.log('params', params)
+  return request({
+    url: '/com/api/getprojectlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMonthProjectList(params) {
+  return request({
+    url: '/com/api/getmonthprojectlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/qcd.js

     icon: "statistics"
   },
   children: [
-    {
-      path: "/statistics/index",
-      component: () => import("@/xt_pages/statistics/index"),
-      name: "statistics",
-      meta: {
-        title: "statistics",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/dialysistotal",
-      component: () => import("@/xt_pages/qcd/dialysisTotal"),
-      name: "dialysistotal",
-      meta: {
-        title: "透析总量",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/processindicators",
-      component: () => import("@/xt_pages/qcd/processIndicators"),
-      name: "processIndicators",
-      meta: {
-        title: "过程指标",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/outcomeIndicators/control",
-      component: () => import("@/xt_pages/qcd/outcomeIndicators/control"),
-      name: "outcomeIndicatorsControl",
-      meta: {
-        title: "结果指标",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/outcomeIndicators/query",
-      hidden: true,
-      is_menu: false,
-      component: () => import("@/xt_pages/qcd/outcomeIndicators/query"),
-      name: "outcomeIndicatorsQuery",
-      meta: {
-        title: "指标查询",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/patientanalysis/total",
-      component: () => import("@/xt_pages/qcd/patientAnalysis/total"),
-      name: "patientAnalysisTotal",
-      meta: {
-        title: "患者分析",
-        noCache: true
-      }
-    },
+    // {
+    //   path: "/statistics/index",
+    //   component: () => import("@/xt_pages/statistics/index"),
+    //   name: "statistics",
+    //   meta: {
+    //     title: "statistics",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/dialysistotal",
+    //   component: () => import("@/xt_pages/qcd/dialysisTotal"),
+    //   name: "dialysistotal",
+    //   meta: {
+    //     title: "透析总量",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/processindicators",
+    //   component: () => import("@/xt_pages/qcd/processIndicators"),
+    //   name: "processIndicators",
+    //   meta: {
+    //     title: "过程指标",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/outcomeIndicators/control",
+    //   component: () => import("@/xt_pages/qcd/outcomeIndicators/control"),
+    //   name: "outcomeIndicatorsControl",
+    //   meta: {
+    //     title: "结果指标",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/outcomeIndicators/query",
+    //   hidden: true,
+    //   is_menu: false,
+    //   component: () => import("@/xt_pages/qcd/outcomeIndicators/query"),
+    //   name: "outcomeIndicatorsQuery",
+    //   meta: {
+    //     title: "指标查询",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/patientanalysis/total",
+    //   component: () => import("@/xt_pages/qcd/patientAnalysis/total"),
+    //   name: "patientAnalysisTotal",
+    //   meta: {
+    //     title: "患者分析",
+    //     noCache: true
+    //   }
+    // },
     {
       path: "/qcd/patientanalysis/statisticalConfig",
       component: () => import("@/xt_pages/qcd/statisticalConfiguration"),

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

       })
     },
     getPartName(id) {
+      console.log("id",id)
       for (let i = 0; i < this.bloodAccess.length; i++) {
         if ((this.bloodAccess[i].id = id)) {
           return this.bloodAccess[i].name;

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

         <el-radio v-model="receiveTreatmentAsses.condition" label="3"
           >手术期</el-radio
         >
+        <el-radio v-model="receiveTreatmentAsses.condition" label="4"
+          >急诊</el-radio
+        >
       </el-form-item>
 
       <el-form-item

src/xt_pages/dialysis/dialysisPrintOrder.vue

           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 15">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 13"
       ></DialysisPrintOrderThirteen>
+      <DialysisPrintOrderFifteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 15"
+      ></DialysisPrintOrderFifteen>
     </div>
   </div>
 </template>
 import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
 import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
+import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+  DialysisPrintOrderFifteen,
     DialysisPrintOrderThirteen,
     DialysisPrintOrderTwelve,
     DialysisPrintOrderEleven,
           style: style3,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 15){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/integration/his/patientHisConfig.vue

         }
         this.form.other_age = this.getAge(row)
         this.form.infectious = this.getInfectiousName(row)
-        console.log('111111')
-        console.log(this.getInfectiousName(row))
+       // console.log('111111')
+       // console.log(this.getInfectiousName(row))
 
         if (row.his_patient.id > 0) {
           this.his_record_id = row.his_patient.id

src/xt_pages/qcd/officesControlAnalysis/project.vue

         <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="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeOptions">
           <el-option
             v-for="item in options"
             :key="item.value"
             :value="item.value"
           ></el-option>
         </el-select>
-        <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:20px" @change="handleModeType">
           <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in normdata"
+            :key="item.inspection_minor"
+            :label="item.item_name"
+            :value="item.inspection_minor"
           ></el-option>
         </el-select>
       </div>
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
+        <span class="index" v-for="(item,index) in normdata" :key="index ">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import { GetOICData } from "@/api/qcd";
 import LineChart from "../../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getNormData,getProjectList,getMonthProjectList } from "@/api/common/common"
 export default {
   components: {
     LineChart,
   data() {
     return {
       activeName: "second",
+      normdata:[],
+      modesData: {
+        xAxis: [],
+        series: []
+      },
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "科室质控达标统计" },
       ],
       options: [
         {
-          value: "选项1",
-          label: "黄金糕"
+          value:0,
+          label:"全部",
         },
         {
-          value: "选项2",
-          label: "双皮奶"
+          value: 1,
+          label: "留治",
         },
         {
-          value: "选项3",
-          label: "蚵仔煎"
+          value:2,
+          label: "转归"
         },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
       ],
-      value: "请选项",
       options1: [
         {
-          value: "按季度对比统计",
+          value: 1,
           label: "按季度对比统计"
         },
         {
-          value: "按月份对比统计",
+          value: 2,
           label: "按月份对比统计"
-        }
+        },
       ],
-      type: "按季度对比统计",
+      value: "请选项",
+      lapseto:0,
+      type:1,
+      mode_type:"",
       chart: {
         title: {
           text: "ECharts 入门示例"
         series: [
           {
             name: "次数",
-            type: "line",
+            type: "bar",
             data: [
               "78.57",
               "50",
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
       }
     },
     chooseType(val) {
-      console.log(val);
       this.type = val;
+      console.log("val",val)
+      //按季度
+      if(val == 1){
+        this.getlist()
+      }
+      //按月份
+      if(val == 2){
+        this.getMonthList()
+      }
+     
+    },
+    changeOptions(val){
+      this.lapseto = val
+      this.getlist()
+    },
+    getNormData(){
+        getNormData().then(response=>{
+            var normdata = response.data.data.normdata
+            console.log("normdata",normdata)
+            for(let i=0;i<normdata.length;i++){
+             this.mode_type = normdata[0].inspection_minor
+            }
+            this.normdata = normdata
+            this.getlist()
+            this.getMonthList()
+        })
+    },
+    handleModeType(val){
+      this.mode_type = val
+      this.getlist()
+    },
+
+    //季度
+    getlist(){
+         this.modesData.series = []
+         this.modesData.xAxis = []
+        const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
+       // console.log("本月开始时间",firstQuarterStart)
+        const firstQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
+       // console.log("本月结束时间",firstQuarterEnd)
+
+        //第一季度
+        const first_quarter_start =  moment().startOf('year').format('YYYY-MM-DD')
+       // console.log("第一季度",first_quarter_start)
+        const first_qurter_end = moment().month(2).endOf('month').format("YYYY-MM-DD")
+      // console.log("第一季度",first_qurter_end)
+        //第二季度
+        const second_qurter_start = moment().month(3).startOf('month').format("YYYY-MM-DD")
+      //  console.log("第二季度",second_qurter_start)
+        const second_qurter_end = moment().month(5).endOf('month').format("YYYY-MM-DD")
+      //  console.log("第二季度",second_qurter_end)
+        //第三季度
+        const three_qurter_start = moment().month(6).startOf('month').format("YYYY-MM-DD")
+      //  console.log("第三季度",three_qurter_start)
+        const three_qurter_end = moment().month(8).endOf('month').format("YYYY-MM-DD")
+      //  console.log("第三季度",three_qurter_end)
+        //第四季度
+         const four_qurter_start = moment().month(9).startOf('month').format("YYYY-MM-DD")
+      //  console.log("第四季度",four_qurter_start)
+        const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
+      //  console.log("第四季度",four_qurter_end)
+     
+         const params = {
+           lapseto:this.lapseto,
+           itemtype:this.type,
+           modetype:this.mode_type,
+           startime:firstQuarterStart,
+           endtime:firstQuarterEnd,
+           first_quarter_start:first_quarter_start,
+           first_qurter_end:first_qurter_end,
+           second_qurter_start:second_qurter_start,
+           second_qurter_end:second_qurter_end,
+           three_qurter_start:three_qurter_start,
+           three_qurter_end:three_qurter_end,
+           four_qurter_start:four_qurter_start,
+           four_qurter_end:four_qurter_end,
+         }
+         console.log("params",params)
+      getProjectList(params).then(response=>{
+        if(response.data.state === 1){
+          var list = response.data.data.list
+         // console.log("数据源",list)
+          var standList =  response.data.data.standList
+         // console.log("standList",standList)
+          var newArr = [
+            {Total:"第一季度",Count:1,NoCount: 0},
+            {Total:"第二季度",Count:1,NoCount: 0},
+            {Total:"第三季度",Count:1,NoCount: 0},
+            {Total:"第四季度",Count:1,NoCount: 0},
+          ]
+    
+
+        //获取2个数组不同的部分
+        var arrTwo = this.arrayDate(list,newArr)
+        arrTwo.map(item => {
+              list.push(item)
+           })
+        //  console.log("list",list)
+         
+         for(let i=0;i<list.length;i++){
+            if(list[i].Total == "第一季度"){
+               list[i].Total = 1
+            }
+          if(list[i].Total == "第二季度"){
+               list[i].Total = 2
+           }
+         if(list[i].Total == "第三季度"){
+               list[i].Total = 3
+           }
+          if(list[i].Total == "第四季度"){
+               list[i].Total = 4
+           }
+         }
+          //排序
+          list.sort(this.compare('Total'))
+          for(let i=0;i<list.length;i++){
+            if(list[i].Total == 1){
+               list[i].Total = "第一季度"
+            }
+            if(list[i].Total == 2){
+               list[i].Total = "第二季度"
+            }
+            if(list[i].Total == 3){
+               list[i].Total = "第三季度"
+            }
+            if(list[i].Total == 4){
+               list[i].Total = "第四季度"
+            }
+          }
+
+           var newArrThree = [
+            {Total:"第一季度",Count:0},
+            {Total:"第二季度",Count:0},
+            {Total:"第三季度",Count:0},
+            {Total:"第四季度",Count:0},
+          ]
+
+           //获取2个数组不同的部分
+          var standArr = this.arrayDateTwo(standList,newArrThree)  
+          standArr.map(item=>{
+            standList.push(item)
+          })
+         //  console.log("standList",standList)
+
+        
+       //  console.log("list-----",list)
+         var arrFive = []
+          for(let i=0;i<list.length;i++){
+             for(let j=0;j<standList.length;j++){
+                if(list[i].Total == standList[j].Total){
+                    list[i].NoCount = standList[j].Count
+                    arrFive.push(list[i])
+                }
+             }
+          }
+        
+       // console.log("arrFive",arrFive)
+        
+        for(const key in arrFive){
+            this.modesData.xAxis.push(arrFive[key].Total);
+            this.modesData.series.push(((arrFive[key].NoCount/arrFive[key].Count)*100).toFixed(1));
+          }
+         
+
+          this.chart.series[0].data = this.modesData.series
+          this.chart.xAxis.data = this.modesData.xAxis
+        //  console.log("222000",this.modesData)
+        }
+      })
+    },
+     arrayDate(array1,array2){
+      //  console.log("array1",array1)
+      //  console.log("array2",array2)
+        var array1 = array1;
+        var array2 = array2;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+      //  console.log("result",result)
+        return result;
+    },
+    arrayDateTwo(array1,array2){
+      //   console.log("array1",array1)
+      //   console.log("array2",array2)
+        var array1 = array1;
+        var array2 = array2;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+      //  console.log("resultTwo",result)
+        return result;
+    },
+     compare(property){
+       return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+        }
+    },
+    
+    //按月份统计
+    getMonthList(){
+        const januaryStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
+        console.log("一月始",januaryStart)
+        const januaryEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
+        console.log("一月末",januaryEnd)
+
+        const  febStart = moment().month(1).startOf('month').format("YYYY-MM-DD")
+        console.log("二月始",febStart)
+        const febEnd = moment().month(1).endOf('month').format("YYYY-MM-DD")
+        console.log("二月末",febEnd)
+
+        const  marchStart = moment().month(2).startOf('month').format("YYYY-MM-DD")
+        console.log("三月始",marchStart)
+        const marchEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
+        console.log("三月末",marchEnd)
+
+        const  aprStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
+        console.log("四月始",aprStart)
+        const aprEnd = moment().month(3).endOf('month').format("YYYY-MM-DD")
+        console.log("四月末",aprEnd)
+
+        const  mayStart = moment().month(4).startOf('month').format("YYYY-MM-DD")
+        console.log("五月始",mayStart)
+        const mayEnd = moment().month(4).endOf('month').format("YYYY-MM-DD")
+        console.log("五月末",mayEnd)
+
+        const  junStart = moment().month(5).startOf('month').format("YYYY-MM-DD")
+        console.log("六月始",junStart)
+        const junEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
+        console.log("六月末",junEnd)
+
+        const  julStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
+        console.log("7月始",julStart)
+        const julEnd = moment().month(6).endOf('month').format("YYYY-MM-DD")
+        console.log("7月末",julEnd)
+
+        const  augStart = moment().month(7).startOf('month').format("YYYY-MM-DD")
+        console.log("8月始",augStart)
+        const augEnd = moment().month(7).endOf('month').format("YYYY-MM-DD")
+        console.log("8月末",augEnd)
+
+        const  sepStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
+        console.log("9月始",sepStart)
+        const sepEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
+        console.log("9月末",sepEnd)
+
+        const  octStart = moment().month(9).startOf('month').format("YYYY-MM-DD")
+        console.log("10月始",octStart)
+        const octEnd = moment().month(9).endOf('month').format("YYYY-MM-DD")
+        console.log("10月末",octEnd)
+
+        const  novStart = moment().month(10).startOf('month').format("YYYY-MM-DD")
+        console.log("11月始",novStart)
+        const novEnd = moment().month(10).endOf('month').format("YYYY-MM-DD")
+        console.log("11月末",novEnd)
+        
+        const  decStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
+        console.log("12月始",decStart)
+        const decEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
+        console.log("12月末",decEnd)
+        
+        const params = {
+          lapseto:this.lapseto,
+          itemtype:this.type,
+          modetype:this.mode_type,
+          januaryStart:januaryStart,
+          januaryEnd:januaryEnd,
+          febStart:febStart,
+          febEnd:febEnd,
+          marchStart:marchStart,
+          marchEnd:marchEnd,
+          aprStart:aprStart,
+          aprEnd:aprEnd,
+          mayStart:mayStart,
+          mayEnd:mayEnd,
+          junStart:junStart,
+          junEnd:junEnd,
+          julStart:julStart,
+          julEnd:julEnd,
+          augStart:augStart,
+          augEnd:augEnd,
+          sepStart:sepStart,
+          sepEnd:sepEnd,
+          octStart:octStart,
+          octEnd:octEnd,
+          novStart:novStart,
+          novEnd:novEnd,
+          decStart:decStart,
+          decEnd:decEnd,    
+        }
+       console.log("params",params)
+       getMonthProjectList(params).then(response=>{
+         
+       })
     }
-  }
+  },
+  created(){
+       //获取指标正常范围值
+     this.getNormData()
+  },
 };
 </script>
 

src/xt_pages/qcd/officesControlAnalysis/time.vue

         <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="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeLapseto">
           <el-option
             v-for="item in options"
             :key="item.value"
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
+         <span v-for="(item,index) in normData" :key="index" class="index">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span> 
       </div>
     </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import { GetOICData } from "@/api/qcd";
 import LineChart from "../../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getNormData,getFirstQuarter}from "@/api/common/common"
 export default {
   components: {
     LineChart,
   data() {
     return {
       activeName: "first",
+      modesData: {
+        xAxis: [],
+        series: []
+       },
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "科室质控达标统计" },
         { path: false, name: "按时间分组" }
       ],
+      normData:[],
       listQuery: {
         start_time: "",
         end_time: "",
         page: 1,
         limit: 10
       },
+      lapseto:0,
       options: [
         {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
+          value: 0,
+          label: "全部"
+        }, 
         {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
+          value: 1,
+          label: "留治"
+        }, 
         {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
+          value: 2,
+          label: "转出"
+        }, 
       ],
       value: "请选项",
       options1: [
         },
         yAxis: {
           axisLabel: {
-            formatter: "{value} %"
+            formatter: "{value}%"
           },
           show: false
         },
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
               }
             }
           }
-        ]
+        ],
       }
     };
   },
       }
     },
     changeTime() {},
+    changeLapseto(val){
+      console.log("val",val)
+      this.lapseto = val
+      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
+      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
+      this.getFirstQuarter(val,firstQuarterStart,firstQuarterEnd)
+    },
+     
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
     },
     chooseQuarter(quarter) {
       this.quarterType = quarter;
+      //第一季度
+      if(quarter === 0){
+        //本月的开始时间
+        const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
+        const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
+        this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
+      }
+
+      //第二季度
+      if(quarter === 1){
+        const febQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
+        const fedQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
+        this.getFirstQuarter(this.lapseto,febQuarterStart,fedQuarterEnd)
+      }
+
+      //第三季度
+      if(quarter === 2){
+        const threeQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
+        const threeQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
+        this.getFirstQuarter(this.lapseto,threeQuarterStart,threeQuarterEnd)
+      }
+
+      //第四季度
+      if(quarter === 3){
+        const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
+        const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
+        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+
+      
     },
     chooseMonth(month) {
       this.monthType = month;
-    }
+    
+      //1月
+      if(month == 0){
+          const fourQuarterStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
+          console.log("fourQuarterStart",fourQuarterStart)
+          const fourQuarterEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
+           this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+
+      }
+      //2月
+      if(month == 1){
+         const fourQuarterStart = moment().month(1).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(1).endOf('month').format("YYYY-MM-DD")
+        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //
+     //3月
+      if(month == 2){
+         const fourQuarterStart = moment().month(2).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
+         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //4月
+       if(month == 3){
+         const fourQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(3).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //5月
+       if(month == 4){
+         const fourQuarterStart = moment().month(4).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(4).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //6月
+       if(month == 5){
+         const fourQuarterStart = moment().month(5).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //7月
+       if(month == 6){
+         const fourQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(6).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //8月
+       if(month == 7){
+         const fourQuarterStart = moment().month(7).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(7).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //9月
+       if(month == 8){
+         const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
+         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //10月
+       if(month == 9){
+         const fourQuarterStart = moment().month(9).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(9).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+      //11月
+       if(month == 10){
+         const fourQuarterStart = moment().month(10).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(10).endOf('month').format("YYYY-MM-DD")
+         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+       //12月
+       if(month == 11){
+         const fourQuarterStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
+         console.log("fourQuarterStart",fourQuarterStart)
+         const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
+          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+      }
+    },
+    getNormData(){
+      getNormData().then(response=>{
+         if(response.data.state === 1){
+           var normdata = response.data.data.normdata
+           console.log("normdata",normdata)
+           this.normData = normdata
+         }
+      })
+    },
+    //第一季度
+    getFirstQuarter(val,startime,endtime){
+       this.modesData.series = []
+       this.modesData.xAxis = []
+      getFirstQuarter(val,startime,endtime).then(response=>{
+         if(response.data.state === 1){
+            var count =  response.data.data.count
+            console.log("count",count)
+            var arr=[]
+            for(let i=0;i<count.length;i++){  
+               for(let j=0;j<this.normData.length;j++){
+                if(count[i].item_id == this.normData[j].inspection_minor){
+                     arr.push(count[i])
+                }
+              }
+            }
+            console.log("arr",arr)
+            var arrtwo =  this.arrayDate(count,this.normData)
+            for(let i=0;i<arrtwo.length;i++){
+                this.$set(arrtwo[i], 'Count', 0)
+              }
+           for(let i=0;i<arrtwo.length;i++){
+                this.$set(arrtwo[i], 'Total', 1)
+              }
+            arrtwo.map(item => {
+              arr.push(item)
+            })
+            arr.sort(this.compare('sort'))    
+            for(const key in this.normData ){
+               this.modesData.xAxis.push(this.normData[key].item_name);
+                if(key in arr){
+                    this.modesData.series.push(((parseInt(arr[key].Count)/parseInt(arr[key].Total))*100).toFixed(1));
+                } else {
+                 this.modesData.series.push(0);
+              }
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+            console.log(2222,this.modesData)
+
+          
+         }
+      })
+    },
+   compare(property){
+        return function(a,b){
+            var value1 = a[property];
+            var value2 = b[property];
+            return value1 - value2;
+        }
+    },
+    arrayDate(array1,array2){
+        var array1 = array1;
+        var array2 = this.normData;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.inspection_minor;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.item_id;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+        console.log("result",result)
+        return result;
+    },
+  },
+  created(){
+       //本月的开始时间
+      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
+    
+      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
+     
+     //获取指标正常范围值
+     this.getNormData()
+     this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
   }
 };
 </script>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

     <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 style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</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-column prop="address" label="地址"></el-table-column>
-          <el-table-column prop="zip" label="邮编"></el-table-column>
+        <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+          <el-table-column prop="name" label="姓名" fixed>
+            <template slot-scope="scope">{{ scope.row.name}}</template>
+         </el-table-column>
+         <el-table-column
+          :label="modeItem.project_name"
+          property="number"
+          align="center"
+          min-width="100"
+          v-for="(modeItem, index) in tableName"
+          :key="index"
+        >
+          <template slot-scope="scope">
+              {{ scope.row.data[1].Count}}
+          </template>
+        </el-table-column>
         </el-table>
 
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[20, 40, 60, 80,100]"
           :page-size="10"
           background
           style="margin-top:20px;"
 
 
 <script>
+  import {getCurrentOrgPatients,getAllMajorInspection,getPatientList,getPatientDetailCheck,SearchDetailCheck } from "@/api/common/common"
 export default {
   data() {
     return {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 10
+        limit: 20
       },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
       value: "请选项",
-      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
-        }
-      ]
+      tableData: [],
+      patientsData:[],
+      total:0,
+      tableName:[],
+      ObjectData:{},
     };
   },
   methods: {
-    changeTime() {},
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+        this.getPatientList()
+      }
+    },
+    onSearch(){
+      SearchDetailCheck(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+          if(response.data.state === 1){
+           var  checkDetail =  response.data.data.checkDetail
+             var arr = []
+            for(let i=0;i<checkDetail.length;i++){
+              for(let j=0;j<this.tableName.length;j++){
+                 if(checkDetail[i].ProjectId == this.tableName[j].inspection_major){
+                   arr.push(checkDetail[i])
+                 }
+              }
+            }
+            console.log("arr",arr)
+          }
+      })
+    },
+     handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+       this.getPatientList()
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+       this.getPatientList()
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.getPatientList()
       }
+    },
+    //获取病人列表
+    getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+         if(response.data.state === 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+         }
+      })
+    },
+    //获取检验检查项目
+    getAllMajorInspection(){
+      getAllMajorInspection().then(response=>{
+        if(response.data.state === 1){
+           var inspection = response.data.data.inspection
+           console.log("inspection",inspection)
+           var a=[1];
+           for(let i=0;i<inspection.length;i++){
+             a.push(inspection[i])
+           }
+           console.log("a",a)
+           var arr = this.arrayToObj(a)
+
+           console.log("arr",arr)
+           this.ObjectData = arr
+           this.tableName = inspection
+        }
+      })
+    },
+    getPatientList(){
+      getPatientList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.limit,this.listQuery.page).then(response=>{
+         if(response.data.state === 1){
+           var patientInfo = response.data.data.patientInfo
+           console.log("列表数据2",patientInfo)
+
+           var total = response.data.data.total
+           console.log("total",total)
+           this.total = total
+          //  var arrlist = response.data.data.list
+          //   console.log("list",arrlist)
+          //   let listInfo = []
+          //  for(let i=0;i<arrlist.length;i++){
+          //    for(let j=0;j<this.tableName.length;j++){
+          //       if(arrlist[i].ProjectId == this.tableName[j].inspection_major){
+          //          listInfo.push(arrlist[i])
+          //       }
+          //    }
+          //  }
+          //   let dataInfo = {}
+          //   listInfo.forEach((item, index) => {
+          //     let { PatientId } = item
+          //     if (!dataInfo[PatientId]) {
+          //       dataInfo[PatientId] = {
+          //         PatientId,
+          //         name:item.name,
+          //         child: []
+          //       }
+          //     }
+          //   })
+          //   console.log("dataInfo",dataInfo)
+          //   let list = Object.values(dataInfo)
+          //   list.map(item => {
+          //     for (let i = 0; i < listInfo.length; i++) {
+          //       if (
+          //         item.PatientId === listInfo[i].PatientId
+          //       ) {
+          //         item.child.push(listInfo[i])
+          //       }
+          //     }
+          //   })
+          // var arrpatient = []
+          //  console.log("arr",list)
+          //    list.map(item => {
+          //     for (let i = 0; i < patientInfo.length; i++) {
+          //       if (
+          //         item.PatientId === patientInfo[i].patient_id
+          //       ) {
+          //          arrpatient.push(item)
+          //       }
+          //     }
+          //   })
+          // console.log("arrpatient",arrpatient)
+          //
+          // this.tableData = patientInfo
+
+
+
+          var list = response.data.data.list
+           console.log("list",list)
+            var dtd = []
+            for(let i=0;i<list.length;i++){
+                for(let j=0;j<this.tableName.length;j++){
+                    if(list[i].ProjectId == this.tableName[j].inspection_major){
+                      dtd.push(list[i])
+                    }
+                }
+            }
+           console.log("dtd",dtd)
+          var dd = {};
+           for (const index in dtd) {
+            if (!(dtd[index].name in dd)) {
+               dd[dtd[index].name] = {};
+            }
+            if (!(dtd[index].ProjectId in dd[dtd[index].name]) && dtd[index].ProjectId != 0) {
+              dd[dtd[index].name][dtd[index].ProjectId] = dtd[index];
+            }
+          }
+
+           for(const key in dd){
+              for(const mkey in this.ObjectData){
+               if (mkey in dd[key]) {
+                    dd[key][mkey].ProjectName = this.ObjectData[mkey].project_name;
+                    var Count = parseInt(dd[key][mkey].Count);
+                    console.log("Count",Count)
+
+                }else{
+                   dd[key][mkey] = {
+                    ProjectName: this.ObjectData[mkey].project_name,
+                    name: mkey,
+                   Count: 0
+                  };
+                }
+             }
+             this.tableData.push({ name: key, data: dd[key]});
+            }
+            console.log("表",this.tableData)
+         }
+      })
+    },
+    handleChange(val){
+      getPatientDetailCheck(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+          if(response.data.state === 1){
+            var checkDetail =  response.data.data.checkDetail
+            console.log("checkDetail",checkDetail)
+            var arr = []
+            for(let i=0;i<checkDetail.length;i++){
+              for(let j=0;j<this.tableName.length;j++){
+                 if(checkDetail[i].ProjectId == this.tableName[j].inspection_major){
+                   arr.push(checkDetail[i])
+                 }
+              }
+            }
+            console.log("arr",arr)
+          }
+      })
+    },
+   arrayToObj(arr){
+      return Object.assign({},arr);
     }
+  },
+  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.getCurrentOrgPatients()
+     //获取检验检查项目
+     this.getAllMajorInspection()
+     //获取列表数据
+     this.getPatientList()
   }
 };
 </script>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

       })
     },
     getInspectionTotalCount(){
+          this.modesData.series = []
+          this.modesData.xAxis = []
       getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var Inspection = response.data.data.Inspection
-            this.tableData = Inspection
             console.log("Inspection",Inspection)
+            this.tableData = Inspection
+          
             var counts = response.data.data.counts
             console.log("counts",counts)
             var arr = []
                  }
                }
             }
-            console.log("arr",arr)
+             console.log("arr",arr)
+             var arrtwo =  this.arrayDate(counts,this.normData)
+             console.log("arrtwo",arrtwo)
             var hash = {};
             var i = 0;
             var res = [];
                  Count: [item.Count],
                  ProjectName: ProjectName,
                  ProjectId: item.ProjectId,
+                 Sort:item.Sort,
              })
             });
             
             })
             console.log(11111,res)
 
+          
+
+
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
               if (key in res) {
            console.log("arr",arr)
          }
       })
-    }
+    },
+    arrayDate(array1,array2){
+        var array1 = array1;
+        var array2 = this.tableData;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.inspection_major;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.ProjectId;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+        console.log("result",result)
+        return result;
+    },
   },
   created(){
     var nowDate = new Date();

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

           property="date"
           align="center"
         ></el-table-column>
+
         <el-table-column
           :label="modeItem.name"
           property="number"
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
-      }, 
+      },
     };
   },
   methods: {
       geStatistics(this.listQuery).then(response=>{
         if(response.data.state === 1){
           var dtd =  response.data.data.statistics
-          console.log("dtd",dtd)
+        //  console.log("dtd",dtd)
           var dd = {};
           for (const index in dtd) {
             if (!(dtd[index].date in dd)) {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
+          console.log("ddd",dd)
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
             }
             this.tableData.push({ date: key, data: dd[key], total: total });
           }
+          console.log("tabledata",this.tableData)
           var ttd = response.data.data.ttd
-          console.log("ttd",ttd)
+         // console.log("ttd",ttd)
           var modeMap = {};
           var batotal = 0;
           for (const index in ttd) {
             }
             modeMap[ttd[index].mode_id] = ttd[index];
           }
-          console.log(111,modeMap)
+         // console.log(111,modeMap)
           for (const key in this.modeOptions) {
             this.modesData.xAxis.push(this.modeOptions[key].name);
             if (key in modeMap) {
               this.modesData.series.push(0);
             }
           }
-          
+
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
-          console.log(this.chart.series[0].data)
-          console.log(this.chart.xAxis.data)
+         // console.log(this.chart.series[0].data)
+         // console.log(this.chart.xAxis.data)
 
           this.total =  response.data.data.total
-          console.log("total",this.total)
+         // console.log("total",this.total)
 
         }
       })
-    }
+    },
+ 
   },
   created(){
     this.modeOptions = this.$store.getters.treatment_mode;
-
+    console.log("-----",this.modeOptions)
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
       (nowDay < 10 ? "0" + nowDay : nowDay);
       //获取统计列表数据
       this.geStatistics()
+      console.log("activeModes",this.activeModes)
   },
   computed: {
     activeModes: function() {
           modes.push(this.modeOptions[key]);
         }
       }
+
       return modes;
+
     }
   },
 };

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

          if(response.data.state === 1){
            var patients =  response.data.data.patient
            this.getModeId(patients)
-           console.log("patient",patients)
+           //console.log("patient",patients)
            var hash = {};
            var i = 0;
            var res = [];
            this.DialysisData = res
            var total =  response.data.data.total
            this.total = res.length
-           console.log("total",total)
+          // console.log("total",total)
          }
        })
       }
               })
             });
             this.DialysisData = res
-            console.log(res)
+           // console.log(res)
             var total =  response.data.data.total
             this.total = res.length
             // console.log("total",total)