1

package-lock.json

@@ -3515,9 +3515,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
-      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz",
+      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

package.json

@@ -46,7 +46,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.13.0",
+    "element-ui": "^2.13.2",
     "file-saver": "^1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/router/modules/qcd.js

@@ -240,25 +240,25 @@ export default {
       }
     },
     {
-      path: '/qcd/workAnalysis/doctor',
-      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
+      path: '/qcd/workAnalysis/index',
+      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
       name: 'workAnalysisDoctor',
       meta: {
         title: '工作量分析统计',
         noCache: true
       }
     },
-    {
-      path: '/qcd/workAnalysis/nurse',
-      hidden: true,
-      is_menu: false,
-      component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
-      name: 'workAnalysisNurse',
-      meta: {
-        title: '工作量分析统计护士',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/qcd/workAnalysis/nurse',
+    //   hidden: true,
+    //   is_menu: false,
+    //   component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
+    //   name: 'workAnalysisNurse',
+    //   meta: {
+    //     title: '工作量分析统计护士',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,

src/xt_pages/data/druguseTemplate.vue

@@ -1531,8 +1531,9 @@
         const params = {
           'data': this.adviceTableData
         }
-        this.form.name =  encodeURIComponent(this.form.name)
-        postAdviceTemplate(params, this.form.name, this.form.advice_type).then(response => {
+        // this.form.name =  encodeURIComponent(this.form.name)
+        let name = encodeURIComponent(this.form.name)
+        postAdviceTemplate(params, name, this.form.advice_type).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -2532,7 +2533,7 @@
           }
         })
 
-      }
+      },
     }
   }
 </script>

src/xt_pages/dialysis/details/index.vue

@@ -623,7 +623,8 @@ export default {
       treat_state: [
         { value: 0, label: '全部治疗' },
         { value: 1, label: '待开处方' },
-        { value: 2, label: '待开小结' }
+        { value: 2, label: '待开小结' },
+        { value: 3, label: '待医嘱核对' },
       ],
       treatStateVal: 0,
       schedule_options: [
@@ -1296,6 +1297,28 @@ export default {
             }
           }
           arr2 = arr
+        } else if(this.treatStateVal == 3){
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if(arr[i].schedules[j].doctor_advice.length == 0){
+                arr[i].schedules.splice(j--, 1)
+              }
+              if(arr[i].schedules && arr[i].schedules[j] && arr[i].schedules[j].doctor_advice){
+                let sign = 0
+                arr[i].schedules[j].doctor_advice.map(item => {
+                  if(item.check_state == 1){
+                    sign++
+                  }
+                })
+                if(sign == arr[i].schedules[j].doctor_advice.length && arr[i].schedules[j].doctor_advice.length > 0){
+                  arr[i].schedules.splice(j--, 1)
+                }
+              }
+            }
+          }
+          arr2 = arr
         }
 
         let arr3 = []
@@ -1437,6 +1460,29 @@ export default {
             }
           }
           arr2 = arr
+        } else if(this.treatStateVal == 3){
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              console.log(77777777777,arr[i].schedules)
+              if(arr[i].schedules[j].doctor_advice.length == 0){
+                arr[i].schedules.splice(j--, 1)
+              }
+              if(arr[i].schedules && arr[i].schedules[j] && arr[i].schedules[j].doctor_advice){
+                let sign = 0
+                arr[i].schedules[j].doctor_advice.map(item => {
+                  if(item.check_state == 1){
+                    sign++
+                  }
+                })
+                if(sign == arr[i].schedules[j].doctor_advice.length && arr[i].schedules[j].doctor_advice.length > 0){
+                  arr[i].schedules.splice(j--, 1)
+                }
+              }
+            }
+          }
+          arr2 = arr
         }
 
         let arr3 = []

src/xt_pages/dialysis/schedualPatient.vue

@@ -163,6 +163,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           {value: 0,label: '全部'},
           {value: 1,label: '待开处方'},
           {value: 2,label: '待开小结'},
+          {value: 3,label: '待医嘱核对'},
         ],
         treatStateVal: 0,
         allPatient:[]
@@ -514,6 +515,28 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
           }
           arr2 = arr
