bug修改

src/api/common/common.js

@@ -289,6 +289,7 @@ export function getInspectionTotalCount(startime, endtime, patientid) {
     endtime: endtime,
     patientid: patientid
   }
+  console.log('病人新项目', params)
   return request({
     url: '/com/api/getinspectiontotalcount',
     method: 'get',
@@ -302,6 +303,7 @@ export function getInspectionDetailById(id, startime, endtime) {
     startime: startime,
     endtime: endtime
   }
+  console.log('params', params)
   return request({
     url: '/com/api/getinspectionDetailById',
     method: 'get',

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button type="primary" @click="$router.back(-1)">返回</el-button>
     </div>
     <div class="app-container">
       <div class="cell clearfix">

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -619,7 +619,8 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            arr.sort(this.compare('sort'))    
+            arr.sort(this.compare('sort'))  
+            console.log("arr",arr)
             for(const key in this.normData ){
                this.modesData.xAxis.push(this.normData[key].item_name);
                 if(key in arr){
@@ -631,7 +632,7 @@ export default {
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
             this.getArrLength(this.chart.xAxis.data)
-
+            console.log('====',this.modesData) 
           
          }
       })

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -356,6 +356,7 @@ export default {
       })
     },
     getlist(){
+        console.log("进来没有")
         this.modesData.series = []
         this.modesData.xAxis = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
@@ -380,6 +381,7 @@ export default {
        GetQualityControl(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
+            console.log("list",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  

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -78,7 +78,6 @@
             <el-table-column fixed prop="name" label="姓名" width="100"></el-table-column>
             <el-table-column label="透析号" width="80">
               <template slot-scope="scope">
-                  <!-- {{getDialysisNo(scope.row.name)}} -->
                   {{scope.row.dialysis_no}}
               </template>
             </el-table-column>
@@ -91,14 +90,22 @@
               :key="index"
             >
             <template slot-scope="scope">
-              <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))">
+              <span v-if="scope.row.data[modeItem.item_name].range_type == 1 && scope.row.data[modeItem.item_name].inspect_value == ''">0</span>
+              <span v-if="scope.row.data[modeItem.item_name].range_type == 1 && 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))">
                 <span >{{scope.row.data[modeItem.item_name].inspect_value}}</span><span style="color:#5B98FF;margin-left:5px;">↓</span>
               </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))">
+              <span v-if="scope.row.data[modeItem.item_name].range_type == 1 && 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))">
                 <span>{{scope.row.data[modeItem.item_name].inspect_value}}</span><span style="color:#F56C6C;margin-left:5px;">↑</span>
               </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>
+              <span v-if="scope.row.data[modeItem.item_name].range_type == 1 && 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>
+              <span v-if="scope.row.data[modeItem.item_name].range_type == 2 && scope.row.data[modeItem.item_name].inspect_value !=''">
+                <span v-if="scope.row.data[modeItem.item_name].range_value == scope.row.data[modeItem.item_name].inspect_value">
+                   <span style="color:#5B98FF;margin-left:5px;" >{{scope.row.data[modeItem.item_name].inspect_value}}</span>
+                </span>
+                 <span v-if="scope.row.data[modeItem.item_name].range_value != scope.row.data[modeItem.item_name].inspect_value">
+                   <span style="color:#F56C6C;margin-left:5px;" >{{scope.row.data[modeItem.item_name].inspect_value}}</span>
+                </span>
+              </span>
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
@@ -153,7 +160,7 @@ export default {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 20
+        limit: 10
       },
       total:0,
       lapstor:0,
@@ -358,7 +365,7 @@ 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 { inspect_date } = item
@@ -367,8 +374,9 @@ export default {
                     inspect_date,
                     name: item.name,
                     child: [],
-                    patient_id: item.patient_id
-
+                    patient_id: item.patient_id,
+                    range_type:item.range_type,
+                    dialysis_no:item.dialysis_no
                   }
                 }
               })
@@ -397,7 +405,7 @@ export default {
                     }
                   }
                 }
