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

src/api/common/statistics.js

@@ -210,6 +210,14 @@ export function GetPatientInspectionIndexBarChart(params) {
 
 
 
+export function GetDefaultPatient() {
+  return request({
+    url: '/api/defalutpatient/get',
+    method: 'get',
+
+  })
+}
+
 
 
 

src/router/modules/qcd.js

@@ -224,7 +224,6 @@ export default {
       name: "weightDetails",
       meta: {
         title: "指标评估体重详情",
-        noCache: true
       }
     },
     {

src/xt_pages/qcd/indicatorControlAnalysis/analysis.vue

@@ -7,9 +7,8 @@
       <div class="page_analysis">
         <new-nav activeName="analysis"></new-nav>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
+          <!--<label class="title">-->
+          <!--</label>-->
           <div class="time">
             <ul class>
               <li

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table :data="patientsData" ref="table" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -175,7 +175,7 @@
   import { getCurrentOrgPatients } from "@/api/common/common";
 
 
-  import {GetDialysisBloodPressureChartData,GetDialysisBloodPressureTableData} from "@/api/common/statistics"
+  import {GetDialysisBloodPressureChartData,GetDialysisBloodPressureTableData,GetDefalutPatient} from "@/api/common/statistics"
 
   import {
     PostSearch
@@ -203,7 +203,7 @@
         ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -458,6 +458,7 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
             } else {
               this.loading = false
             }
@@ -488,6 +489,11 @@
         this.query.page = 1
         this.GetDialysisBloodPressureChartData(this.query)
         this.GetDialysisBloodPressureTableData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -512,9 +518,21 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+            // this.GetDefaultPatient()
           }
         })
-      },
+      },GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -28,7 +28,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -99,18 +99,6 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="姓名" align="center">
-                  <template slot-scope="scope">
-                    {{scope.row.patient.name}}
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    {{scope.row.patient.lapseto == 1 ? '留治':'转出'}}
-                  </template>
-                </el-table-column>
-
                 <el-table-column label="透前血压" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>
@@ -137,15 +125,6 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column fixed="right" label="趋势" align="center">
-                  <template slot-scope="scope">
-                    <el-button
-                      @click.native.prevent="jumpDetail(scope.row.patient.id)"
-                      type="text"
-                      size="small"
-                    >详情</el-button>
-                  </template>
-                </el-table-column>
 
               </el-table>
 
@@ -197,7 +176,7 @@ export default {
       ],
       loading: false,
       search_value: '',
-      total: '',
+      total: 0,
       query: {
         patient_id: '',
         statistics_type: 1,
@@ -298,6 +277,7 @@ export default {
             for (let i = 0; i < resp.data.data.length; i++) {
               this.tableData.push(resp.data.data[i])
             }
+            this.total = resp.data.total
           } else {
             this.loading = false
           }
@@ -379,6 +359,12 @@ export default {
       this.GetDialysisPatientBloodPressureChartData(this.query)
       this.GetDialysisBloodPressureTableData(this.query)
 
+      for (let i = 0;i < this.patientsData.length; i++){
+        if (this.patientsData[i].id == val.id){
+          this.$refs.table.setCurrentRow(this.patientsData[i])
+        }
+      }
+
     },  querySearchAsync(keyword, cb) {
       let key = ''
       if (keyword != undefined) {
@@ -398,6 +384,12 @@ export default {
         if(response.data.state == 1){
           var patients = response.data.data.patients
           this.patientsData = patients
+
+          for (let i = 0;i < this.patientsData.length; i++){
+            if (this.patientsData[i].id == this.query.patient_id){
+              this.$refs.table.setCurrentRow(this.patientsData[i])
+            }
+          }
         }
       })
     },

src/xt_pages/qcd/indicatorControlAnalysis/components/NewNav.vue

@@ -2,7 +2,7 @@
   <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
     <el-tab-pane label="化验指标统计" name="analysis"></el-tab-pane>
     <el-tab-pane label="透析过程指标统计" name="process"></el-tab-pane>
-    <el-tab-pane label="透析监测信息统计" name="monitor"></el-tab-pane>
+    <el-tab-pane label="透析监测指标统计" name="monitor"></el-tab-pane>
     <el-tab-pane label="患者血压统计" name="bloodPressure"></el-tab-pane>
     <el-tab-pane label="患者体重统计" name="weight"></el-tab-pane>
   </el-tabs>

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -92,7 +92,8 @@
 
         <el-table-column :label="item_name" align="center">
           <template slot-scope="scope">
-            {{scope.row.inspect_value}}
+            {{getValue(scope.row)}}
+
           </template>
         </el-table-column>
 
@@ -152,6 +153,7 @@
 
           }
         },