+        }else if(this.treatStateVal == 3){
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if(arr[i].schedules[j].doctor_advice.length == 0){
+                arr[i].schedules.splice(j--, 1)
+              }
+              if(arr[i].schedules && arr[i].schedules[j] && arr[i].schedules[j].doctor_advice){
+                let sign = 0
+                arr[i].schedules[j].doctor_advice.map(item => {
+                  if(item.check_state == 1){
+                    sign++
+                  }
+                })
+                if(sign == arr[i].schedules[j].doctor_advice.length && arr[i].schedules[j].doctor_advice.length > 0){
+                  arr[i].schedules.splice(j--, 1)
+                }
+              }
+            }
+          }
+          arr2 = arr
         }
 
 

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -1,14 +1,5 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div class="page_workAnalysis">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="医生" name="first"></el-tab-pane>
-          <el-tab-pane label="护士" name="second"></el-tab-pane>
-        </el-tabs>
+  <div>
         <div class="cell clearfix">
           <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:10px"               @change="changeDoctor"
           >
@@ -32,11 +23,20 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <label class="title">
+            <span class="name">月份查询</span> :
+          </label>
+          <el-date-picker
+            @change='changeMonth'
+            v-model="monthValue"
+            type="month"
+            placeholder="选择月">
+          </el-date-picker>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="query.start_time"
+            v-model="start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
@@ -50,7 +50,7 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="query.end_time"
+            v-model="end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
@@ -113,12 +113,11 @@
           </el-table>
 
         </div>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
@@ -152,7 +151,9 @@ export default {
         limit:20,
         page:1,
       },
