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

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -116,13 +116,13 @@
 
                 <el-table-column label="透析中最低血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.min_monitor.diastolic_blood_pressure">{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透析中最高血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}}</div>
 
 
                   </template>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -107,13 +107,13 @@
 
                 <el-table-column label="透析中最低血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.min_monitor.diastolic_blood_pressure">{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透析中最高血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}}</div>
 
 
                   </template>

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -243,7 +243,7 @@
         },
         stateType: 1,
         month: [
-          { value: 1, label: '本月', state: 1 },
+          { value: 1, label: '近一个月', state: 1 },
           { value: 2, label: '近三个月', state: 2 },
           { value: 3, label: '近半年', state: 3 },
           { value: 4, label: '近一年', state: 4 },