+        total:0,
         item_name: '',
         query: {
           patient_id: '',
@@ -241,6 +243,26 @@
       }
     },
     methods: {
+      getValue(row) {
+        if (this.query.range_type == 1 ) {
+          if(row.inspect_value != "") {
+            let min_range_value = this.range_value_columns[2]
+            let arr = min_range_value.split("~")
+            if (parseFloat(row.inspect_value) > arr[1]) {
+              return row.inspect_value + "↑"
+            } else if (parseFloat(row.inspect_value) < arr[0]) {
+              return row.inspect_value + "↓"
+            } else {
+              return row.inspect_value
+            }
+          }else{
+            return row.inspect_value
+          }
+
+        } else if (this.query.range_type == 2) {
+          return row.inspect_value
+        }
+      },
       getTimestamp(time) {
         // 把时间日期转成时间戳
         return new Date(time).getTime() / 1000;
@@ -437,6 +459,8 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
+              console.log(this.total)
 
             } else {
               this.$toast({

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

@@ -44,15 +44,15 @@
         ></el-option>
       </el-select>
 
-      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"
-                 @change="changeRangeValue">
-        <el-option
-          v-for="item in range_value_columns"
-          :key="item"
-          :label="item"
-          :value="item"
-        ></el-option>
-      </el-select>
+      <!--<el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"-->
+                 <!--@change="changeRangeValue">-->
+        <!--<el-option-->
+          <!--v-for="item in range_value_columns"-->
+          <!--:key="item"-->
+          <!--:label="item"-->
+          <!--:value="item"-->
+        <!--&gt;</el-option>-->
+      <!--</el-select>-->
 
       <label class="title">
         <span class="name">日期查询</span> :
@@ -88,7 +88,7 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+        <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                   highlight-current-row
                   @current-change="handleChange">
@@ -358,6 +358,12 @@
         this.GetPatientInspectionIndexBarChart(this.query)
         this.GetPatientInspectionIndexChart(this.query)
 
+        for (let i = 0; i< this.patientsData.length; i++){
+          if(this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -380,6 +386,30 @@
           if (response.data.state == 1) {
             var patients = response.data.data.patients
             this.patientsData = patients
+
+            GetDefalutPatient()
+              .then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                  this.query.patient_id =resp.data.patient.id
+                  this.patient_name  = resp.data.patient.name
+
+                  for (let i = 0; i< this.patientsData.length; i++){
+                    if(this.patientsData[i].id == resp.data.patient.id){
+                      this.$refs.table.setCurrentRow(this.patientsData[i])
+                    }
+                  }
+
+
+                  this.GetInspectionIndexInit()
+                } else {
+
+                }
+              })
+              .catch(error => {
+
+              })
+
           }
         })
       },
@@ -584,20 +614,6 @@
       var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
       this.query.end_time = year + '-' + month + '-' + day
       this.query.start_time = year + '-' + last_month + '-' + day