-                console.log("arrthree",arrthree)
+                // console.log("arrthree",arrthree)
                 var arrfour = this.arrayDate(arrthree, newarrtwo)
                 arrfour.map(item => {
                   item.item_name = ''
@@ -413,7 +421,6 @@ export default {
                     dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
                   }
                 }
-
                 this.tableData = []
 
                 for (const key in dd) {
@@ -422,12 +429,14 @@ export default {
                       dd[key][this.ObjectData[mkey].item_name] = {
                         item_name: this.ObjectData[mkey].item_name,
                         name: mkey,
-                        inspect_value: 0
+                        inspect_value: 0,
+                        range_type:this.ObjectData[mkey].range_type　　
                       }
                     }
                   }
                   this.tableData.push({ name: key, data: dd[key]})
                 }
+                console.log("表哥===========",this.tableData)
               let dataInfotwo = {}
               control.forEach((item, index) => {
                 let { inspect_date } = item
@@ -435,14 +444,17 @@ export default {
                   dataInfotwo[inspect_date] = {
                     inspect_date,
                     name: item.name,
+                    dialysis_no:item.dialysis_no
                   }
                 }
               })
               let listtwo = Object.values(dataInfotwo)
+              // console.log("listtwo",listtwo)
                 listtwo.map(item=>{
                   this.tableData.map(it=>{
                     if(item.inspect_date == parseInt(it.name)){
                       it.name = item.name
+                      it.dialysis_no = item.dialysis_no
                     }
                   })
                 })
@@ -480,6 +492,11 @@ export default {
             var total = response.data.data.total
             this.total = total
             var control = response.data.data.control
+           var infectiousControl =  response.data.data.infectiousControl
+          //  console.log("infectiousContrl",infectiousControl)
+           infectiousControl.map(item=>{
+             control.push(item)
+           })
             // console.log("control",control)
             var newArr = []
             // 分页
@@ -499,7 +516,8 @@ export default {
                 inspect_date,
                 name: item.name,
                 child: [],
-                patient_id: item.patient_id
+                patient_id: item.patient_id,
+                range_type:item.range_type
               }
             }
           })
@@ -557,19 +575,20 @@ export default {
                 name: item.name,
                 inspect_value:item.inspect_value,
                 id:item.id,
-                inspect_date:item.inspect_date
+                inspect_date:item.inspect_date,
               }
             }
           })
         let listtwo = Object.values(dataInfotwo)
-        console.log("listtwo",listtwo)
+        // 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
+                  inspect_value: 0,
+                  range_type:this.ObjectData[mkey].range_type
                 }
               }
             }
@@ -593,7 +612,7 @@ export default {
                }
              }
           }
-         console.log("表哥123",this.tableData)
+        //  console.log("表哥123",this.tableData)
          }
       })
     },
@@ -628,32 +647,49 @@ 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 infectiouscontrol =  response.data.data.infectiouscontrol
+              // console.log("infectiouscontrol",infectiouscontrol)
+              infectiouscontrol.map(item=>{
+                cartogramlist.push(item)
+              })
                var cart = []
