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

config/dev.env.js

   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/common/common.js

     startime: startime,
     endtime: endtime
   }
-  console.log('params', params)
+  console.log('转归params', params)
   return request({
     url: '/com/api/gettotallapsecount',
     method: 'get',
     startime: startime,
     endtime: endtime
   }
+  console.log('透析年龄======', params)
   return request({
     url: '/com/api/gettotaldialysiscount',
     method: 'get',

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

               ? parseFloat(
               afterdialysis.weight_after -
               afterdialysis.additional_weight
-              ).toFixed(1)
+              ).toFixed(2)
               : "/"
               }}kg
             </span>
       vascularAccess: [],
       nursing_record: '',
       special_record: '',
-      newTableAdvice:[]
+      newTableAdvice: []
     }
   },
   methods: {
           var doctoradvce = response.data.data.doctorAdvice
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
           this.newTableAdvice = response.data.data.doctorAdevieInfo
-          console.log("哈哈哈哈哈哈哈哈哈",this.newTableAdvice)
+          console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
           var tableAdvice = doctorAdevieInfo
           console.log('tableAdvice', tableAdvice)
           // console.log('医生', tableAdvice.length)

src/xt_pages/qcd/basicInformationAnalysis.vue

             >{{ 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"
         { 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,
          //统计透析总量
         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)
         //统计透析年龄
           //统计透析总量
         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)
         //统计透析年龄
       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(); //当前年
       }
       //近三月
       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
 
      //近半年
      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
 
      //近一年
      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
       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
          }
              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
       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
 
          }
   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/indicatorControlAnalysis/components/office.vue

 
           }
         },
+        range_type:'',
         total:0,
         item_name: '',
         query: {
       },
       jumpDetail(row){
         // this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
-        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+row.inspect_type+"&patient_id="+row.patient.id)
+        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+this.query.range_type+"&patient_id="+row.patient.id)
       },
       handleSizeChange(limit) {
         this.query.limit = limit

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
             const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
             this.query.start_time = startDate
             const endDate = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
           case 3: //近半年
             this.query.start_time = moment().subtract('month', 6).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
           case 4: //近一年
             this.query.start_time = moment().subtract('month', 12).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
                 }
               }
 
+              console.log(this.options.xAxis.data)
+
               console.log(this.options.series[0].data)
 
               //获取无法确定选项的颜色

src/xt_pages/qcd/officesControlAnalysis/project.vue

         //第四季度
          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
       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},
              }
           }
         
-      
+         console.log("arrfive",arrFive)
         
         for(const key in arrFive){
             this.modesData.xAxis.push(arrFive[key].Total);
 
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
+          console.log("表格",this.modesData)
        
         }
       })
        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

       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()
          }
       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)
             })
                 }
               }
             }
-           console.log("arr",arr )
+          //  console.log("arr",arr )
            
             var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
             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

               </el-form-item>
             </el-form>
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+            <el-table ref="singleTable" :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="name" label="透析号" width="70">
                  <template slot-scope="scope">
                     {{scope.row.dialysis_no}}
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
+ import { PostSearch} from '@/api/patient'
 import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
 export default {
   components: {
     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()
 
       //近三月
       if(month == 1){
+         this.listQuery.start_time = ""
+         this.listQuery.end_time =""
          this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
     
 
        //近半年
       if(month == 2){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
         this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         
 
       //近一年
       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
       getCurrentOrgPatients().then(response=>{
           if(response.data.state == 1){
             var patients = response.data.data.patients
+            for(let i=0;i<patients.length;i++){
+               if(this.patientid == patients[i].id){
+                  this.$refs.singleTable.setCurrentRow(patients[i])
+               }
+            }
             this.patientsData = patients
           }
       })
       })
     },
     getlist(){
-        console.log("进来没有")
         this.modesData.series = []
         this.modesData.xAxis = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
               this.chart.xAxis.data = this.modesData.xAxis
             }
        })
-    }
+    },
+     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.getlistDetail()
+      },
   },
 
    created(){
      this.patientid =  this.$route.query.patientid
+    
      this.inspect_date = this.$route.query.date
      //获取指标项
       this.getNormData()

src/xt_pages/qcd/patientControlAnalysis.vue

        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
                 }
               })
               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) {
                   }
                   this.tableData.push({ name: key, data: dd[key]})
                 }
-                console.log("表哥===========",this.tableData)
               let dataInfotwo = {}
               control.forEach((item, index) => {
                 let { inspect_date } = item
       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++) {
                 }
               }
             }
-          // console.log("newArr",newArr)
+       
           let dataInfo = {}
           newArr.forEach((item, index) => {
             let { inspect_date } = item
               }
             }
           })
-        //  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++) {
             item.item_name = ''
             arrthree.push(item)
           })
-          // console.log('arrthree', arrthree)
+   
           var dd = {}
            for (const index in arrthree) {
              if (!(arrthree[index].inspect_date in dd)) {
             }
           })
         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])) {
                }
              }
           }
-        //  console.log("表哥123",this.tableData)
          }
       })
     },

src/xt_pages/qcd/statisticalConfiguration.vue

       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
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          console.log("大项是什么",inspection)
+          // console.log("大项是什么",inspection)
           this.InspectionMajor = inspection
          
         }
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        //  console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
        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
               configurationlist[i].sort = ""
             }
           }
-          console.log("列表",configurationlist)
+          // console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
          // console.log("total",total)

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start()