-
+      start_time:'',
+      end_time:'',
+      monthValue:'',
 
       doctor_options:[
         {id:0,user_name:"全部",admin_user_id:0}
@@ -354,6 +355,7 @@ export default {
       return new Date(time).getTime() / 1000;
     },
     changeTime(val) {
+      this.query.end_time = ''
       var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
       if (time > 0) {
         this.$message.error("结束时间不能小于开始时间");
@@ -361,6 +363,11 @@ export default {
       } else {
         // this.getDialysisList()
         this.query.page = 1;
+        this.query.start_time = val
+        this.query.end_time = this.end_time
+        this.monthValue = ''
+        sessionStorage.setItem("doctor_start_time", val)
+        sessionStorage.removeItem("doctorMonth");
         this.GetDoctorWorkloadChartData(this.query)
         this.GetDoctorWorkloadTableData(this.query)
 
@@ -411,7 +418,12 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.query.end_time = "";
       } else {
+        this.query.start_time = this.start_time
+        this.query.end_time = val
+        this.monthValue = ''
         this.query.page = 1;
+        sessionStorage.setItem("doctor_end_time", val)
+        sessionStorage.removeItem("doctorMonth");
         this.GetDoctorWorkloadChartData(this.query)
         this.GetDoctorWorkloadTableData(this.query)
 
@@ -430,7 +442,41 @@ export default {
         var dataZoom_end = 100;
         this.bar.dataZoom[0].end = dataZoom_end
       }
-    }
+    },
+    changeMonth(value){
+      sessionStorage.removeItem("doctor_start_time");
+      sessionStorage.removeItem("doctor_end_time");
+      let monthStartTime = value.getTime() / 1000
+      var nowDate = new Date(value);
+      var cloneNowDate = new Date(value);
+      var fullYear = nowDate.getFullYear();
+      var month = nowDate.getMonth() + 1; // getMonth 方法返回 0-11，代表1-12月
+      var endOfMonth = new Date(fullYear, month, 0).getDate(); // 获取本月最后一天
+      let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
+      this.query.start_time = moment(new Date(monthStartTime * 1000)).format('YYYY-MM-DD')
+      this.query.end_time = moment(new Date(monthEndTime)).format('YYYY-MM-DD')
+      this.end_time = ''
+      this.start_time = ''
+      sessionStorage.setItem("doctorMonth", monthStartTime);
+      this.GetDoctorWorkloadChartData(this.query)
+      this.GetDoctorWorkloadTableData(this.query)
+    },
+    getFullDate(targetDate) {
+      var D, y, m, d;
+      if (targetDate) {
+        D = new Date(targetDate);
+        y = D.getFullYear();
+        m = D.getMonth() + 1;
+        d = D.getDate();
+      } else {
+        y = fullYear;
+        m = month;
+        d = date;
+      }
+      m = m > 9 ? m : '0' + m;
+      d = d > 9 ? d : '0' + d;
+      return y + '-' + m + '-' + d;
+    },
   },created(){
     var date = new Date()
     var year = date.getFullYear() //获取完整的年份(4位)
@@ -441,6 +487,38 @@ export default {
     this.query.end_time = year + '-' + month + '-' + day
     this.query.start_time = year + '-' + last_month + '-' + day
     this.query.statistics_type = 1
+
+    this.start_time = this.query.start_time
+    this.end_time = this.query.end_time
+
+
+    if(sessionStorage.getItem("doctor_start_time") == null){
+      sessionStorage.setItem("doctor_start_time", this.start_time);
+    }else{
+      this.start_time = sessionStorage.getItem("doctor_start_time")
+      this.query.start_time = sessionStorage.getItem("doctor_start_time")
+    }
+    if(sessionStorage.getItem("doctor_end_time") == null){
+      sessionStorage.setItem("doctor_end_time", this.end_time);
+    }else{
+      this.end_time = sessionStorage.getItem("doctor_end_time")
+      this.query.end_time = sessionStorage.getItem("doctor_end_time")
+    }
+    if(sessionStorage.getItem("doctorMonth") != null){
+      let value = parseInt(sessionStorage.getItem("doctorMonth")) * 1000
+      let monthStartTime = new Date(value)
+      this.monthValue = monthStartTime
+      var nowDate = new Date(value);
+      var cloneNowDate = new Date(value);
+      var fullYear = nowDate.getFullYear();
+      var month = nowDate.getMonth() + 1; // getMonth 方法返回 0-11，代表1-12月
+      var endOfMonth = new Date(fullYear, month, 0).getDate(); // 获取本月最后一天
+      let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
+      this.query.start_time = moment(new Date(monthStartTime)).format('YYYY-MM-DD')
+      this.query.end_time = moment(new Date(monthEndTime)).format('YYYY-MM-DD')
+      this.start_time = ''
+      this.end_time = ''
+    }
     this.GetAllDoctor()
     this.GetDoctorWorkloadChartData(this.query)
     this.GetDoctorWorkloadTableData(this.query)

src/xt_pages/qcd/workAnalysis/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="page_workAnalysis">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="医生" name="first">
+              <doctor v-if="activeName == 'first'"></doctor>
+          </el-tab-pane>
+          <el-tab-pane label="护士" name="second">
+              <nurse v-if="activeName == 'second'"></nurse>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import doctor from './doctor'
+import nurse from './nurse'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+    components:{
+        doctor,
+        nurse,
+        BreadCrumb
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: "质控管理" },
+                { path: false, name: "工作量分析统计" }
+            ],
+            activeName:'first'
+        }
+    }
+}
+</script>

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -1,14 +1,5 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div class="page_workAnalysis">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="医生" name="first"></el-tab-pane>
-          <el-tab-pane label="护士" name="second"></el-tab-pane>
-        </el-tabs>
+    <div>
         <div class="cell clearfix">
           <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:10px"               @change="changeNurse"
           >
@@ -32,11 +23,20 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <label class="title">
+            <span class="name">月份查询</span> :
+          </label>
+          <el-date-picker
+            @change='changeMonth'
+            v-model="monthValue"
+            type="month"
+            placeholder="选择月">
+          </el-date-picker>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="query.start_time"
+            v-model="start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
@@ -50,7 +50,7 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="query.end_time"
+            v-model="end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
@@ -148,13 +148,11 @@
               </template>
             </el-table-column>
           </el-table>
-
-        </div>
-      </div>
     </div>
   </div>
 </template>
 <script>
+  const moment = require('moment')
   import echarts from "echarts";
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
   import LineChart from "../../qcd/components/LineChart";
@@ -187,6 +185,9 @@
           limit:20,
           page:1,
         },
+        start_time:'',
+        end_time:'',
+        monthValue:'',
         nurse_options:[
           {id:0,user_name:"全部",admin_user_id:0}
         ],