-               for(let i=0;i<cartogramlist.length;i++){
-                  if(cartogramlist[i].inspect_value != ''){
-                    cart.push(cartogramlist[i])
-                  }
-               }
+              //  console.log("已配置的选项",this.normData)
+              //过滤已经配置的选项
+              for(let i=0;i<cartogramlist.length;i++){
+                for(let j=0;j<this.normData.length;j++){
+                   if(cartogramlist[i].item_id == this.normData[j].inspection_minor){
+                        cart.push(cartogramlist[i])
+                   }
+                }
+              }
+            //  console.log("cart",cart)
+
+              //  for(let i=0;i<cartogramlist.length;i++){
+              //     if(cartogramlist[i].inspect_value != ''){
+              //       cart.push(cartogramlist[i])
+              //     }
+              //  }
               // console.log("cart",cart)
                let dataInfo = {}
                 cart.forEach((item, index) => {
-                  let { inspect_date } = item
-                  if (!dataInfo[inspect_date]) {
-                    dataInfo[inspect_date] = {
-                      inspect_date,
+                  let { patient_id } = item
+                  if (!dataInfo[patient_id]) {
+                    dataInfo[patient_id] = {
+                      patient_id,
                       name:item.name,
                       child: [],
-                      patient_id:item.patient_id,
+                      inspect_date:item.inspect_date,
                       total:0,
                       count:0,
+                      infectotal:0,
                     }
                   }
                 })
               let list = Object.values(dataInfo)
-              console.log("list",list)
+
 
               var arr = []
               list.map(item=>{
@@ -665,18 +701,24 @@ export default {
               })
 
 
-
+          //  console.log("list",list)
              list.map(item=>{
                 item.child.map(it=>{
-                   if(parseInt(it.range_min)<=parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max)){
+                  //  console.log("长度",item.child.length)
+                  //  console.log("it",it)
+                   if(it.range_type == 1 && parseInt(it.range_min)<=parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max)){
                        item.total ++
                    }
+                   if(it.range_type == 2 && it.inspect_value == it.range_value){
+                      item.infectotal ++
+                   }
                 })
              })
+            //  console.log("list",list)
              var standardTotal = 0
 
              list.map(item=>{
-               if(item.total == item.child.length){
+               if((item.total +item.infectotal) == item.child.length){
                   item.count ++
                }
              })

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -22,7 +22,14 @@
              <template slot-scope="scope">{{ scope.row.item_name }}</template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
-             <template slot-scope="scope">{{ scope.row.min_range }} - {{scope.row.large_range}}</template>
+             <template slot-scope="scope">
+               <span v-if="scope.row.range_type == 1">
+                 {{ scope.row.min_range }} - {{scope.row.large_range}}
+                </span>
+                <span v-if="scope.row.range_type == 2">
+                   {{scope.row.range_value}}
+                </span>
+             </template>
           </el-table-column>
            <el-table-column prop="address" label="单位">
               <template slot-scope="scope">{{ scope.row.unit }}</template>
@@ -75,9 +82,9 @@
             </el-select>
           </el-form-item>
        
-            <el-form-item label="检验类型" :label-width="formLabelWidth" required prop="check_type">
+            <el-form-item label="检查结果类型" :label-width="formLabelWidth" required prop="check_type">
                     <el-radio
-                      :disabled = "true"
+                      @change="chageType"
                       v-model="form.check_type"
                       v-for="item in radioType"
                       :key="item.label"
@@ -135,9 +142,9 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检验类型" :label-width="formLabelWidth" required prop="check_type">
+          <el-form-item label="检查结果类型" :label-width="formLabelWidth" required prop="check_type">
                 <el-radio
-                  :disabled = "true"
+                   @change = "chageType"
                    v-model="editform.check_type"
                    v-for="item in radioType"
                    :key="item.label"
@@ -191,8 +198,8 @@ export default {
         { path: false, name: "质控达标统计配置" }
       ],
      radioType: [
-        { value: 1, label: "数值范围" },
-        { value: 2, label: "选项" }
+        { value: 1, label: "数值类型" },
+        { value: 2, label: "非数值类型" }
       ],
       tabActiveName: "control",
       InspectionMajor:[],
@@ -226,7 +233,8 @@ export default {
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
         large_range:[{required:true,message:"质控范围不能为空"}],
         min_range:[{required:true,message:"质控范围不能为空"}],
-        check_type:[{required:true,message:"检验类型不能为空"}]
+        check_type:[{required:true,message:"检验类型不能为空"}],
+        range_value:[{required:true,message:"参考值不能为空"}]
       },
       page:1,
       limit:10,
@@ -290,6 +298,7 @@ export default {
     },
     //获取小项
     changeInspection(id){
+       this.form.inspectionMinor = ""
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
@@ -451,6 +460,20 @@ export default {
         }
       })
     },
+    chageType(val){
+      if(val == 1){
+         this.showOne = true
+         this.showTwo = false
+         this.form.range_value = ""
+         this.editform.range_value = ""
+      }
+      if(val == 2){
+         this.showOne = false
+         this.showTwo = true
+         this.form.range_value = ""
+         this.editform.range_value = ""
+      }
+    }
   },
   components: {
     PieChart,

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

@@ -59,6 +59,7 @@
           height="500" :row-style="{ color: '#303133' }" 
           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
           highlight-current-row
+           ref="singleTable"
           @current-change="handleChange"
           >
            <el-table-column prop="dialysis_no" label="透析号" width="80">
@@ -91,6 +92,7 @@ export default {
   },
   data() {
     return {
+      patient_id:0,
       listQuery: {
         start_time: "",
         end_time: "",
@@ -242,13 +244,19 @@ export default {
     getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
          var patients = response.data.data.patients
+         for(let i=0;i<patients.length;i++){
+            this.$refs.singleTable.setCurrentRow(patients[0])
+            this.patient_id = patients[0].id
+         }
          this.patientsData = patients
+          //获取检验检查项目
+         this.getInspectionTotalCount()
       })
     },
     getInspectionTotalCount(){
       this.modesData.series = []
       this.modesData.xAxis = []
-      getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+      getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time,this.patient_id).then(response=>{
         if(response.data.state === 1){
           var Inspection = response.data.data.Inspection
     
@@ -265,7 +273,7 @@ export default {
             }
           }
         
-          var arrtwo =  this.arrayDate(counts,this.normData)
+          // var arrtwo =  this.arrayDate(counts,this.normData)
           
           var hash = {};
           var i = 0;
@@ -297,7 +305,7 @@ export default {
           res.map(item => {
             this.modesData.series.push(parseInt(item.Count));
           })
-          console.log("this=====",this.tableData)
+          // console.log("this=====",this.tableData)
           for (const key in this.tableData) {
             this.modesData.xAxis.push(this.tableData[key].project_name);
             let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
@@ -319,34 +327,84 @@ 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)
+            // console.log("patientdetail",patientdetail)
             var arr=[]
-            for(let i=0;i<this.tableData.length;i++){
-              for(let j=0;j<patientdetail.length;j++){
-                 if(this.tableData[i].inspection_major == patientdetail[j].ProjectId){
-                    arr.push(patientdetail[j])
-                 }
+
+          for(let i=0;i<this.tableData.length;i++){
+            for(let j=0;j<patientdetail.length;j++){
+              if(this.tableData[i].inspection_major == patientdetail[j].ProjectId){
+                arr.push(patientdetail[j])
               }
             }
-            
-           let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
-           let day = parseInt(time / (1000 * 60 * 60 * 24))
-           console.log("arr",arr)
-           console.log("tabledata",this.tableData)
-            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)
-              }
+          }
+          // console.log('arr',arr)
+         
+          
+          var hash = {};
+          var i = 0;
+          var res = [];
+          arr.forEach(function(item) {
+            var ProjectName = item.ProjectName;
+            hash[ProjectName] ? res[hash[ProjectName] - 1].Count.push(item.Count) : hash[ProjectName] = ++i && res.push({
+                Count: [item.Count],
+                ProjectName: ProjectName,
+                ProjectId: item.ProjectId,
+                Sort:item.Sort,
+            })
+          });
+          
+          res.map(item => {
+            item.Count = eval(item.Count.join('+'))
+          })
+          
+          let arr1 = []
+          this.tableData.map(it => {
+            arr1.push(it.project_name)
+          })
+
+          arr1.forEach((item,index)=>{
+            if(!(res[index] && item ==res[index].ProjectName)){
+              res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
             }
-            this.chart.series[0].data = this.modesData.series
-            this.chart.xAxis.data = this.modesData.xAxis
-            this.getArrLength(this.chart.xAxis.data)
+          })
+          res.map(item => {
+            this.modesData.series.push(parseInt(item.Count));
+          })
+          // console.log("this=====",this.tableData)
+          for (const key in this.tableData) {
+            this.modesData.xAxis.push(this.tableData[key].project_name);
+            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+            let day = parseInt(time / (1000 * 60 * 60 * 24))
+            this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
+          }
+          
+          this.chart.series[0].data = this.modesData.series
+          this.chart.xAxis.data = this.modesData.xAxis
+          this.getArrLength(this.chart.xAxis.data)
+          //   for(let i=0;i<this.tableData.length;i++){
+          //     for(let j=0;j<patientdetail.length;j++){
+          //        if(this.tableData[i].inspection_major == patientdetail[j].ProjectId){
+          //           arr.push(patientdetail[j])
+          //        }
+          //     }
+          //   }
+            
+          //  let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+          //  let day = parseInt(time / (1000 * 60 * 60 * 24))
+          //  console.log("tabledata",this.tableData)
+          //   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))
+          //     } 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
+          //   this.getArrLength(this.chart.xAxis.data)
           }
        })
     },
@@ -358,32 +416,60 @@ export default {
       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)
+          //  console.log("patientsInfo",PatientsInfo)
            var arr = []
-           for(let i=0;i<this.tableData.length;i++){
-             for(let j=0;j<PatientsInfo.length;j++){
-                 if(this.tableData[i].inspection_major == PatientsInfo[j].ProjectId){
-                    arr.push(PatientsInfo[j])
-                 }
-             }
-           }
-           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)
+        
+          for(let i=0;i<this.tableData.length;i++){
+            for(let j=0;j<PatientsInfo.length;j++){
+              if(this.tableData[i].inspection_major == PatientsInfo[j].ProjectId){
+                arr.push(PatientsInfo[j])
               }
             }
-            this.chart.series[0].data = this.modesData.series
-            this.chart.xAxis.data = this.modesData.xAxis
-            this.getArrLength(this.chart.xAxis.data)
+          }
+          // console.log('arr',arr)
+         
+          
+          var hash = {};
+          var i = 0;
+          var res = [];
+          arr.forEach(function(item) {
+            var ProjectName = item.ProjectName;
+            hash[ProjectName] ? res[hash[ProjectName] - 1].Count.push(item.Count) : hash[ProjectName] = ++i && res.push({
+                Count: [item.Count],
+                ProjectName: ProjectName,
+                ProjectId: item.ProjectId,
+                Sort:item.Sort,
+            })
+          });
+          
+          res.map(item => {
+            item.Count = eval(item.Count.join('+'))
+          })
+          
+          let arr1 = []
+          this.tableData.map(it => {
+            arr1.push(it.project_name)
+          })
+
+          arr1.forEach((item,index)=>{
+            if(!(res[index] && item ==res[index].ProjectName)){
+              res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
+            }
+          })
+          res.map(item => {
+            this.modesData.series.push(parseInt(item.Count));
+          })
+          // console.log("this=====",this.tableData)
+          for (const key in this.tableData) {
+            this.modesData.xAxis.push(this.tableData[key].project_name);
+            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+            let day = parseInt(time / (1000 * 60 * 60 * 24))
+            this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
+          }
+          
+          this.chart.series[0].data = this.modesData.series
+          this.chart.xAxis.data = this.modesData.xAxis
+          this.getArrLength(this.chart.xAxis.data)
          }
       })
     },
