bug修改

src/api/common/common.js

@@ -458,3 +458,11 @@ export function getTreatlist(params) {
     params: params
   })
 }
+
+export function getPatientComplianceDetail(params) {
+  return request({
+    url: '/com/api/getpatientcompliancedetal',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -7,10 +7,6 @@
       <div class="page_patientComplianceDetails">
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
-<!--            <el-form-item label>-->
-<!--              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>-->
-<!--              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>-->
-<!--            </el-form-item>-->
           </el-form>
         </div>
         <el-container>
@@ -86,9 +82,8 @@
                   @click="clickQuality(index,item.inspection_minor)"
                 >
                   <p>{{ item.item_name }}</p>
-                  <i class="iconfont icon-gou gou"></i>
-<!--                  <i class="iconfont icon-gantanhao gth" v-if="index % 2 == 0"></i>-->
-<!--                  <i class="iconfont icon-gou gou" v-else></i>-->
+                   <span v-if="isTrue == 1"><i class="iconfont icon-gou gou"></i></span>
+                   <span v-if="isTrue == 0"><i class="iconfont icon-gantanhao gth"></i></span>
                 </div>
               </div>
             </div>
@@ -109,7 +104,7 @@ import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
-import { getCurrentOrgPatients,GetQualityControl,getNormData } from "@/api/common/common"
+import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -117,6 +112,7 @@ export default {
   },
   data() {
     return {
+     isTrue:0,
       crumbs: [
         { path: false, name: "质控管理" },
         { path: false, name: "患者达标详情" }
@@ -162,7 +158,7 @@ export default {
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -174,17 +170,7 @@ export default {
           {
             name: "次数",
             type: "line",
-            data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
-            ],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
@@ -237,13 +223,16 @@ export default {
             }
           }
         ]
-      }
+      },
+      inspect_date:0,
+      monthActive:0,
     };
   },
   methods: {
     chooseMonth(month) {
       //一月
       if(month == 0){
+         this.monthActive = 0
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         var now = new Date()
@@ -256,11 +245,12 @@ export default {
         //本月的结束时间
         var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
         this.endtime =Date.parse(monthEndDate)/1000-1;//s
-        this.getlist()
+         this.getlistDetail()
       }
 
       //近三月
       if(month == 1){
+         this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
     
         this.startime = Date.parse(startDate)/1000
@@ -269,27 +259,29 @@ export default {
       
         this.endtime = Date.parse(endDate)/1000
     
-        this.getlist()
+        this.getlistDetail()
       }
     
 
        //近半年
       if(month == 2){
+        this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         
         this.startime = Date.parse(startDate)/1000
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
-        this.getlist()
+        this.getlistDetail()
       }
 
       //近一年
       if(month == 3){
+        this.monthActive = 3
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
         this.startime = Date.parse(startDate)/1000
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
-         this.getlist()
+        this.getlistDetail()
       }
 
 
@@ -298,7 +290,7 @@ export default {
     clickQuality(index,itemid) {
       this.quality = index;
       this.item_id = itemid
-      this.getlist()
+      this.getlistDetail()
     },
     handleSizeChange(limit) {
       //this.limit = limit;
@@ -320,7 +312,7 @@ export default {
         this.listQuery.start_time = "";
       } else {
          this.startime = Date.parse(val)/1000;//s
-        this.getlist()
+        this.getlistDetail()
       }
 
     },
@@ -332,7 +324,7 @@ export default {
           this.listQuery.end_time = "";
         } else {
           this.endtime = Date.parse(val)/1000;//s
-          this.getlist()
+          this.getlistDetail()
         }
 
     },
@@ -342,13 +334,12 @@ export default {
     },
     handleChange(val){
      this.patientid = val.id
-      this.getlist()
+      this.getlistDetail()
     },
    getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
           if(response.data.state == 1){
             var patients = response.data.data.patients
-            console.log("patients",patients)
             this.patientsData = patients
           }
       })
@@ -356,10 +347,8 @@ export default {
     getNormData(){
       getNormData().then(response=>{
          var normdata = response.data.data.normdata
-          console.log("normdata",normdata)
           for(let i=0;i<normdata.length;i++){
             this.item_id = normdata[0].inspection_minor
-            console.log("item_id",this.item_id)
           }
           this.normData = normdata
           this.getlist()
@@ -368,37 +357,38 @@ export default {
     getlist(){
         this.modesData.series = []
         this.modesData.xAxis = []
-
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-        console.log("开始时间",startDate)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
         var now = new Date()
         var nowMonth = now.getMonth(); //当前月
         var nowYear = now.getFullYear(); //当前年
         //本月的开始时间
         var monthStartDate = new Date(nowYear, nowMonth, 1);
         this.startime=Date.parse(monthStartDate)/1000;//s
-        console.log("本月开始时间",this.startime)
         //本月的结束时间
          var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
          this.endtime =Date.parse(monthEndDate)/1000-1;//s
-         console.log("本月结束时间",)
-
 
           const params = {
             patientid:this.patientid,
             startime:this.startime,
             endtime:this.endtime,
             itemid:this.item_id,
+            inspectdate:this.inspect_date,
           }
        GetQualityControl(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-          
             for(let i=0;i<list.length;i++){
+              if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
+                    this.isTrue = 1  
+               }
+               if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
+                    this.isTrue =0
+               }
               this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
                this.modesData.series.push(list[i].inspect_value)
+            
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
@@ -406,11 +396,57 @@ export default {
           }
 
        })
+    },
+
+    getlistDetail(){
+       this.modesData.series = []
+        this.modesData.xAxis = []
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+
+       if(this.monthActive == 0){
+          var now = new Date()
+          var nowMonth = now.getMonth(); //当前月
+          var nowYear = now.getFullYear(); //当前年
+          //本月的开始时间
+          var monthStartDate = new Date(nowYear, nowMonth, 1);
+          this.startime=Date.parse(monthStartDate)/1000;//s
+          //本月的结束时间
+          var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+          this.endtime =Date.parse(monthEndDate)/1000-1;//s
+        }
+     
+          const params = {
+            patientid:this.patientid,
+            startime:this.startime,
+            endtime:this.endtime,
+            itemid:this.item_id,
+          }
+        console.log("params",params)
+       getPatientComplianceDetail(params).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              for(let i=0;i<list.length;i++){
+                if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
+                      this.isTrue = 1  
+                }
+                if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
+                      this.isTrue =0
+                }
+                this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
+                this.modesData.series.push(list[i].inspect_value)
+            
+            }
+              this.chart.series[0].data = this.modesData.series
+              this.chart.xAxis.data = this.modesData.xAxis
+            }
+       })
     }
   },
 
    created(){
      this.patientid =  this.$route.query.patientid
+     this.inspect_date = this.$route.query.date
      //获取指标项
       this.getNormData()
      //获取该机构下的所有患者

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -8,8 +8,6 @@
         <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-autocomplete
                 class="checkSearch"
                 popper-class="my-autocomplete"
@@ -92,15 +90,15 @@
               :key="index"
             >
             <template slot-scope="scope">
-                 <span v-if="scope.row.data[index].inspect_value == ''">0</span>
-                 <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) < parseInt(scope.row.data[index].range_min))">{{scope.row.data[index].inspect_value}}↓</span>
-                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) > parseInt(scope.row.data[index].range_max))">{{scope.row.data[index].inspect_value}}↑</span>
-                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) >= parseInt(scope.row.data[index].range_min))&& (parseInt(scope.row.data[index].inspect_value) <= parseInt(scope.row.data[index].range_max)) ">{{scope.row.data[index].inspect_value}}</span>
+                 <span v-if="scope.row.data[modeItem.item_name].inspect_value == ''">0</span>
+                 <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) < parseInt(scope.row.data[modeItem.item_name].range_min))">{{scope.row.data[modeItem.item_name].inspect_value}}↓</span>
+                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) > parseInt(scope.row.data[modeItem.item_name].range_max))">{{scope.row.data[modeItem.item_name].inspect_value}}↑</span>
+                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) >= parseInt(scope.row.data[modeItem.item_name].range_min))&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) <= parseInt(scope.row.data[modeItem.item_name].range_max)) ">{{scope.row.data[modeItem.item_name].inspect_value}}</span>
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
-                <el-button @click="handleClick(scope.row.name)" type="text" size="small">查看</el-button>
+                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" type="text" size="small">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -201,7 +199,17 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}%"
+                formatter: (params) => {
+                  if(this.obj.length > 0){
+                      let str = ''
+                      str = '('+ this.obj[params.dataIndex] +'人'+',' + params.data +'%' +')'
+                    return str
+                  }else{
+                    let str = ''
+                    str = params.data+'%'
+                    return str
+                  }
+                }
               }
             },
             //配置样式