-      GetDefalutPatient()
-        .then(rs => {
-          var resp = rs.data
-          if (resp.state == 1) {
-            this.query.patient_id =resp.data.patient.id
-            this.patient_name  = resp.data.patient.name
-            this.GetInspectionIndexInit()
-          } else {
-
-          }
-        })
-        .catch(error => {
-
-        })
 
 
       this.getCurrentOrgPatients()

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -88,7 +88,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" v-loading="loading">
+              <el-table :data="tableData" style="width: 100%"  v-loading="loading">
                 <el-table-column fixed label="监测时间" align="center">
                   <template slot-scope="scope">
                     <!--{{getTime(scope.row.operate_time)}}-->
@@ -229,11 +229,9 @@
           }
         },
         patientsData:[],
-        tableData: [
-        ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -499,6 +497,8 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.data.total
+
             } else {
               this.loading = false
             }
@@ -537,6 +537,11 @@
         this.query.page = 1
         this.GetDialysisWatchTableData(this.query)
         this.GetDialysisWatchChartData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -561,9 +566,21 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+            this.GetDefaultPatient()
           }
         })
-      },
+      }, GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -53,7 +53,7 @@
       <el-container>
         <div style="width:150px">
           <div class="tableTitle">患者列表</div>
-          <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+          <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row
                     @current-change="handleChange">
@@ -316,6 +316,14 @@
           if (response.data.state == 1) {
             var patients = response.data.data.patients
             this.patientsData = patients
+
+
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == this.query.patient_id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+
           }
         })
       }, handleChange(val) {

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -26,7 +26,8 @@
 
             </el-form-item>
           </el-form>
-          <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
+          <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px"
+                     @change="changeProject">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -69,7 +70,8 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500"
+                      :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -84,16 +86,17 @@
           <div style="padding-left:10px;flex:1">
             <div class="tableTitle">指标趋势</div>
             <div>
-              <line-chart :options="chart" v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
+              <line-chart :options="chart"
+                          v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
               <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>
 
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData"    v-loading="loading">
-                <el-table-column  fixed label="透析日期" align="center">
+              <el-table :data="tableData" v-loading="loading">
+                <el-table-column fixed label="透析日期" align="center">
                   <template slot-scope="scope">
-                    {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
+                    {{scope.row.schedule_date | parseTime('{y}-{m}-{d}') }}
                     <!--{{getTime(scope.row.schedule_date)}}-->
                   </template>
                 </el-table-column>
@@ -118,28 +121,32 @@
 
                 <el-table-column label="透前体重" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:''}}
