bug修改

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -18,6 +18,9 @@
             >{{ item.label }}</li>
           </ul>
         </div>
+        <label class="title">
+             <span class="name">日期查询</span> :
+        </label>
         <el-date-picker
           v-model="listQuery.start_time"
           prefix-icon="el-icon-date"
@@ -299,8 +302,8 @@ export default {
         { value: 0, label: "本月", state: 0 },
         { value: 1, label: "近三个月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
-        { value: 3, label: "近一年", state: 3 },
-        { value:4,label:"自定义",state:4}
+        { value: 3, label: "近一年", state: 3 }
+        // { value:4,label:"自定义",state:4}
       ],
       modetype:[],
       total:0,
@@ -340,11 +343,11 @@ export default {
          //统计透析总量
         this.getDialysisModeType(val,this.listQuery.end_time)
         //统计转归状态
-        this.getTotalLapseCount(timeStar,timeEnd)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(timeStar,timeEnd)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计年龄
         this.getTotalAgeCount(timeStar,timeEnd)
         //统计透析年龄
@@ -364,11 +367,11 @@ export default {
           //统计透析总量
         this.getDialysisModeType(this.listQuery.start_time,val)
         //统计转归状态
-        this.getTotalLapseCount(timeStar,timeEnd)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(timeStar,timeEnd)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计年龄
         this.getTotalAgeCount(timeStar,timeEnd)
         //统计透析年龄
@@ -380,9 +383,9 @@ export default {
       this.listQuery.state = state;
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-      console.log("开始时间",startDate)
+      // console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-      console.log("结束时间",endDate)
+      // console.log("结束时间",endDate)
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -411,6 +414,8 @@ export default {
       }
       //近三月
       if(state == 1){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
         // console.log("三月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -435,6 +440,8 @@ export default {
 
      //近半年
      if(state == 2){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -459,6 +466,8 @@ export default {
 
      //近一年
      if(state == 3){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
         // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -502,11 +511,12 @@ export default {
       getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var patients =  response.data.data.patients
+          console.log('patients',patients)
           this.rollOutTotal = patients.length
-          // console.log("留治病人长度",patients.length)
+          console.log("留治病人长度",patients.length)
           var patienttwo = response.data.data.patienttwo
           this.outTotal = patienttwo.length
-            // console.log("转出长度", this.outTotal)
+          console.log("转出长度", this.outTotal)
           var count = response.data.data.count
           this.patientCount = count
          }
@@ -534,7 +544,7 @@ export default {
              this.InfectiousTotal = response.data.data.total
             //  console.log("===",this.InfectiousTotal)
              var infectious = response.data.data.count
-            //  console.log("infectious",infectious)
+          //  console.log("infectious",infectious)
              var otherTotal = response.data.data.otherTotal
             //  console.log("otherTotal",otherTotal)
              this.otherTotal = otherTotal
@@ -595,7 +605,7 @@ export default {
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
-           console.log("dataage",dataage)
+          //  console.log("dataage",dataage)
            this.dialysisAge = dataage
 
          }
@@ -605,24 +615,24 @@ export default {
   created() {
         //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-      // console.log("开始时间",startDate)
+       console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     // console.log("结束时间",endDate)
+     console.log("结束时间",endDate)
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
       //本月的开始时间
       var monthStartDate = new Date(nowYear, nowMonth, 1);
       var timeStar=Date.parse(monthStartDate)/1000;//s
-     // console.log("本月第一天",timeStar)
+      console.log("本月第一天",timeStar)
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-     // console.log("本月最后一天",timeEnd)
+      console.log("本月最后一天",timeEnd)
       //统计透析总量
       this.getDialysisModeType(startDate,endDate)
       //统计转归状态
-      this.getTotalLapseCount(timeStar,timeEnd)
+      this.getTotalLapseCount(startDate,endDate)
       //统计男女比例
       this.getTotalSexCount(timeStar,timeEnd)
       //统计传染病

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -277,7 +277,7 @@ export default {
         //第四季度
          const four_qurter_start = moment().month(9).startOf('month').format("YYYY-MM-DD")
          const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
-         console.log("this.modetype",this.mode_type)
+        //  console.log("this.modetype",this.mode_type)
          for(let i=0;i<this.normdata.length;i++){
             if(this.normdata[i].inspection_minor == this.mode_type){
                this.range_type = this.normdata[i].range_type
@@ -302,9 +302,9 @@ export default {
       getProjectList(params).then(response=>{
         if(response.data.state === 1){
           var list = response.data.data.list
-          console.log("list",list)
+           console.log("list",list)
           var standList =  response.data.data.standList
-          console.log("standlist",standList)
+           console.log("standlist",standList)
           var newArr = [
             {Total:"第一季度",Count:1,NoCount: 0},
             {Total:"第二季度",Count:1,NoCount: 0},
@@ -373,7 +373,7 @@ export default {
              }
           }
         
-      
+         console.log("arrfive",arrFive)
         
         for(const key in arrFive){
             this.modesData.xAxis.push(arrFive[key].Total);
@@ -383,6 +383,7 @@ export default {
 
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
+          console.log("表格",this.modesData)
        
         }
       })
@@ -569,7 +570,7 @@ export default {
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
-            console.log("monthlist",monthlist)
+            // console.log("monthlist",monthlist)
             var newArr = [
               {Total:"一月",Count:1,NoCount: 0},
               {Total:"二月",Count:1,NoCount: 0},

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -478,7 +478,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
-           console.log("指标正常范围",normdata)
+          //  console.log("指标正常范围",normdata)
            this.normData = normdata
            this.getlist()
          }
@@ -591,9 +591,9 @@ export default {
       getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-           console.log("count",count) 
+          //  console.log("count",count) 
             var countwo = response.data.data.countwo 
-           console.log("countwo",countwo)
+          //  console.log("countwo",countwo)
             countwo.map(item=>{
               count.push(item)
             })
@@ -607,7 +607,7 @@ export default {
                 }
               }
             }
-           console.log("arr",arr )
+          //  console.log("arr",arr )
            
             var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
@@ -619,7 +619,7 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            console.log("arr",arr)
+            // console.log("arr",arr)
              arr.sort(this.compare('sort'))  
             // arr.sort((a,b)=>{
             //     return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -233,7 +233,9 @@ export default {
     chooseMonth(month) {
       //一月
       if(month == 0){
-         this.monthActive = 0
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
+        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()
@@ -251,6 +253,8 @@ export default {
 
       //近三月
       if(month == 1){
+         this.listQuery.start_time = ""
+         this.listQuery.end_time =""
          this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
     
@@ -266,6 +270,8 @@ export default {
 
        //近半年
       if(month == 2){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
         this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         
@@ -277,6 +283,8 @@ export default {
 
       //近一年
       if(month == 3){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
         this.monthActive = 3
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
         this.startime = Date.parse(startDate)/1000
@@ -356,7 +364,6 @@ export default {
       })
     },
     getlist(){
-        console.log("进来没有")
         this.modesData.series = []
         this.modesData.xAxis = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -365,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
@@ -381,7 +381,7 @@ export default {
                 }
               })
               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) {
@@ -436,7 +436,6 @@ export default {
                   }
                   this.tableData.push({ name: key, data: dd[key]})
                 }
-                console.log("表哥===========",this.tableData)
               let dataInfotwo = {}
               control.forEach((item, index) => {
                 let { inspect_date } = item
@@ -487,17 +486,17 @@ export default {
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-            // console.log("patients",patients)
+     
             this.tablePatients = patients
             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 = []
             // 分页
             for (let i = 0; i < control.length; i++) {
@@ -507,7 +506,7 @@ export default {
                 }
               }
             }
-          // console.log("newArr",newArr)
+       
           let dataInfo = {}
           newArr.forEach((item, index) => {
             let { inspect_date } = item
@@ -531,14 +530,14 @@ export default {
               }
             }
           })
-        //  console.log("list",list)
+ 
          var newarrtwo = []
           list.map(item => {
             item.child.map(it => {
               newarrtwo.push(it)
             })
           })
-        //  console.log("newarrtwo",newarrtwo)
+ 
           // 配置的才显示
          var arrthree = []
           for (let i = 0; i < newarrtwo.length; i++) {
@@ -554,7 +553,7 @@ export default {
             item.item_name = ''
             arrthree.push(item)
           })
-          // console.log('arrthree', arrthree)
+   
           var dd = {}
            for (const index in arrthree) {
              if (!(arrthree[index].inspect_date in dd)) {
@@ -580,7 +579,7 @@ export default {
             }
           })
         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])) {
@@ -612,7 +611,6 @@ export default {
                }
              }
           }
-        //  console.log("表哥123",this.tableData)
          }
       })
     },

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -256,7 +256,7 @@ export default {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-           console.log("详情",configurationdetail)
+          //  console.log("详情",configurationdetail)
            this.editform.id = configurationdetail.id
            this.editform.inspectionMajor = configurationdetail.inspection_major
            this.editform.inspectionMinor = configurationdetail.inspection_minor
@@ -290,7 +290,7 @@ export default {
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          console.log("大项是什么",inspection)
+          // console.log("大项是什么",inspection)
           this.InspectionMajor = inspection
          
         }
@@ -302,7 +302,7 @@ export default {
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        //  console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
@@ -323,7 +323,7 @@ export default {
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-           console.log("inspectionRange",inspectionRange)
+          //  console.log("inspectionRange",inspectionRange)
            if(inspectionRange.range_type == 1){
              this.showOne = true
              this.showTwo = false
@@ -387,7 +387,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)