@@ -418,7 +504,7 @@ export default {
       PostSearch(key).then(response => {
         if (response.data.state == 1) {
             searchArray = response.data.data.patient
-            console.log("searchArray",searchArray)
+            // console.log("searchArray",searchArray)
           cb(searchArray)
         } else {
           cb([])
@@ -426,7 +512,7 @@ export default {
       })
     },
     handleSelect(val) {
-      console.log("val",val)
+      // console.log("val",val)
       this.listQuery.search = val.name
       this.patient_id = val.id
       this.onSearch()
@@ -465,8 +551,7 @@ export default {
 
     //获取该机构下的所有患者
     this.getCurrentOrgPatients()
-    //获取检验检查项目
-    this.getInspectionTotalCount()
+   
   }
 };
 </script>

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

@@ -191,15 +191,15 @@ export default {
       getDialysisList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state === 1){
           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
-          console.log("prescriptionList",prescriptionList)
+          // console.log("prescriptionList",prescriptionList)
           this.getModeId(prescriptionList)
           var count = response.data.data.count
-          console.log("count",count)
+          // console.log("count",count)
           this.DialysisCount = count
           // for(let i=0;i<count.length;i++){
           //  for(let j=0;j<prescriptionList.length;j++){
@@ -225,7 +225,7 @@ export default {
             }
           })
           let list = Object.values(dataInfo)
-          console.log("arr",list)    
+          // console.log("arr",list)    
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -380,7 +380,7 @@ export default {
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
              searchArray = response.data.data.patient
-             console.log("searchArray",searchArray)
+            //  console.log("searchArray",searchArray)
             cb(searchArray)
           } else {
             cb([])
@@ -388,7 +388,7 @@ export default {
         })
       },
    handleSelect(val) {
-        console.log("val",val)
+        // console.log("val",val)
         this.listQuery.search = val.name
         this.patient_id = val.id
         this.onSearch()