+                    {{
+                    scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透后体重" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.weight_after ? scope.row.assessment_after_dislysis.weight_after :''}}
+                    {{ scope.row.assessment_after_dislysis.weight_after ?
+                    scope.row.assessment_after_dislysis.weight_after :''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="目标超滤量" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.target_ultrafiltration ? scope.row.prescription.target_ultrafiltration : ''}}
+                    {{ scope.row.prescription.target_ultrafiltration ? scope.row.prescription.target_ultrafiltration :
+                    ''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="实际超滤量" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.actual_ultrafiltration ?  scope.row.assessment_after_dislysis.actual_ultrafiltration :''}}
+                    {{ scope.row.assessment_after_dislysis.actual_ultrafiltration ?
+                    scope.row.assessment_after_dislysis.actual_ultrafiltration :''}}
 
                   </template>
                 </el-table-column>
@@ -147,7 +154,11 @@
 
                 <el-table-column label="透前血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.predialysis_evaluation.systolic_blood_pressure && scope.row.predialysis_evaluation.diastolic_blood_pressure">{{ scope.row.predialysis_evaluation.systolic_blood_pressure}} / {{ scope.row.predialysis_evaluation.diastolic_blood_pressure}}</div>
+                    <div
+                      v-if="scope.row.predialysis_evaluation.systolic_blood_pressure && scope.row.predialysis_evaluation.diastolic_blood_pressure">
+                      {{ scope.row.predialysis_evaluation.systolic_blood_pressure}} / {{
+                      scope.row.predialysis_evaluation.diastolic_blood_pressure}}
+                    </div>
 
 
                   </template>
@@ -155,7 +166,11 @@
 
                 <el-table-column label="透后血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.assessment_after_dislysis.systolic_blood_pressure&&scope.row.assessment_after_dislysis.diastolic_blood_pressure">{{ scope.row.assessment_after_dislysis.systolic_blood_pressure}} / {{ scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</div>
+                    <div
+                      v-if="scope.row.assessment_after_dislysis.systolic_blood_pressure&&scope.row.assessment_after_dislysis.diastolic_blood_pressure">
+                      {{ scope.row.assessment_after_dislysis.systolic_blood_pressure}} / {{
+                      scope.row.assessment_after_dislysis.diastolic_blood_pressure}}
+                    </div>
 
 
                   </template>
@@ -164,14 +179,16 @@
 
                 <el-table-column label="透前脉率" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.predialysis_evaluation.pulse_frequency?scope.row.predialysis_evaluation.pulse_frequency:''}}
+                    {{
+                    scope.row.predialysis_evaluation.pulse_frequency?scope.row.predialysis_evaluation.pulse_frequency:''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透后脉率" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.pulse_frequency?scope.row.assessment_after_dislysis.pulse_frequency:''}}
+                    {{
+                    scope.row.assessment_after_dislysis.pulse_frequency?scope.row.assessment_after_dislysis.pulse_frequency:''}}
 
                   </template>
                 </el-table-column>
@@ -193,16 +210,15 @@
 
                 <el-table-column label="钾" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.kalium?scope.row.prescription.kalium:""}}
+                    {{ scope.row.prescription.kalium?scope.row.prescription.kalium:''}}
 
                   </template>
                 </el-table-column>
 
 
-
                 <el-table-column label="钠" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.sodium?scope.row.prescription.sodium:""}}
+                    {{ scope.row.prescription.sodium?scope.row.prescription.sodium:''}}
 
                   </template>
                 </el-table-column>
@@ -210,7 +226,7 @@
 
                 <el-table-column label="钙" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.calcium?scope.row.prescription.calcium:""}}
+                    {{ scope.row.prescription.calcium?scope.row.prescription.calcium:''}}
 
                   </template>
                 </el-table-column>
@@ -218,8 +234,10 @@
 
                 <el-table-column label="透析时长" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.dialysis_duration_hour?scope.row.prescription.dialysis_duration_hour+'小时':""}}
-                    {{ scope.row.prescription.dialysis_duration_minute?scope.row.prescription.dialysis_duration_minute+'分钟':''}}
+                    {{
+                    scope.row.prescription.dialysis_duration_hour?scope.row.prescription.dialysis_duration_hour+'小时':''}}
+                    {{
+                    scope.row.prescription.dialysis_duration_minute?scope.row.prescription.dialysis_duration_minute+'分钟':''}}
                   </template>
 
                 </el-table-column>
@@ -265,21 +283,17 @@
   import NewNav from '../indicatorControlAnalysis/components/NewNav'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import LineChart from '../../qcd/components/LineChart'
-  import { getCurrentOrgPatients } from "@/api/common/common";
+  import { getCurrentOrgPatients } from '@/api/common/common'
   import {
-    GetDefalutPatient,
+    GetDefaultPatient,
     GetDialysisProcessIndexChartData,
     GetDialysisProcessIndexTableData
   } from '@/api/common/statistics'
 
+  import { PostSearch } from '@/api/patient'
 