@@ -248,6 +256,7 @@ export default {
       paitents:[],
       tableName:[],
       total:0,
+       obj:[],
       ObjectData:{},
       tablePatients:[],
       tableSort:[],
@@ -278,7 +287,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.start_time = "";
       } else {
-        
+
       }
 
     },
@@ -289,23 +298,23 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
-       
+
       }
     },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    handleClick(name) {
-      var id = 0
-      var dialysis_no = 0
-      for(let i=0;i<this.tablePatients.length;i++){
-         if(name == this.tablePatients[i].name){
-            id = this.tablePatients[i].patient_id
-            dialysis_no = this.tablePatients[i].dialysis_no
-         }
-      }
-      this.$router.push({ path: "/qcd/patientComplianceDetails?patientid="+id});
+    handleClick(patientid,inspectdate) {
+      // var id = 0
+      // var dialysis_no = 0
+      // for(let i=0;i<this.tablePatients.length;i++){
+      //    if(name == this.tablePatients[i].name){
+      //       id = this.tablePatients[i].patient_id
+      //       dialysis_no = this.tablePatients[i].dialysis_no
+      //    }
+      // }
+      this.$router.push({ path: "/qcd/patientComplianceDetails?patientid="+patientid+"&date="+inspectdate});
     },
     getDialysisNo(name){
         for(let i=0;i<this.tablePatients.length;i++){
@@ -318,7 +327,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state == 1){
            var normdata = response.data.data.normdata
-          // console.log("normdata",normdata)
+        //  console.log("normdata",normdata)
           this.normData = normdata
            var a=[];
            for(let i=0;i<normdata.length;i++){
@@ -327,8 +336,6 @@ export default {
           // console.log("a",a)
            this.newArr = a
            var arr = this.arrayToObj(a)
-
-          console.log("娃哈哈",arr)
            this.ObjectData = arr
 
 
@@ -346,22 +353,22 @@ export default {
        getPatientContorlAnalysis(params).then(response=>{
            if(response.data.state == 1){
               var control = response.data.data.patientcontorDetail
-              console.log('control', control)
+              console.log("control",control)
               let dataInfo = {}
               control.forEach((item, index) => {
-                let { patient_id } = item
-                if (!dataInfo[patient_id]) {
-                  dataInfo[patient_id] = {
-                    patient_id,
+                let { inspect_date } = item
+                if (!dataInfo[inspect_date]) {
+                  dataInfo[inspect_date] = {
+                    inspect_date,
                     name: item.name,
                     child: [],
-                    inspect_date: item.inspect_date
+                    patient_id: item.patient_id
 
                   }
                 }
               })
               let list = Object.values(dataInfo)
-              // console.log('list', list)
+              console.log("list",list)
               list.map(item => {
                 for (let i = 0; i < control.length; i++) {
                   if (item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id) {
@@ -377,7 +384,6 @@ export default {
                 })
 
                 // 配置的才显示
-
                 var arrthree = []
                 for (let i = 0; i < newarrtwo.length; i++) {
                   for (let j = 0; j < this.normData.length; j++) {
@@ -386,7 +392,7 @@ export default {
                     }
                   }
                 }
-
+                console.log("arrthree",arrthree)
                 var arrfour = this.arrayDate(arrthree, newarrtwo)
                 arrfour.map(item => {
                   item.item_name = ''
@@ -395,13 +401,14 @@ export default {
 
                 var dd = {}
                 for (const index in arrthree) {
-                  if (!(arrthree[index].name in dd)) {
-                    dd[arrthree[index].name] = {}
+                  if (!(arrthree[index].inspect_date in dd)) {
+                    dd[arrthree[index].inspect_date] = {}
                   }
-                  if (!(arrthree[index].item_name in dd[arrthree[index].name]) && arrthree[index].item_name != 0) {
-                    dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index]
+                  if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
+                    dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
                   }
                 }
+
                 this.tableData = []
 
                 for (const key in dd) {
@@ -416,28 +423,46 @@ export default {
                   }
                   this.tableData.push({ name: key, data: dd[key]})
                 }
-                  console.log("表格",this.tableData)
-                  let projectArr = []
-                  this.newArr.map(item => {
-                    projectArr.push(item.item_name)
+              let dataInfotwo = {}
+              control.forEach((item, index) => {
+                let { inspect_date } = item
+                if (!dataInfotwo[inspect_date]) {
+                  dataInfotwo[inspect_date] = {
+                    inspect_date,
+                    name: item.name,
+                  }
+                }
+              })
+              let listtwo = Object.values(dataInfotwo)
+                listtwo.map(item=>{
+                  this.tableData.map(it=>{
+                    if(item.inspect_date == parseInt(it.name)){
+                      it.name = item.name
+                    }
                   })
+                })
+                //   let projectArr = []
+                //   this.newArr.map(item => {
+                //     projectArr.push(item.item_name)
+                //   })
+
+                //   this.tableData.map(item => {
+                //     let newarr = Object.values(item.data)
+                //     newarr.sort((a, b) => {
+                //       return projectArr.indexOf(a.item_name) - projectArr.indexOf(b.item_name)
+                //     })
+                //     item.data = newarr
+                //   })
+
+                  // for (let i = 0; i < this.patientsArr.length; i++) {
+                  //   for (let j = 0; j < this.tableData.length; j++) {
+                  //     if (this.patientsArr[i].name == this.tableData[j].name) {
+                  //       this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
+                  //       this.tableData[j].patient_id = this.patientsArr[i].id
+                  //     }
+                  //   }
+                  // }
 
-                  this.tableData.map(item => {
-                    let newarr = Object.values(item.data)
-                    newarr.sort((a, b) => {
-                      return projectArr.indexOf(a.item_name) - projectArr.indexOf(b.item_name)
-                    })
-                    item.data = newarr
-                  })
-      
-                  for (let i = 0; i < this.patientsArr.length; i++) {
-                    for (let j = 0; j < this.tableData.length; j++) {
-                      if (this.patientsArr[i].name == this.tableData[j].name) {
-                        this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
-                        this.tableData[j].patient_id = this.patientsArr[i].id
-                      }
-                    }
-                  }
                 }
           })
     },
@@ -474,7 +499,7 @@ export default {
             }
           })
         let list = Object.values(dataInfo)
-        
+
 
          list.map(item => {
             for (let i = 0; i < newArr.length; i++) {
@@ -483,7 +508,7 @@ export default {
               }
             }
           })
-        //  console.log("list",list)  
+        //  console.log("list",list)
          var newarrtwo = []
           list.map(item => {
             item.child.map(it => {
@@ -500,110 +525,70 @@ export default {
               }
             }
           }
-          // console.log("arrthree",arrthree)
+
           var arrfour = this.arrayDate(arrthree, newarrtwo)
-          // console.log("arrfour",arrfour)
           arrfour.map(item => {
             item.item_name = ''
             arrthree.push(item)
           })
           // console.log('arrthree', arrthree)
           var dd = {}
-          for (const index in arrthree) {
-            if (!(arrthree[index].inspect_date in dd)) {
-              dd[arrthree[index].inspect_date] = {}
+           for (const index in arrthree) {
+             if (!(arrthree[index].inspect_date in dd)) {
+               dd[arrthree[index].inspect_date] = {}
+             }
+             if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
+               dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
+
+             }
+           }
+
+           let dataInfotwo = {}
+          newArr.forEach((item, index) => {
+            let { inspect_date } = item
+            if (!dataInfotwo[inspect_date]) {
+              dataInfotwo[inspect_date] = {
+                inspect_date,
+                name: item.name,
+                inspect_value:item.inspect_value,
+                id:item.id,
+                inspect_date:item.inspect_date
+              }
             }
-            console.log("abc",dd[arrthree[index].inspect_date])
-            if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
-              dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
-             
+          })
+        let listtwo = Object.values(dataInfotwo)
+        console.log("listtwo",listtwo)
+          for (const key in dd) {
+            for (const mkey in this.ObjectData) {
+              if (!(this.ObjectData[mkey].item_name in dd[key])) {
+                dd[key][this.ObjectData[mkey].item_name] = {
+                  item_name: this.ObjectData[mkey].item_name,
+                  name: mkey,
+                  inspect_value: 0
+                }
+              }
             }
+            this.tableData.push({ name: key, data: dd[key]})
+          }
+
+          listtwo.map(item=>{
+            this.tableData.map(it=>{
+              if(item.inspect_date == parseInt(it.name)){
+                 it.name = item.name
+                 it.id = item.id
+                 it.inspect_date = item.inspect_date
+              }
+            })
+          })
+          for(let i=0;i<this.patientsArr.length;i++){
+             for(let j=0;j<this.tableData.length;j++){
+               if(this.patientsArr[i].name == this.tableData[j].name){
+                   this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
+                   this.tableData[j].patient_id = this.patientsArr[i].id
+               }
+             }
           }
-         console.log("dd",dd)
-        //   let dataInfotwo = {}
-        //   newArr.forEach((item, index) => {
-        //     let { inspect_date } = item
-        //     if (!dataInfotwo[inspect_date]) {
-        //       dataInfotwo[inspect_date] = {
-        //         inspect_date,
-        //         name: item.name,
-        //         item_id:item.item_id,
-        //         item_name:item.item_name,
-        //         range_max:item.range_max,
-        //         range_min:item.range_min,
-        //       }
-        //     }
-        //   })
-        // let listtwo = Object.values(dataInfotwo)
-        //  console.log("listtwo",listtwo)
-        // let arrsix = []
-        // for(let i=0;i<listtwo.length;i++){
-        //    arrsix.push({
-        //         name:listtwo[i].name,
-        //        inspectdate:dd[listtwo[i].inspect_date]
-        //    })
-        // }
-      //  var obj = {}
-      //  var fruitsObj = {...arrsix}
-      //  console.log("陈工",fruitsObj)
-      //  console.log("objecdat",this.ObjectData)
-       
-          // for (const key in dd) {
-          //   var total = 0;
-          //   for (const mkey in this.modeOptions) {
-          //     if (mkey in dd[key]) {
-          //       dd[key][mkey].mode = this.modeOptions[mkey].name;
-          //       var number = parseInt(dd[key][mkey].number);
-          //       if (isNaN(number) || number == 0) {
-          //         dd[key][mkey].number = "";
-          //         number = 0;
-          //       }
-          //       total += number;
-          //     } else {
-          //       dd[key][mkey] = {
-          //         mode: this.modeOptions[mkey].name,
-          //         mode_id: mkey,
-          //         number: 0
-          //       };
-          //     }
-          //   }
-          //   this.tableData.push({ date: key, data: dd[key], total: total });
-          // }
-       
-          //  for(const key in dd){
-          //    for(const mkey in this.ObjectData){
-          //       if(mkey in dd[key]){
-          //         dd[key][mkey].item_name =  this.ObjectData[mkey].item_name
-          //         var inspect_value = dd[key][mkey].inspect_value
-          //         if(inspect_value == 0){
-          //           inspect_value = 0
-          //         }
-          //       }else{
-          //         dd[key][mkey] = {
-          //            item_name:this.ObjectData[mkey].item_name,
-          //            item_id:mkey,
-          //            inspect_value:0,
-          //         }
-          //       }
-          //    }
-          //    this.tableData.push({ date: key, data: dd[key]})
-          //  }
-
-          //  console.log("表哥",this.tableData)
-
-
-          // for (const key in dd) {
-          //   for (const mkey in this.ObjectData) {
-          //     if (!(this.ObjectData[mkey].item_name in dd[key])) {
-          //       dd[key][this.ObjectData[mkey].item_name] = {
-          //         item_name: this.ObjectData[mkey].item_name,
-          //         name: mkey,
-          //         inspect_value: 0
-          //       }
-          //     }
-          //   }
-          //   this.tableData.push({ name: key, data: dd[key]})
-          // }
+         console.log("表哥123",this.tableData)
          }
       })
     },
@@ -638,37 +623,38 @@ export default {
        getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
            if(response.data.state == 1){
               var cartogramlist =  response.data.data.cartogramlist
-              // console.log("cartogramlist",cartogramlist)
+            //  console.log("cartogramlist",cartogramlist)
               var totaltwo =  response.data.data.total
+              // console.log("totaltwo",totaltwo)
                var cart = []
                for(let i=0;i<cartogramlist.length;i++){
                   if(cartogramlist[i].inspect_value != ''){
                     cart.push(cartogramlist[i])
                   }
                }
-              //  console.log("cart",cart)
+              // console.log("cart",cart)
                let dataInfo = {}
                 cart.forEach((item, index) => {
-                  let { patient_id } = item
-                  if (!dataInfo[patient_id]) {
-                    dataInfo[patient_id] = {
-                      patient_id,
+                  let { inspect_date } = item
+                  if (!dataInfo[inspect_date]) {
+                    dataInfo[inspect_date] = {
+                      inspect_date,
                       name:item.name,
                       child: [],
-                      inspect_date:item.inspect_date,
+                      patient_id:item.patient_id,
                       total:0,
+                      count:0,
                     }
                   }
                 })
               let list = Object.values(dataInfo)
-              // console.log("list",list)
+              console.log("list",list)
 
               var arr = []
               list.map(item=>{
                  for(let i=0;i<cart.length;i++){
                     if(item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id){
                         item.child.push(cart[i])
-                         item.total++
                     }
                  }
               })
@@ -677,77 +663,41 @@ export default {
 
              list.map(item=>{
                 item.child.map(it=>{
-                   arr.push(it)
+                   if(parseInt(it.range_min)<=parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max)){
+                       item.total ++
+                   }
                 })
              })
-              // console.log("arr",arr)
+             var standardTotal = 0
 
-             var arrtwo = []
-             for(let i=0;i<arr.length;i++){
-               if(parseInt(arr[i].range_min)<= parseInt(arr[i].inspect_value) && parseInt(arr[i].inspect_value)<=parseInt(arr[i].range_max )){
-                  arrtwo.push(arr[i])
+             list.map(item=>{
+               if(item.total == item.child.length){
+                  item.count ++
                }
-             }
-            //  console.log("arrtwo",arrtwo)
-
-             let objinfo = {}
-                arrtwo.forEach((item, index) => {
-                  let { patient_id } = item
-                  if (!objinfo[patient_id]) {
-                    objinfo[patient_id] = {
-                      patient_id,
-                      name:item.name,
-                      child: [],
-                      inspect_date:item.inspect_date,
-                      count:0,
-                    }
-                  }
-                })
-              let newlist = Object.values(objinfo)
-              newlist.map(item=>{
-                 for(let i=0;i<arrtwo.length;i++){
-                    if(arrtwo[i].patient_id == item.patient_id && arrtwo[i].inspect_date == item.inspect_date){
-                       item.child.push(arrtwo[i])
-                    }
-                 }
-              })
-              // 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 )){
-                       item.count ++
-                    }
-                  })
-              })
-              // console.log("newlist",newlist)
-
-
-              var newtotal = 0
-
-              list.map(item=>{
-                 for(let i=0;i<newlist.length;i++){
-                    if(item.patient_id == newlist[i].patient_id && item.total == newlist[i].count){
-                       newtotal ++
-                    }
-                 }
-              })
-            //  console.log("newtotal",newtotal)
-             var totalCount = totaltwo - newtotal
-              // console.log("totalCount",totaltwo)
-             for(let i=0;i<this.dataName.length;i++){
-                this.modesData.xAxis.push(this.dataName[i].name);
-             }
-
+             })
+             list.map(item=>{
+               standardTotal += item.count
+             })
+             var totalCount = list.length
+            //  console.log("arr",list)
+            //  console.log("合格",standardTotal)
+            //  console.log("总人数",totalCount)
              for(let i=0;i<this.dataCount.length;i++){
-                this.dataCount[0].count = newtotal
-                this.dataCount[1].count =  totalCount
+                this.dataCount[0].count = standardTotal
+                this.dataCount[1].count =  totalCount - standardTotal
+               this.obj.push(this.dataCount[i].count)
              }
+            // console.log("dataCount",this.dataCount)
+         for (let i = 0; i < this.dataName.length; i++) {
+            this.modesData.xAxis.push(this.dataName[i].name)
 
-             for(let i=0;i<this.dataCount.length;i++){
-                this.modesData.series.push(((this.dataCount[i].count/totaltwo)*100).toFixed(1));
-             }
-              this.chart.series[0].data = this.modesData.series
-              this.chart.xAxis.data = this.modesData.xAxis
+          }
+          for (let i = 0; i < this.dataCount.length; i++) {
+              this.modesData.series.push(((this.dataCount[i].count / totalCount) * 100).toFixed(1))
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+            //  console.log("this",this.modesData)
            }
        })
     },
@@ -755,6 +705,9 @@ export default {
        getCurrentOrgPatients().then(response=>{
           if(response.data.state == 1){
             this.patientsArr =  response.data.data.patients
+            // console.log("病人",this.patientsArr)
+            //获取列表数据
+            this.getlist()
           }
        })
      },
@@ -774,11 +727,10 @@ export default {
         })
       },
    handleSelect(val) {
-        console.log("val",val)
         this.listQuery.search = val.name
         this.patient_id = val.id
         this.onSearch()
-      },
+     },
   },
   created(){
     var nowDate = new Date();
@@ -804,15 +756,13 @@ export default {
 
 
 
-
+    this.getCurrentOrgPatients()
     //获取系统指标
     this.getNormData()
-    //获取列表数据
-    this.getlist()
     //获取统计图数据
     this.getCartogramlist()
 
-    this.getCurrentOrgPatients()
+
   }
 };
 </script>

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

@@ -331,7 +331,7 @@ export default {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
-                console.log("=====",dd[key])
+                console.log("=====",mkey)
                 console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);