bug修改

src/api/common/common.js

@@ -258,14 +258,15 @@ export function getDialysisDetailById(id, startime, endtime, limit, page) {
   })
 }
 
-export function getPrescriptionByName(keyword, startime, endtime, limit, page) {
+export function getPrescriptionByName(patientid, startime, endtime, limit, page) {
   const params = {
-    keyword: keyword,
+    patientid: patientid,
     startime: startime,
     endtime: endtime,
     limit: limit,
     page: page
   }
+  console.log('params', params)
   return request({
     url: '/com/api/getprescriptionbyname',
     method: 'Get',
@@ -299,7 +300,6 @@ export function getInspectionDetailById(id, startime, endtime) {
     startime: startime,
     endtime: endtime
   }
-  console.log('startime', params)
   return request({
     url: '/com/api/getinspectionDetailById',
     method: 'get',
@@ -307,9 +307,9 @@ export function getInspectionDetailById(id, startime, endtime) {
   })
 }
 
-export function getSearchPatientInfo(keyword, startime, endtime) {
+export function getSearchPatientInfo(patientid, startime, endtime) {
   const params = {
-    keyword: keyword,
+    patientid: patientid,
     startime: startime,
     endtime: endtime
   }
@@ -449,3 +449,11 @@ export function GetQualityControl(params) {
     params: params
   })
 }
+
+export function getTreatlist(params) {
+  return request({
+    url: '/com/api/gettreatlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/qcd.js

@@ -259,17 +259,6 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/qcd/a',
-      hidden: true,
-      is_menu: false,
-      component: () => import('@/xt_pages/qcd/a'),
-      name: 'workAnalysisNurse',
-      meta: {
-        title: '工作量分析统计护士',
-        noCache: true
-      }
-    },
     {
       path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,
@@ -405,15 +394,15 @@ export default {
         title: '口服药',
         noCache: true
       }
-    },  {
-      path: "/qcd/inspection/detail",
+    }, {
+      path: '/qcd/inspection/detail',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail"),
-      name: "patientInspectionDetail",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail'),
+      name: 'patientInspectionDetail',
       meta: {
-        title: "化验指标详情",
+        title: '化验指标详情',
         noCache: true
       }
     }

src/xt_pages/qcd/components/LineChart.vue

@@ -176,7 +176,7 @@ export default {
             interval: 0,
             formatter: function(value) {
               var ret = ""; //拼接加\n返回的类目项
-              var maxLength = 8; //每项显示文字个数
+              var maxLength = 10; //每项显示文字个数
               var valLength = value.length; //X轴类目项的文字个数
               var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
               if (rowN > 1) {

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -40,6 +40,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
@@ -53,11 +54,12 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
         </div>
       </div>
       <div class="cell clearfix">
-        <div class="time newLi" v-if="type == '按季度对比统计'">
+        <div class="time newLi" v-if="type == '按季度统计对比'">
           <ul class>
             <li
               :class="item.state == quarterType ? 'active' : ''"
@@ -67,7 +69,7 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-        <div class="time newLi" v-if="type == '按月份对比统计'">
+        <div class="time newLi" v-if="type == '按月份统计对比'">
           <ul class>
             <li
               :class="item.state == monthType ? 'active' : ''"
@@ -110,6 +112,12 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },  
       modetype:0,
       startime:"",
       endtime:"",
@@ -148,12 +156,12 @@ export default {
       value: "请选项",
       options1: [
         {
-          value: "按季度对比统计",
-          label: "按季度对比统计"
+          value: "按季度统计对比",
+          label: "按季度统计对比"
         },
         {
-          value: "按月份对比统计",
-          label: "按月份对比统计"
+          value: "按月份统计对比",
+          label: "按月份统计对比"
         },
         {
           value: "自定义",
@@ -193,7 +201,7 @@ export default {
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -205,17 +213,7 @@ export default {
           {
             name: "次数",
             type: "bar",
-            data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
-            ],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
@@ -322,11 +320,11 @@ export default {
     },
     chooseType(val) {
       this.type = val;
-      if(val == "按月份对比统计"){
+      if(val == "按月份统计对比"){
          this.modetype = 0
         
       }
-       if(val == "按季度对比统计"){
+       if(val == "按季度统计对比"){
          this.modetype = 1
          
       }

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -8,8 +8,23 @@
         <div class="cell clearfix">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width: 200px;"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+              <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width: 200px;"></el-input>
+              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+               <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model.trim="listQuery.search"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="输入病人透析号/姓名"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
+
             </el-form-item>
           </el-form>
           <el-select v-model="lapstor" placeholder="请选择" style="margin-right:20px;width:100px">
@@ -109,6 +124,7 @@
 </template>
 
 <script>
+import { PostSearch} from '@/api/patient'
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
@@ -242,7 +258,8 @@ export default {
       dataCount:[
          {id:0,count:0},
          {id:1,count:0}
-      ]
+      ],
+      patient_id:0,
     };
   },
   methods: {
@@ -321,12 +338,11 @@ export default {
     onSearch(){
          const params = {
             lapstor:this.lapstor,
-            keyword:this.listQuery.search,
+            patientid:this.patient_id,
             startime:this.listQuery.start_time,
             endtime:this.listQuery.end_time,
 
          }
-         console.log("params",params)
        getPatientContorlAnalysis(params).then(response=>{
            if(response.data.state == 1){
               var control = response.data.data.patientcontorDetail
@@ -541,7 +557,7 @@ export default {
               item.data = newarr
              // console.log(1111111111,item.data)
             })
-             console.log("表",this.tableData)
+         console.log("表",this.tableData)
          }
       })
     },
@@ -584,7 +600,7 @@ export default {
                     cart.push(cartogramlist[i])
                   }
                }
-               console.log("cart",cart)
+              //  console.log("cart",cart)
                let dataInfo = {}
                 cart.forEach((item, index) => {
                   let { patient_id } = item
@@ -599,7 +615,7 @@ export default {
                   }
                 })
               let list = Object.values(dataInfo)
-              console.log("list",list)
+              // console.log("list",list)
 
               var arr = []
               list.map(item=>{
@@ -618,7 +634,7 @@ export default {
                    arr.push(it)
                 })
              })
-              console.log("arr",arr)
+              // console.log("arr",arr)
 
              var arrtwo = []
              for(let i=0;i<arr.length;i++){
@@ -626,7 +642,7 @@ export default {
                   arrtwo.push(arr[i])
                }
              }
-             console.log("arrtwo",arrtwo)
+            //  console.log("arrtwo",arrtwo)
 
              let objinfo = {}
                 arrtwo.forEach((item, index) => {
@@ -649,7 +665,7 @@ export default {
                     }
                  }
               })
-              console.log("newlist",newlist)
+              // console.log("newlist",newlist)
               newlist.map(item=>{
                   item.child.map(it=>{
                     if(parseInt(it.range_min)<= parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max )){
@@ -657,7 +673,7 @@ export default {
                     }
                   })
               })
-              console.log("newlist",newlist)
+              // console.log("newlist",newlist)
 
 
               var newtotal = 0
@@ -669,9 +685,9 @@ export default {
                     }
                  }
               })
-             console.log("newtotal",newtotal)
+            //  console.log("newtotal",newtotal)
              var totalCount = totaltwo - newtotal
-              console.log("totalCount",totaltwo)
+              // console.log("totalCount",totaltwo)
              for(let i=0;i<this.dataName.length;i++){
                 this.modesData.xAxis.push(this.dataName[i].name);
              }
@@ -695,8 +711,28 @@ export default {
             this.patientsArr =  response.data.data.patients
           }
        })
-     }
-
+     },
+    querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        console.log("val",val)
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
     var nowDate = new Date();

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -192,7 +192,6 @@ export default {
 
     //编辑
     handleEdit(id) {
-      console.log("id",id)
       this.editDialog = true;
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
@@ -235,6 +234,7 @@ export default {
     },
     changeInspectionTwo(id){
       this.InspectionMinorTwo = []
+      this.editform.inspectionMinor = ""
        getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
@@ -294,7 +294,7 @@ export default {
               configurationlist[i].sort = ""
             }
           }
-          //console.log("列表",configurationlist)
+          console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
          // console.log("total",total)
@@ -321,16 +321,20 @@ export default {
         var sort = parseInt(sorts)
         this.editform.sort = sort
        }
-     
-      UpdateConfiguration(this.editform.id,this.editform).then(response=>{
-        if(response.data.state == 1){
-         var standard =  response.data.data.standard
-        // console.log("standard",standard)
-         this.$message.success("保存成功")
-         this.editDialog = false
-         this.getConfigurationList()
-        }else{
-         this.$message.error("检查小项已存在")
+      this.$refs[formName].validate(valid=>{
+        if(valid){
+         UpdateConfiguration(this.editform.id,this.editform).then(response=>{
+            if(response.data.state == 1){
+            var standard =  response.data.data.standard
+            // console.log("standard",standard)
+            this.$message.success("保存成功")
+            this.editDialog = false
+            this.getConfigurationList()
+            this.getAllInspectionMinor()
+            }else{
+            this.$message.error("检查小项已存在")
+            }
+          })
         }
       })
     },

src/xt_pages/qcd/treatmentControlAnalysis/check.vue

@@ -10,9 +10,6 @@
           <el-tab-pane label="患者检验检查统计" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
           <div class="time">
             <ul class>
               <li

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+           <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -90,6 +104,7 @@
 
 
 <script>
+  import { PostSearch} from '@/api/patient'
   import {getCurrentOrgPatients,getAllMajorInspection,getPatientList,getPatientDetailCheck,SearchDetailCheck } from "@/api/common/common"
 export default {
   data() {
@@ -106,6 +121,8 @@ export default {
       total:0,
       tableName:[],
       ObjectData:{},
+      patient_id:0,
+      patient_name:"",
     };
   },
   methods: {
@@ -122,10 +139,11 @@ export default {
       }
     },
     onSearch(){
-      SearchDetailCheck(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+     getPatientDetailCheck(this.patient_id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
-           var  checkDetail =  response.data.data.checkDetail
-             var arr = []
+            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){
@@ -133,22 +151,23 @@ export default {
                  }
               }
             }
-            // let projectArr = []
-            // this.newArr.map(item => {
-            //   projectArr.push(item.project_name)
-            // })
-            // console.log("projectArr",projectArr)
-            // projectArr.forEach((item,index) => {
-            //   if(!(arr[index] && item == arr[index].ProjectName)){
-            //     arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
-            //   }
-            // })
-            // this.tableData = []
-            // let obj = {}
-            // obj.name = val.name
-            // obj.data = arr
-            // this.tableData.push(obj)
-        
+
+            let projectArr = []
+            this.newArr.map(item => {
+              projectArr.push(item.project_name)
+            })
+            projectArr.forEach((item,index) => {
+              if(!(arr[index] && item == arr[index].ProjectName)){
+                arr.splice(index,0,{Count:0, ProjectName: item,name: this.listQuery.search})
+              }
+            })
+            this.tableData = []
+            let obj = {}
+            obj.name = this.listQuery.search
+            obj.data = arr
+            this.tableData.push(obj)
+            this.total = 1
+           
           }
       })
     },
@@ -295,7 +314,28 @@ export default {
     },
    arrayToObj(arr){
       return Object.assign({},arr);
-    }
+    },
+  querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
      var nowDate = new Date();

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+          <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -67,6 +81,7 @@
 
 
 <script>
+import { PostSearch} from '@/api/patient'
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
 import { getCurrentOrgPatients,getInspectionTotalCount,getInspectionDetailById,getSearchPatientInfo } from "@/api/common/common";
@@ -178,7 +193,8 @@ export default {
         xAxis: [],
         series: []
       },
-      obj:[]
+      obj:[],
+      patient_id:0,
     };
   },
   methods: {
@@ -290,7 +306,7 @@ export default {
        getInspectionDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var patientdetail = response.data.data.patientdetail
-
+            console.log("patientdetail",patientdetail)
             var arr=[]
             for(let i=0;i<this.tableData.length;i++){
               for(let j=0;j<patientdetail.length;j++){
@@ -322,10 +338,12 @@ export default {
 
     //搜索功能
     onSearch(){
-      getSearchPatientInfo(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+       this.modesData.series = []
+       this.modesData.xAxis = []
+      getSearchPatientInfo(this.patient_id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
          if(response.data.state  === 1){
            var PatientsInfo = response.data.data.PatientsInfo
-          
+           console.log("patientsInfo",PatientsInfo)
            var arr = []
            for(let i=0;i<this.tableData.length;i++){
              for(let j=0;j<PatientsInfo.length;j++){
@@ -334,7 +352,22 @@ export default {
                  }
              }
            }
+           let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+           let day = parseInt(time / (1000 * 60 * 60 * 24))
        
+            for (const key in this.tableData) {
+              this.modesData.xAxis.push(this.tableData[key].project_name);
+              if (key in arr) {
+                this.modesData.series.push(parseInt(arr[key].Count));
+                this.obj.push(Math.round(day / arr[key].InspectionFrequency))
+                // batotal += parseInt(res[key].Count);
+              } else {
+                this.modesData.series.push(0);
+                this.obj.push(0)
+              }
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
          }
       })
     },
@@ -360,6 +393,28 @@ export default {
         }
         return result;
     },
+     querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        console.log("val",val)
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
     var nowDate = new Date();

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

@@ -101,7 +101,7 @@
 <script>
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
-import {geStatistics} from "@/api/common/common"
+import {geStatistics,getTreatlist} from "@/api/common/common"
 export default {
   components: {
     LineChart
@@ -247,20 +247,76 @@ export default {
       this.geStatistics();
     },
     handleCurrentChange(page) {
+      this.tableData = []
       this.listQuery.page = page;
       this.geStatistics();
     },
    selectChange(val){
+     this.tableData=[]
      this.listQuery.value =val
      this.geStatistics()
+     this.getlist()
    },
-    geStatistics(){
+   getlist(){
       this.modesData.series = []
       this.modesData.xAxis = []
+     getTreatlist(this.listQuery).then(response=>{
+        if(response.data.state == 1){
+          var ttd =  response.data.data.list
+            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.chart.series[0].data = this.modesData.series
+          this.chart.xAxis.data = this.modesData.xAxis
+         }
+     })
+   },
+    geStatistics(){
       geStatistics(this.listQuery).then(response=>{
         if(response.data.state === 1){
-          var dtd =  response.data.data.statistics
-        //  console.log("dtd",dtd)
+          var statistics =  response.data.data.statistics
+          var treatinfo = response.data.data.treatinfo
+          this.total =  response.data.data.total
+          let dataInfo = {}
+           treatinfo.forEach((item, index) => {
+             let { date } = item
+             if (!dataInfo[date]) {
+                dataInfo[date] = {
+                   date,
+                   child: [],
+                 }
+                }
+            })
+         let list = Object.values(dataInfo)
+      
+         list.map(item=>{
+           for(let i=0;i<statistics.length;i++){
+             if(item.date == statistics[i].date){
+                item.child.push(statistics[i])
+             }
+           }
+         })
+         var dtd = []
+         list.map(item=>{
+           item.child.map(it=>{
+              dtd.push(it)
+           })
+         })
           var dd = {};
           for (const index in dtd) {
             if (!(dtd[index].date in dd)) {
@@ -270,7 +326,6 @@ export default {
               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) {
@@ -292,44 +347,13 @@ export default {
             }
             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)
-          var modeMap = {};
-          var batotal = 0;
-          for (const index in ttd) {
-            if (ttd[index].mode_id == "0") {
-              continue;
-            }
-            modeMap[ttd[index].mode_id] = ttd[index];
-          }
-         // 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(parseInt(modeMap[key].number));
-              batotal += parseInt(modeMap[key].number);
-            } else {
-              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)
-
-          this.total =  response.data.data.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;
@@ -350,9 +374,10 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+      //获取柱状图数据
+      this.getlist()
       //获取统计列表数据
       this.geStatistics()
-      console.log("activeModes",this.activeModes)
   },
   computed: {
     activeModes: function() {

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+           <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -98,6 +112,7 @@
 
 
 <script>
+ import { PostSearch} from '@/api/patient'
  import { getCurrentOrgPatients,getDialysisList,getDialysisDetailById,getPrescriptionByName } from "@/api/common/common";
  import { uParseTime } from "@/utils/tools";
 export default {
@@ -124,6 +139,7 @@ export default {
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
       }, 
+      patient_id:0,
     };
   },
   methods: {
@@ -173,97 +189,14 @@ export default {
     getDialysisList(){
       getDialysisList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state === 1){
-          //  var  dialysislist =  response.data.data.dialysislist
-          //  for(let i=0;i<dialysislist.length;i++){
-          //     if(dialysislist[i].mode_id == 1){
-          //       dialysislist[i].mode_id = "HD"
-          //     }
-          //      if(dialysislist[i].mode_id == 2){
-          //       dialysislist[i].mode_id = "HDF"
-          //     }
-          //      if(dialysislist[i].mode_id == 3){
-          //       dialysislist[i].mode_id = "HD+HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 4){
-          //       dialysislist[i].mode_id = "HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 5){
-          //       dialysislist[i].mode_id = "HF"
-          //     }
-          //      if(dialysislist[i].mode_id == 6){
-          //       dialysislist[i].mode_id = "SCUF"
-          //     }
-          //      if(dialysislist[i].mode_id == 7){
-          //       dialysislist[i].mode_id = "IUF"
-          //     }
-          //      if(dialysislist[i].mode_id == 8){
-          //       dialysislist[i].mode_id = "HFHD"
-          //     }
-          //      if(dialysislist[i].mode_id == 9){
-          //       dialysislist[i].mode_id = "HFHD+HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 10){
-          //       dialysislist[i].mode_id = "PHF"
-          //     }
-          //      if(dialysislist[i].mode_id == 11){
-          //       dialysislist[i].mode_id = "HFR"
-          //     }
-          //     if(dialysislist[i].mode_id == 12){
-          //       dialysislist[i].mode_id = "HDF+HP"
-          //     }
-          //     if(dialysislist[i].mode_id == 13){
-          //       dialysislist[i].mode_id = "CRRT"
-          //     }
-          //    if(dialysislist[i].mode_id == 14){
-          //       dialysislist[i].mode_id = "腹水回输"
-          //     }
-          //     if(dialysislist[i].mode_id == 19){
-          //       dialysislist[i].mode_id = "IUF+HD"
-          //     }
-          //  }
-          //  console.log("dialysislist",dialysislist)
-          //  var hash = {};
-          //  var i = 0;
-          //  var res = [];
-          //  dialysislist.forEach(function(item) {
-          //   var patient_id = item.patient_id;
-          //   hash[patient_id] ? res[hash[patient_id] - 1].mode_id.push(item.mode_id) : hash[patient_id] = ++i && res.push({
-          //       mode_id: [item.mode_id],
-          //       patient_id: patient_id,
-          //       dialysis_no: item.dialysis_no,
-          //       name:item.name,
-          //       age:item.id_card_no,
-          //       total_dialysis:item.total_dialysis,
-          //       user_sys_before_count:item.user_sys_before_count,
-          //   })
-          //  });
-          //  res.map(item => {
-          //    item.age = this.getAge(item.age)
-          //  })
-          //  console.log(res)
-          //  //this.DialysisData = res
- 
-          //   var total = response.data.data.total
-          //   console.log("total",total) 
-          //  // this.total = total
-
-            
           var list = response.data.data.list
-          //console.log("list",list)
+          console.log("list",list)
           var totallist  =  response.data.data.totallist
-         // console.log("totallist",totallist)
+           console.log("totallist",totallist)
           this.total = totallist  
           var prescriptionList = response.data.data.prescriptionList
           this.getModeId(prescriptionList)
           
-         // console.log("prescriptionList",prescriptionList)
-          // for(let i=0;i<this.prescriptionList.length;i++){
-          //   for(let j=0;j<list.length;j++){
-          //     if(this.prescriptionList[i].patient_id == list[j].patient_id){
-          //       arr.push(this.prescriptionList[i])
-          //     }
-          //   }
-          // }
           let dataInfo = {}
           list.forEach((item, index) => {
             let { patient_id } = item
@@ -311,7 +244,7 @@ export default {
          this.getDialysisList()
          return false
       }else{
-       getPrescriptionByName(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
+       getPrescriptionByName(this.patient_id,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
          if(response.data.state === 1){
            var patients =  response.data.data.patient
            this.getModeId(patients)
@@ -416,7 +349,29 @@ export default {
           patients[i].mode_id = "IUF+HD"
         }
       }
-    }
+    },
+     querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        console.log("val",val)
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
     var nowDate = new Date();

src/xt_pages/qcd/treatmentControlAnalysis/time.vue

@@ -10,9 +10,6 @@
           <el-tab-pane label="患者检验检查统计" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
           <div class="time">
             <ul class>
               <li