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

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -69,6 +69,8 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
+
             <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
@@ -193,6 +195,7 @@
     data() {
       return {
         percent:[],
+        patient_name:'',
 
         pickerOptions: {
           disabledDate(time) {
@@ -399,6 +402,8 @@
       handleChange(val){
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name =val.name
+
         this.GetDialysisBloodPressureTableData(this.query)
         // this.GetDialysisBloodPressureChartData(this.query)
       },
@@ -516,6 +521,7 @@
       handleSelect(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name =val.name
         this.GetDialysisBloodPressureChartData(this.query)
         this.GetDialysisBloodPressureTableData(this.query)
         for (let i = 0;i < this.patientsData.length; i++){
@@ -554,8 +560,10 @@
         GetDefalutPatient().then(response => {
           if (response.data.state == 1) {
             var patient = response.data.data.patient
+            this.patient_name = patient.name
             for (let i = 0;i < this.patientsData.length; i++){
               if (this.patientsData[i].id == patient.id){
+
                 this.$refs.table.setCurrentRow(this.patientsData[i])
               }
             }

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -29,6 +29,8 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
+
             <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
@@ -177,6 +179,7 @@ export default {
       ],
       loading: false,
       search_value: '',
+      patient_name:'',
       total: 0,
       query: {
         patient_id: '',
@@ -313,6 +316,7 @@ export default {
     },
     handleChange(val){
       this.query.patient_id = val.id
+      this.patient_name = val.name
       this.query.page = 1
       this.GetDialysisBloodPressureTableData(this.query)
       this.GetDialysisPatientBloodPressureChartData(this.query)

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

@@ -184,7 +184,7 @@
             left: 0
           },
           xAxis: {
-            data: ['达标', '未达标']
+            data: []
           },
           yAxis: {
             axisLabel: {
@@ -197,7 +197,7 @@
             {
               name: '',
               type: 'bar',
-              data: ['78.57', '50'],
+              data: [],
               barWidth: 30,
               label: {
                 normal: {

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

@@ -87,7 +87,8 @@
     </div>
     <el-container>
       <div style="width:150px">
-        <div class="tableTitle">患者列表</div>
+
+        <div class="tableTitle">患者列表  <div class="tableTitle">当前患者:{{patient_name}}</div></div>
         <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
@@ -150,6 +151,7 @@
 
           }
         },
+        patient_name:'',
         item_name: '',
         search_value: '',
         query: {
@@ -379,12 +381,14 @@
       handleChange(val){
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetPatientInspectionIndexBarChart(this.query)
         this.GetPatientInspectionIndexChart(this.query)
       },
       handleSelect(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetPatientInspectionIndexBarChart(this.query)
         this.GetPatientInspectionIndexChart(this.query)
 

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -69,6 +69,8 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
+
             <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
@@ -228,6 +230,7 @@
             return time.getTime() > Date.now() || time.getTime() < threeMonths;;
           }
         },
+        patient_name:'',
         patientsData:[],
         loading: false,
         search_value: '',
@@ -429,6 +432,7 @@
       handleChange(val){
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetDialysisWatchTableData(this.query)
         this.GetDialysisWatchChartData(this.query)
       },
@@ -545,6 +549,7 @@
       handleSelect(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetDialysisWatchTableData(this.query)
         this.GetDialysisWatchChartData(this.query)
         for (let i = 0;i < this.patientsData.length; i++){
@@ -585,6 +590,7 @@
             var patient = response.data.data.patient
             for (let i = 0;i < this.patientsData.length; i++){
               if (this.patientsData[i].id == patient.id){
+                this.patient_name = this.patientsData[i].name
                 this.$refs.table.setCurrentRow(this.patientsData[i])
               }
             }

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -53,6 +53,8 @@
       <el-container>
         <div style="width:150px">
           <div class="tableTitle">患者列表</div>
+          <div class="tableTitle">当前患者: {{patient_name}}</div>
+
           <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
@@ -107,6 +109,7 @@
     data() {
       return {
         custom_chart_data_color: [],
+        patient_name:"",
         options2: {
           title: {
             text: 'ECharts 入门示例'
@@ -317,9 +320,9 @@
             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.patient_name = this.patientsData[i].name
                 this.$refs.table.setCurrentRow(this.patientsData[i])
               }
             }
@@ -329,6 +332,7 @@
       }, handleChange(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetPatientInspectionIndexChart(this.query)
       }, changeTime(val) {
         var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -69,7 +69,10 @@
         </div>
         <el-container>
           <div style="width:150px">
+
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
+
             <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'}"
@@ -310,6 +313,7 @@
 
           }
         },
+        patient_name:'',
         percent:[],
         patientsData: [],
         tableData: [],
@@ -532,6 +536,7 @@
       handleChange(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
         this.GetDialysisProcessIndexTableData(this.query)
         this.GetDialysisProcessIndexChartData(this.query)
       },
@@ -664,6 +669,8 @@
       handleSelect(val) {
         this.query.patient_id = val.id
         this.query.page = 1
+        this.patient_name = val.name
+
         this.GetDialysisProcessIndexChartData(this.query)
         this.GetDialysisProcessIndexTableData(this.query)
 
@@ -706,6 +713,7 @@
             var patient = response.data.data.patient
             for (let i = 0;i < this.patientsData.length; i++){
               if (this.patientsData[i].id == patient.id){
+                this.patient_name = this.patientsData[i].name
                 this.$refs.table.setCurrentRow(this.patientsData[i])
               }
             }

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -68,7 +68,10 @@
         </div>
         <el-container>
           <div style="width:150px">
+
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
+
             <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
@@ -214,7 +217,9 @@
         loading: false,
         search_value: '',
         total: 0,
+        patient_name:'',
         query: {
+
           patient_id: '',
           statistics_type: 1,
           start_time: '',
@@ -411,6 +416,7 @@
         this.query.page = 1
         this.GetDialysisWeightTableData(this.query)
         this.GetDialysisWeightChartData(this.query)
+        this.patient_name = val.name
       },
       handleSizeChange(limit) {
         this.query.limit = limit;
@@ -531,6 +537,7 @@
         this.GetDialysisWeightTableData(this.query)
         for (let i = 0;i < this.patientsData.length; i++){
           if (this.patientsData[i].id == val.id){
+            this.patient_name = this.patientsData[i].name
             this.$refs.table.setCurrentRow(this.patientsData[i])
           }
         }
@@ -558,13 +565,15 @@
           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
+            this.patient_name = this.patientsData[i].name
+
           }
         })
       }

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -30,6 +30,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
+            <div class="tableTitle">当前患者: {{patient_name}}</div>
             <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
@@ -201,6 +202,7 @@ export default {
       loading: false,
       search_value: '',
       total: 0,
+      patient_name:'',
       query: {
         patient_id: '',
         statistics_type: 1,
@@ -299,6 +301,7 @@ export default {
 
     },
     handleChange(val){
+      this.patient_name = val.name
       this.query.patient_id = val.id
       this.query.page = 1
       this.GetDialysisWeightTableData(this.query)
@@ -387,6 +390,7 @@ export default {
     handleSelect(val) {
       this.query.patient_id = val.id
       this.query.page = 1
+      this.patient_name = val.name
       this.GetDialysisPatientWeightChartData(this.query)
       this.GetDialysisWeightTableData(this.query)
       for (let i = 0;i < this.patientsData.length; i++){
@@ -417,6 +421,7 @@ export default {
           this.patientsData = patients
           for (let i = 0;i < this.patientsData.length; i++){
             if (this.patientsData[i].id == this.query.patient_id){
+              this.patient_name = this.patientsData[i].name
               this.$refs.table.setCurrentRow(this.patientsData[i])
             }
           }

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -145,7 +145,7 @@ export default {
       loading: false,
       total: '',
       query: {
-        admin_user_id: "",
+        admin_user_id: 0,
         statistics_type: 1,
         start_time: "",
         end_time: "",
@@ -154,7 +154,10 @@ export default {
       },
 
 
-      doctor_options:[],
+      doctor_options:[
+        {id:0,user_name:"全部",admin_user_id:0}
+
+      ],
       project_options:[
         {value:1, name:"治疗"},
         {value:2, name:"病程记录"},
@@ -278,6 +281,7 @@ export default {
       this.query.admin_user_id = val
       this.query.page = 1
       this.GetDoctorWorkloadTableData(this.query)
+      this.GetDoctorWorkloadChartData(this.query)
 
     },
     GetAllDoctor(){
@@ -319,9 +323,24 @@ export default {
           var resp = rs.data
           if (resp.state == 1) {
             this.loading = false
+            let total_cure = 0
+            let total_rescue = 0
+            let total_course = 0
+
             for (let i = 0; i < resp.data.data.length; i++) {
+              total_cure = total_cure + resp.data.data[i].p_count
+              total_rescue = total_rescue + resp.data.data[i].rescue_count
+              total_course = total_course + resp.data.data[i].course_count
               this.tableData.push(resp.data.data[i])
             }
+
+            this.tableData.push( {
+              user_name:"合计",
+              p_count:total_cure,
+              course_count:total_course,
+              rescue_count:total_rescue
+            })
+
           } else {
             this.loading = false
           }
@@ -351,6 +370,8 @@ export default {
 
       this.bar.xAxis.data = []
       this.bar.series[0].data = []
+      this.percent = []
+
       GetDoctorWorkloadChartData(params)
         .then(rs => {
           var resp = rs.data

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -180,16 +180,16 @@
         loading: false,
         total: '',
         query: {
-          admin_user_id: "",
+          admin_user_id: 0,
           statistics_type: 1,
           start_time: "",
           end_time: "",
           limit:20,
           page:1,
         },
-
-
-        nurse_options:[],
+        nurse_options:[
+          {id:0,user_name:"全部",admin_user_id:0}
+        ],
         project_options:[
           {value:1, name:"治疗"},
           {value:2, name:"穿刺"},
@@ -312,6 +312,7 @@
       changeNurse(val){
         this.query.admin_user_id = val
         this.query.page = 1
+        this.GetNurseWorkloadChartData(this.query)
         this.GetNurseWorkloadTableData(this.query)
 
       },
@@ -353,10 +354,22 @@
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
+              let total_cure = 0
+              let total_puncture = 0
+              let total_mission = 0
               this.loading = false
               for (let i = 0; i < resp.data.data.length; i++) {
+                total_cure = total_cure + resp.data.data[i].cure_count
+                total_puncture = total_puncture + resp.data.data[i].puncture_count
+                total_mission = total_mission + resp.data.data[i].mission_count
                 this.tableData.push(resp.data.data[i])
               }
+              this.tableData.push( {
+                user_name:"合计",
+                cure_count:total_cure,
+                puncture_count:total_puncture,
+                mission_count:total_mission
+              })
             } else {
               this.loading = false
             }
@@ -386,6 +399,7 @@
 
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
         GetNurseWorkloadChartData(params)
           .then(rs => {
             var resp = rs.data