-
-  import {
-    PostSearch
-  } from '@/api/patient'
-
-  import { uParseTime } from "@/utils/tools";
-  import { getDataConfig } from "@/utils/data";
+  import { uParseTime } from '@/utils/tools'
+  import { getDataConfig } from '@/utils/data'
 
   export default {
     components: {
@@ -291,16 +305,16 @@
       return {
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
-            return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            return time.getTime() > Date.now() || time.getTime() < threeMonths
+
           }
         },
-        patientsData:[],
-        tableData: [
-        ],
+        patientsData: [],
+        tableData: [],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -326,7 +340,6 @@
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],
-        tableData: [],
         tableData1: [],
         chart: {
           title: {
@@ -470,35 +483,35 @@
     },
     methods: {
 
-      changeProject(val){
+      changeProject(val) {
         this.query.statistics_type = val
         this.query.page = 1
         this.GetDialysisProcessIndexChartData(this.query)
         // this.GetDialysisProcessIndexTableData(this.query)
 
       },
-      handleChange(val){
+      handleChange(val) {
         this.query.patient_id = val.id
         this.query.page = 1
         this.GetDialysisProcessIndexTableData(this.query)
         this.GetDialysisProcessIndexChartData(this.query)
       },
       handleSizeChange(limit) {
-        this.query.limit = limit;
+        this.query.limit = limit
 
       },
       handleCurrentChange(page) {
-        this.query.page = page;
+        this.query.page = page
 
       },
       changeTime(val) {
-        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)
         if (time > 0) {
-          this.$message.error("结束时间不能小于开始时间");
-          this.query.start_time = "";
+          this.$message.error('结束时间不能小于开始时间')
+          this.query.start_time = ''
         } else {
           // this.getDialysisList()
-          this.query.page = 1;
+          this.query.page = 1
           this.GetDialysisProcessIndexChartData(this.query)
           this.GetDialysisProcessIndexTableData(this.query)
 
@@ -507,12 +520,12 @@
       },
       changeEndTime(val) {
         var time =
-          this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time)
         if (time < 0) {
-          this.$message.error("结束时间不能小于开始时间");
-          this.query.end_time = "";
+          this.$message.error('结束时间不能小于开始时间')
+          this.query.end_time = ''
         } else {
-          this.query.page = 1;
+          this.query.page = 1
           this.GetDialysisProcessIndexChartData(this.query)
           this.GetDialysisProcessIndexTableData(this.query)
 
@@ -520,23 +533,23 @@
       },
       getTimestamp(time) {
         // 把时间日期转成时间戳
-        return new Date(time).getTime() / 1000;
+        return new Date(time).getTime() / 1000
       },
       QueryOperaById: function(val) {
-        let vascular_access_desc_name = "";
+        let vascular_access_desc_name = ''
         let vascular_access_desc = getDataConfig(
-          "hemodialysis",
-          "vascular_access_desc"
-        );
+          'hemodialysis',
+          'vascular_access_desc'
+        )
         for (let i = 0; i < vascular_access_desc.length; i++) {
           if (vascular_access_desc[i].id == val) {
-            vascular_access_desc_name = vascular_access_desc[i].name;
+            vascular_access_desc_name = vascular_access_desc[i].name
           }
         }
 
-        return vascular_access_desc_name;
+        return vascular_access_desc_name
       },
-      GetAnticoagulantById: function (val) {
+      GetAnticoagulantById: function(val) {
         let anticoagulan_name = ''
         var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
         let anticoagulant = anticoagulantsConfitTwo
@@ -547,8 +560,8 @@
         }
         return anticoagulan_name
       },
-      getModeName(mode_id){
-        return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
+      getModeName(mode_id) {
+        return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name : ''
       }, GetDialysisProcessIndexTableData(params) {
         this.loading = true
         this.tableData = []
@@ -561,6 +574,7 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
             } else {
               this.loading = false
             }
@@ -584,8 +598,6 @@
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
               } else {
-                console.log("1111111")
-                console.log(this.query.statistics_type)
 
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.bar.xAxis.data.push(resp.data.data[i].name)
@@ -604,6 +616,13 @@
         this.GetDialysisProcessIndexChartData(this.query)
         this.GetDialysisProcessIndexTableData(this.query)
 
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
+
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -622,14 +641,27 @@
       },
       chooseWay(way) {
         this.wayType = way
-      }, getCurrentOrgPatients(){
-        getCurrentOrgPatients().then(response=>{
-          if(response.data.state == 1){
+      }, getCurrentOrgPatients() {
+        getCurrentOrgPatients().then(response => {
+          if (response.data.state == 1) {
             var patients = response.data.data.patients
             this.patientsData = patients
+            this.GetDefaultPatient()
           }
         })
-      },
+      }, GetDefaultPatient() {
+        GetDefaultPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -138,7 +138,7 @@
 
                 <el-table-column label="体重增加" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{scope.row.weight_before - scope.row.last_after_weight}}</div>
+                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{(scope.row.weight_before - scope.row.last_after_weight).toFixed(1)}}</div>
 
                     <!--{{scope.row.weight_before - scope.row.last_after_weight}}-->
                     <!--<div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>-->
@@ -184,7 +184,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import LineChart from '../../qcd/components/LineChart'
   import { getCurrentOrgPatients } from "@/api/common/common";
-  import {GetDialysisWeightChartData,GetDialysisWeightTableData} from "@/api/common/statistics"
+  import {GetDialysisWeightChartData,GetDialysisWeightTableData,GetDefalutPatient} from "@/api/common/statistics"
 
   import {
     PostSearch
@@ -212,7 +212,7 @@
         ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -469,6 +469,8 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
+
             } else {
               this.loading = false
             }
@@ -499,6 +501,11 @@
         this.query.page = 1
         this.GetDialysisWeightChartData(this.query)
         this.GetDialysisWeightTableData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -523,9 +530,16 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+
           }
         })
-      },
+      },GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -29,7 +29,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -142,7 +142,7 @@
 
                 <el-table-column label="体重增加" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{scope.row.weight_before - scope.row.last_after_weight}}</div>