@@ -383,13 +384,20 @@
         return new Date(time).getTime() / 1000;
       },
       changeTime(val) {
+        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 = "";
         } else {
           // this.getDialysisList()
+          console.log(val)
           this.query.page = 1;
+          this.query.start_time = val
+          this.query.end_time = this.end_time
+          this.monthValue = ''
+          sessionStorage.setItem("nurse_start_time", val)
+          sessionStorage.removeItem("nurseMonth");
           this.GetNurseWorkloadChartData(this.query)
           this.GetNurseWorkloadTableData(this.query)
 
@@ -433,7 +441,12 @@
           this.$message.error("结束时间不能小于开始时间");
           this.query.end_time = "";
         } else {
+          this.query.start_time = this.start_time
+          this.query.end_time = val
+          this.monthValue = ''
           this.query.page = 1;
+          sessionStorage.setItem("nurse_end_time", val)
+          sessionStorage.removeItem("nurseMonth");
           this.GetNurseWorkloadChartData(this.query)
           this.GetNurseWorkloadTableData(this.query)
 
@@ -452,7 +465,42 @@
           var dataZoom_end = 100;
           this.bar.dataZoom[0].end = dataZoom_end
         }
-      }
+      },
+      changeMonth(value){
+        // console.log('monthStartTime',value.getTime() / 1000)
+        sessionStorage.removeItem("nurse_start_time");
+        sessionStorage.removeItem("nurse_end_time");
+        let monthStartTime = value.getTime() / 1000
+        var nowDate = new Date(value);
+        var cloneNowDate = new Date(value);
+        var fullYear = nowDate.getFullYear();
+        var month = nowDate.getMonth() + 1; // getMonth 方法返回 0-11，代表1-12月
+        var endOfMonth = new Date(fullYear, month, 0).getDate(); // 获取本月最后一天
+        let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
+        this.query.start_time = moment(new Date(monthStartTime * 1000)).format('YYYY-MM-DD')
+        this.query.end_time = moment(new Date(monthEndTime)).format('YYYY-MM-DD')
+        this.end_time = ''
+        this.start_time = ''
+        sessionStorage.setItem("nurseMonth", monthStartTime);
+        this.GetNurseWorkloadChartData(this.query)
+        this.GetNurseWorkloadTableData(this.query)
+      },
+      getFullDate(targetDate) {
+        var D, y, m, d;
+        if (targetDate) {
+          D = new Date(targetDate);
+          y = D.getFullYear();
+          m = D.getMonth() + 1;
+          d = D.getDate();
+        } else {
+          y = fullYear;
+          m = month;
+          d = date;
+        }
+        m = m > 9 ? m : '0' + m;
+        d = d > 9 ? d : '0' + d;
+        return y + '-' + m + '-' + d;
+      },
     },created(){
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
@@ -463,6 +511,40 @@
       this.query.end_time = year + '-' + month + '-' + day
       this.query.start_time = year + '-' + last_month + '-' + day
       this.query.statistics_type = 1
+      
+      this.start_time = year + '-' + last_month + '-' + day
+      this.end_time = year + '-' + month + '-' + day
+
+      if(sessionStorage.getItem("nurse_start_time") == null){
+        sessionStorage.setItem("nurse_start_time", this.start_time);
+      }else{
+        this.start_time = sessionStorage.getItem("nurse_start_time")
+        this.query.start_time = sessionStorage.getItem("nurse_start_time")
+      }
+      if(sessionStorage.getItem("nurse_end_time") == null){
+        sessionStorage.setItem("nurse_end_time", this.end_time);
+      }else{
+        this.end_time = sessionStorage.getItem("nurse_end_time")
+        this.query.end_time = sessionStorage.getItem("nurse_end_time")
+      }
+      if(sessionStorage.getItem("nurseMonth") != null){
+        console.log("tjos")
+        let value = parseInt(sessionStorage.getItem("nurseMonth")) * 1000
+        let monthStartTime = new Date(value)
+        this.monthValue = monthStartTime
+        var nowDate = new Date(value);
+        var cloneNowDate = new Date(value);
+        var fullYear = nowDate.getFullYear();
+        var month = nowDate.getMonth() + 1; // getMonth 方法返回 0-11，代表1-12月
+        var endOfMonth = new Date(fullYear, month, 0).getDate(); // 获取本月最后一天
+        let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
+        this.query.start_time = moment(new Date(monthStartTime)).format('YYYY-MM-DD')
+        this.query.end_time = moment(new Date(monthEndTime)).format('YYYY-MM-DD')
+        this.start_time = ''
+        this.end_time = ''
+      }
+      // console.log('this.query2',this.query)
+      
       this.GetAllNurse()
       this.GetNurseWorkloadChartData(this.query)
       this.GetNurseWorkloadTableData(this.query)