+                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{(scope.row.weight_before - scope.row.last_after_weight).toFixed(1)}}</div>
 
                     <!--{{scope.row.weight_before - scope.row.last_after_weight}}-->
                     <!--<div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>-->
@@ -196,11 +196,10 @@ export default {
         }
       },
       patientsData:[],
-      tableData: [
-      ],
+      tableData: [],
       loading: false,
       search_value: '',
-      total: '',
+      total: 0,
       query: {
         patient_id: '',
         statistics_type: 1,
@@ -326,16 +325,16 @@ export default {
       return new Date(time).getTime() / 1000;
     },GetDialysisWeightTableData(params) {
       this.loading = true
-      this.tableData = []
       GetDialysisWeightTableData(params)
         .then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
             this.loading = false
-
+            this.tableData = []
             for (let i = 0; i < resp.data.data.length; i++) {
               this.tableData.push(resp.data.data[i])
             }
+            this.total = resp.data.total
           } else {
             this.loading = false
           }
@@ -366,6 +365,11 @@ export default {
       this.query.page = 1
       this.GetDialysisPatientWeightChartData(this.query)
       this.GetDialysisWeightTableData(this.query)
+      for (let i = 0;i < this.patientsData.length; i++){
+        if (this.patientsData[i].id == val.id){
+          this.$refs.table.setCurrentRow(this.patientsData[i])
+        }
+      }
 
     },
     querySearchAsync(keyword, cb) {
@@ -387,6 +391,12 @@ export default {
         if(response.data.state == 1){
           var patients = response.data.data.patients
           this.patientsData = patients
+          for (let i = 0;i < this.patientsData.length; i++){
+            if (this.patientsData[i].id == this.query.patient_id){
+              this.$refs.table.setCurrentRow(this.patientsData[i])
+            }
+          }
+
         }
       })
     },

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -207,7 +207,7 @@
           { path: false, name: "工作量分析统计" },
           { path: false, name: "医生" }
         ],
-        activeName: "first",
+        activeName: "second",
         listQuery: {
           start_time: "",
           end_time: "",