添加医嘱提醒功能

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/pages/layout/SideBar.vue

@@ -4,7 +4,8 @@
         <div class="head"><img :src="$store.getters.user.org.org_logo" alt=""></div>
         <ul class="sidebar">
             <li :class="active_index == 0 ? 'active' : ''">
-                <router-link to="/main"><span class="iconfont">&#xe6e6;</span><p>记录</p></router-link>
+                <router-link to="/main"> <span class="iconfont">&#xe6e6;</span><p>记录</p></router-link>
+              <span class="redpoint" v-if="total_read_dot">{{total_read_dot > 99?total_read_dot+'+':total_read_dot}}</span>
             </li>
              <li :class="active_index == 1 ? 'active' : ''">
                 <router-link to="/monitoring"><span class="iconfont">&#xe6f5;</span><p>监控</p></router-link>
@@ -14,7 +15,7 @@
             </li>
              <li :class="active_index == 3 ? 'active' : ''">
                 <router-link to="/my"><span class="iconfont">&#xe715;</span><p>我的</p></router-link>
-            </li> 
+            </li>
         </ul>
        </div>
     </div>
@@ -27,12 +28,30 @@ export default {
     active_index: {
       type: Number,
       default: 0
+    },
+    total_read_dot:{
+      type: Number,
+      default: 0
     }
   }
 };
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
+  .redpoint{
+  display:inline-block;
+  height:16px;
+  width:16px;
+  line-height:16px;
+  text-align:center;
+  font-size:0.1em;
+  border-radius:16px;
+  color:#fff;
+  background:red;
+  position: relative;
+  top: -8px;
+  right: 8px;
+  }
 .sideColumn {
   float: left;
   width: 1.58rem;

src/pages/main/DialysisArea.vue

@@ -85,6 +85,7 @@ export default {
   },
   data() {
     return {
+      timer:null,
       selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
       schedual_types: [
         { value: 0, text: "全部班", select: true },
@@ -192,6 +193,15 @@ export default {
   created() {
     this.requestDialysisScheduals();
   },
+  mounted(){
+  this.timer =   window.setInterval(() => {
+      setTimeout(this.requestDialysisScheduals(), 0)
+    }, 30000)
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
+  },
   methods: {
     handletimeType: function(index) {
       this.sch_type_options_visible = false;
@@ -329,6 +339,7 @@ export default {
     display: inline-block;
   }
 }
+
 </style>
 
 <style>

src/pages/main/PatientBox.vue

@@ -1,21 +1,28 @@
 <template>
   <div>
-    <div class="patient" :class="borderColor(patient)" v-for="(patient, index) in patients" :key="index" @click="detailAction(patient)">
+    <div class="patient" :class="borderColor(patient)" v-for="(patient, index) in patients" :key="index"
+         @click="detailAction(patient)">
       <!-- <router-link :to="{path:'/details',  query: {patient_id: patient.patient_id, date: patient.schedule_date}}"> -->
-        <div class="kehu">
-          <div class="tx">
-            <img :src="patient.patient.avatar.length > 0 ? patient.patient.avatar : '../../assets/product/test.jpg'" alt="">
-            <div class="right">
-               <h3 class="name">{{patient.patient.name}}<span class="yc" v-show="isAbnormal(patient)">异常</span></h3>
-               <span class="num">{{ genderText(patient) }} | {{ age(patient) }}岁</span>
-               <!-- 性别、年龄 -->
-            </div>
-          </div>
-          <div class="online" v-show="computeState(patient) != 4" >
-            <p :class="stateColor(patient)">{{stateText(patient)}}</p>
-            <!-- <span class="time">剩余时间 : 90:08</span>     -->
+      <div class="kehu">
+
+        <div class="tx">
+            <img :src="patient.patient.avatar.length > 0 ? patient.patient.avatar : '../../assets/product/test.jpg'"
+                 alt="">
+            <span class="redpoint" v-if="getStatus(patient)">{{getUnReadNum(patient) > 99?getUnReadNum(patient)+"+":getUnReadNum(patient)}}
+           </span>
+          <div class="right">
+            <h3 class="name">{{patient.patient.name}}<span class="yc" v-show="isAbnormal(patient)">异常</span></h3>
+            <span class="num">{{ genderText(patient) }} | {{ age(patient) }}岁</span>
+            <!-- 性别、年龄 -->
+
           </div>
         </div>
+        <div class="online" v-show="computeState(patient) != 4">
+          <p :class="stateColor(patient)">{{stateText(patient)}}</p>
+          <!-- <span class="time">剩余时间 : 90:08</span>     -->
+        </div>
+
+      </div>
       <!-- </router-link> -->
       <div class="function" :class="functionColor(patient)">
         <ul>
@@ -29,266 +36,318 @@
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { jsGetAge } from '@/utils/tools'
+  import {parseTime} from '@/utils'
+  import {jsGetAge} from '@/utils/tools'
 
-export default {
-  name: "PatientBox",
-  props: {
-    patients: Array
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    stateColor: function(schedual) {
-      var state = this.computeState(schedual);
-      if (state == 1) {
-        return "blue";
-      } else if (state == 2) {
-        return "gray";
-      } else if (state == 3) {
-        return "red";
-      } else {
-        return "blue";
-      }
-    },
-    functionColor: function(schedual) {
-      var state = this.computeState(schedual);
-      if (state == 1 || state == 3) {
-        return "blue";
-      } else if (state == 2) {
-        return "gray";
-      } else {
-        return "blue";
-      }
-    },
-    borderColor: function(schedual) {
-      var yc = this.isAbnormal(schedual);
-      if (yc == true) {
-        return "red";
-      } else {
-        return "gray";
-      }
+  export default {
+    name: 'PatientBox',
+    props: {
+      patients: Array
     },
-    stateText: function(schedual) {
-      var state = this.computeState(schedual);
-      if (state == 1) {
-        return "已上机";
-      } else if (state == 2) {
-        return "已下机";
-      } else if (state == 3) {
-        return "监测中";
-      } else {
-        // return schedual.patient.gender == 1 ? "男" : "女"
-        return "未上机";
-      }
-    },
-    computeState: function(schedual) {
-      if (schedual.dialysis_order == null) {
-        // 未上机
-        return 4;
-      } else if (schedual.dialysis_order.stage == 2) {
-        // 已下机
-        return 2;
-      } else if (
-        schedual.dialysis_order.stage == 1 &&
-        schedual.monitoring_records != null &&
-        schedual.monitoring_records.length > 1
-      ) {
-        // 监测中
-        return 3;
-      } else {
-        return 1;
-      }
+    data () {
+      return {}
     },
+    methods: {
+      getUnReadNum: function (schedual) {
+        if (schedual.doctor_advice != null) {
+          let doctorAdvice = []
+          for (let i = 0; i < schedual.doctor_advice.length; i++) {
+            if (schedual.doctor_advice[i].execution_state == 2) {
+              doctorAdvice.push(schedual.doctor_advice[i])
+            }
+          }
+          const sorted = this.groupBy(doctorAdvice, function (item) {
+            return [item.groupno]
+          })
+          return sorted.length
+        }
+      },
+      getStatus: function (schedual) {
+        var isShowDot = false
+        if (schedual.doctor_advice != null) {
+          for (let i = 0; i < schedual.doctor_advice.length; i++) {
+            if (schedual.doctor_advice[i].execution_state == 2) {
+              isShowDot = true
+            }
+          }
+          return isShowDot
 
-    orderState: function(schedual) {
-      if (schedual.dialysis_order == null) {
-        // 未上机
-        return 4;
-      } else if (schedual.dialysis_order.stage == 2) {
-        // 已下机
-        return 2;
-      } else if (
-        schedual.dialysis_order.stage == 1 &&
-        schedual.monitoring_records != null &&
-        schedual.monitoring_records.length > 1
-      ) {
-        // 监测中
-        return 3;
-      } else {
-        return 1;
-      }
-    },
-    isAbnormal: function(schedual) {
-      return false; // schedual.yc;
-    },
-    timeTypeText: function(schedual) {
-      if (schedual.schedule_type == 1) {
-        return "上午";
-      } else if (schedual.schedule_type == 2) {
-        return "下午";
-      } else {
-        return "晚上";
-      }
-    },
-    genderText: function(schedual) {
-      if (schedual.patient.gender == 0) {
-        return "未知";
-      } else if (schedual.patient.gender == 1) {
-        return "男";
-      } else {
-        return "女";
-      }
-    },
-    age: function(schedual) {
-      if(schedual.patient.age == 0){
+        } else {
+          return false
+        }
+      },
+      stateColor: function (schedual) {
+        var state = this.computeState(schedual)
+        if (state == 1) {
+          return 'blue'
+        } else if (state == 2) {
+          return 'gray'
+        } else if (state == 3) {
+          return 'red'
+        } else {
+          return 'blue'
+        }
+      },
+      functionColor: function (schedual) {
+        var state = this.computeState(schedual)
+        if (state == 1 || state == 3) {
+          return 'blue'
+        } else if (state == 2) {
+          return 'gray'
+        } else {
+          return 'blue'
+        }
+      },
+      borderColor: function (schedual) {
+        var yc = this.isAbnormal(schedual)
+        if (yc == true) {
+          return 'red'
+        } else {
+          return 'gray'
+        }
+      },
+      stateText: function (schedual) {
+        var state = this.computeState(schedual)
+        if (state == 1) {
+          return '已上机'
+        } else if (state == 2) {
+          return '已下机'
+        } else if (state == 3) {
+          return '监测中'
+        } else {
+          // return schedual.patient.gender == 1 ? "男" : "女"
+          return '未上机'
+        }
+      },
+      computeState: function (schedual) {
+        if (schedual.dialysis_order == null) {
+          // 未上机
+          return 4
+        } else if (schedual.dialysis_order.stage == 2) {
+          // 已下机
+          return 2
+        } else if (
+          schedual.dialysis_order.stage == 1 &&
+          schedual.monitoring_records != null &&
+          schedual.monitoring_records.length > 1
+        ) {
+          // 监测中
+          return 3
+        } else {
+          return 1
+        }
+      },
 
-        return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
+      orderState: function (schedual) {
+        if (schedual.dialysis_order == null) {
+          // 未上机
+          return 4
+        } else if (schedual.dialysis_order.stage == 2) {
+          // 已下机
+          return 2
+        } else if (
+          schedual.dialysis_order.stage == 1 &&
+          schedual.monitoring_records != null &&
+          schedual.monitoring_records.length > 1
+        ) {
+          // 监测中
+          return 3
+        } else {
+          return 1
+        }
+      },
+      isAbnormal: function (schedual) {
+        return false // schedual.yc;
+      },
+      timeTypeText: function (schedual) {
+        if (schedual.schedule_type == 1) {
+          return '上午'
+        } else if (schedual.schedule_type == 2) {
+          return '下午'
+        } else {
+          return '晚上'
+        }
+      },
+      genderText: function (schedual) {
+        if (schedual.patient.gender == 0) {
+          return '未知'
+        } else if (schedual.patient.gender == 1) {
+          return '男'
+        } else {
+          return '女'
+        }
+      },
+      age: function (schedual) {
+        if (schedual.patient.age == 0) {
 
-      }else{
+          return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
 
-        return schedual.patient.age
-      }
+        } else {
 
-      // var now = new Date();
-      // var nowYear = parseTime(now, "{y}");
-      // var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
-      // // console.log(nowYear)
-      // // console.log(birthdayYear)
-      // return nowYear - birthdayYear;
-    },
-    detailAction: function(schedual) {
-      var patient_id = schedual.patient_id;
-      var date = schedual.schedule_date;
-      this.$router.push({
-        path: "/details",
-        query: {
-          patient_id: patient_id,
-          date: date,
-          patient_name: schedual.patient.name
+          return schedual.patient.age
         }
-      });
+
+        // var now = new Date();
+        // var nowYear = parseTime(now, "{y}");
+        // var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
+        // // console.log(nowYear)
+        // // console.log(birthdayYear)
+        // return nowYear - birthdayYear;
+      }, groupBy (array, f) {
+        const groups = {}
+        array.forEach(function (o) {
+          const group = JSON.stringify(f(o))
+          groups[group] = groups[group] || []
+          groups[group].push(o)
+        })
+        return Object.keys(groups).map(function (group) {
+          return groups[group]
+        })
+      },
+      detailAction: function (schedual) {
+        var patient_id = schedual.patient_id
+        var date = schedual.schedule_date
+        this.$router.push({
+          path: '/details',
+          query: {
+            patient_id: patient_id,
+            date: date,
+            patient_name: schedual.patient.name
+          }
+        })
+      }
     }
   }
-};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.patient {
+  .patient {
   border: 1px #e5e5ee solid;
   padding: 0.33rem 0;
   width: 47%;
   margin: 0 3% 0.5rem 0;
   float: left;
   .function {
-    padding: 0.3rem 0.32rem 0 0.32rem;
-    color: #7b8a97;
-    ul {
-      @include display-flex;
-      @include align-items-center;
-      @include text-align;
-      @include justify-content-between;
-      li {
-        font-size: 0.3rem;
-        @include display-flex;
-        @include align-items-center;
-        .iconfont {
-          margin: 0 0.1rem 0 0;
-          font-size: 0.4rem;
-        }
-      }
-    }
+  padding: 0.3rem 0.32rem 0 0.32rem;
+  color: #7b8a97;
+  ul {
+  @include display-flex;
+  @include align-items-center;
+  @include text-align;
+  @include justify-content-between;
+  li {
+  font-size: 0.3rem;
+  @include display-flex;
+  @include align-items-center;
+  .iconfont {
+  margin: 0 0.1rem 0 0;
+  font-size: 0.4rem;
+  }
+  }
+  }
   }
   .blue {
-    color: $main-color;
-    .iconfont {
-      color: $main-color;
-    }
+  color: $main-color;
+  .iconfont {
+  color: $main-color;
+  }
   }
   .kehu {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-between;
-    border-bottom: 1px #e5e5e5 solid;
-    padding: 0 0 0.3rem 0.32rem;
-    .tx {
-      @include display-flex;
-      @include align-items-center;
-      img {
-        width: 1rem;
-        height: 1rem;
-        border-radius: 50%;
-        float: left;
-        margin: 0 0.3rem 0 0;
-      }
-      .right {
-        float: left;
-        text-align: left;
-        .name {
-          font-size: 0.34rem;
-          color: $title-color;
-          font-weight: 600;
-          margin-bottom: 0.1rem;
-          .yc {
-            background: #ff7979;
-            color: #fff;
-            height: 0.38rem;
-            line-height: 0.38rem;
-            font-size: 0.24rem;
-            width: 0.74rem;
-            border-radius: 4px;
-            display: inline-block;
-            text-align: center;
-            margin-left: 0.13rem;
-          }
-        }
-        .num {
-          font-size: 0.3rem;
-        }
-      }
-    }
+  @include display-flex;
+  @include align-items-center;
+  @include text-align;
+  @include justify-content-between;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0 0.3rem 0.32rem;
+  .tx {
+  @include display-flex;
+  @include align-items-center;
+  img {
+  width: 1rem;
+  height: 1rem;
+  border-radius: 50%;
+  float: left;
+  margin: 0 0.3rem 0 0;
+  }
+  .right {
+  float: left;
+  text-align: left;
+  .name {
+  font-size: 0.34rem;
+  color: $title-color;
+  font-weight: 600;
+  margin-bottom: 0.1rem;
+  .yc {
+  background: #ff7979;
+  color: #fff;
+  height: 0.38rem;
+  line-height: 0.38rem;
+  font-size: 0.24rem;
+  width: 0.74rem;
+  border-radius: 4px;
+  display: inline-block;
+  text-align: center;
+  margin-left: 0.13rem;
+  }
+  }
+  .num {
+  font-size: 0.3rem;
+  }
+  }
+  }
 
-    .online {
-      text-align: center;
-      width: 50%;
-      border-left: 1px #e5e5e5 solid;
-      p {
-        background: #c6cdd2;
-        color: #fff;
-        width: 1.35rem;
-        height: 0.56rem;
-        line-height: 0.56rem;
-        border-radius: 4px;
-        margin: 0 auto;
-        font-size: 0.32rem;
-      }
-      .blue {
-        background: $main-color;
-      }
-      .red {
-        background: #f18f68;
-      }
-      .green {
-        background: #5bd18b;
-      }
-      .gray {
-        background: #a8b3ba;
-      }
-      .lightGray {
-        background: #c6cdd2;
-      }
-      .time {
-        font-size: 0.26rem;
-        color: #34495e;
-      }
-    }
+  .online {
+  text-align: center;
+  width: 50%;
+  border-left: 1px #e5e5e5 solid;
+  p {
+  background: #c6cdd2;
+  color: #fff;
+  width: 1.35rem;
+  height: 0.56rem;
+  line-height: 0.56rem;
+  border-radius: 4px;
+  margin: 0 auto;
+  font-size: 0.32rem;
+  }
+  .blue {
+  background: $main-color;
   }
-}
-.red {
+  .red {
+  background: #f18f68;
+  }
+  .green {
+  background: #5bd18b;
+  }
+  .gray {
+  background: #a8b3ba;
+  }
+  .lightGray {
+  background: #c6cdd2;
+  }
+  .time {
+  font-size: 0.26rem;
+  color: #34495e;
+  }
+  }
+  }
+  }
+  .red {
   border: 1px #ff7979 solid;
-}
+  }
+  .redpoint{
+  display:inline-block;
+  height:16px;
+  width:16px;
+  line-height:16px;
+  text-align:center;
+  font-size:0.1em;
+  border-radius:16px;
+  color:#fff;
+  background:red;
+  position: relative;
+  top: -8px;
+  right: 8px;
+  }
 </style>
 

src/pages/main/RecordPage.vue

@@ -1,5 +1,5 @@
 <template>
-<div>
+  <div>
     <van-row class="top_row">
       <van-col :span="9">
         <div>
@@ -8,9 +8,16 @@
       </van-col>
       <van-col :span="6">
         <div class="department">
-            <ul>
-                <li v-for="(item,i) in ['候诊室','透析区']" :key="i" :class="index == i? 'active':'' " @click="ClickTab(i)" >{{item}}</li> 
-            </ul>
+          <ul>
+            <li :class="index == 0? 'active':'' " @click="ClickTab(0)">
+              {{'候诊区'}}
+              <span class="redpoint" v-if="un_read_wait_num">{{un_read_wait_num > 99 ? un_read_wait_num+'+':un_read_wait_num}}</span>
+            </li>
+            <li :class="index == 1? 'active':'' " @click="ClickTab(1)">
+              {{'透析区'}}
+              <span class="redpoint" v-if="un_read_dialysis_num">{{un_read_dialysis_num > 99 ? un_read_dialysis_num+'+':un_read_dialysis_num}}</span>
+            </li>
+          </ul>
         </div>
       </van-col>
       <van-col :span="9">
@@ -20,7 +27,8 @@
         <div class="search">
           <van-field v-model="search_input" ref="search_field" placeholder="透析号/姓名" class="field">
             <i class="iconfont" slot="left-icon">&#xe741;</i>
-            <van-button slot="button" size="small" type="info" style="border: none;" @click="searchWithKeyword">搜索</van-button>
+            <van-button slot="button" size="small" type="info" style="border: none;" @click="searchWithKeyword">搜索
+            </van-button>
           </van-field>
         </div>
       </van-col>
@@ -32,7 +40,7 @@
         </div>
         <div class="department">
             <ul>
-                <li v-for="(item,i) in ['候诊室','透析区']" :key="i" :class="index == i? 'active':'' " @click="ClickTab(i)" >{{item}}</li> 
+                <li v-for="(item,i) in ['候诊室','透析区']" :key="i" :class="index == i? 'active':'' " @click="ClickTab(i)" >{{item}}</li>
             </ul>
         </div>
         <div class="search">
@@ -44,98 +52,121 @@
         <van-button size="small" type="info">临时排班</van-button>
     </div> -->
     <div class="area">
-       <waiting-area v-show="index==0" title="候诊区" :search_keyword="search_keyword"></waiting-area>
-       <dialysis-area v-show="index==1" title="透析区" :search_keyword="search_keyword" @clear_search_keyword="clearKeyword"></dialysis-area>
+      <waiting-area v-show="index==0" title="候诊区" :search_keyword="search_keyword"></waiting-area>
+      <dialysis-area v-show="index==1" title="透析区" :search_keyword="search_keyword"
+                     @clear_search_keyword="clearKeyword"></dialysis-area>
     </div>
-    
-</div>  
+
+  </div>
 </template>
 
 
 <script>
-import DialysisArea from "./DialysisArea";
-import WaitingArea from "./WaitingArea";
-import { Popover } from "vux";
-export default {
-  name: "RecordPage",
-  data() {
-    return {
-      index: 1,
-      search_input: "",
-      search_keyword: ""
-      // yyList: [
-      //   {
-      //     value: "0",
-      //     name: "济南医院"
-      //   },
-      //   {
-      //     value: "1",
-      //     name: "血透中心"
-      //   }
-      // ]
-    };
-  },
-  components: {
-    DialysisArea,
-    WaitingArea,
-    Popover
-    // Group,
-    // Cell
-  },
-  methods: {
-    ClickTab: function(tabIndex) {
-      this.index = tabIndex;
+  import DialysisArea from './DialysisArea'
+  import WaitingArea from './WaitingArea'
+  import {Popover} from 'vux'
+  import {getDialysisScheduals, getWaitingScheduals} from '@/api/dialysis'
+  import {parseTime} from '@/utils/index'
+
+  export default {
+    name: 'RecordPage',
+    props: {
+      un_read_wait_num: {
+        type: Number,
+      },
+      un_read_dialysis_num: {
+        type: Number,
+      }
     },
-    searchWithKeyword: function() {
-      this.$refs.search_field.blur();
-      this.search_keyword = this.search_input;
+    data () {
+      return {
+        index: 1,
+        search_input: '',
+        search_keyword: '',
+        scheduals: [],
+        advice_groups:[],
+        unReadWaitNum:0,
+        unReadDialysisNum:0,
+
+      }
+    },
+    components: {
+      DialysisArea,
+      WaitingArea,
+      Popover
+      // Group,
+      // Cell
     },
-    clearKeyword: function() {
-      this.search_input = "";
-      this.search_keyword = "";
+
+    methods: {
+      ClickTab: function (tabIndex) {
+        this.index = tabIndex
+      },
+      searchWithKeyword: function () {
+        this.$refs.search_field.blur()
+        this.search_keyword = this.search_input
+      },
+      clearKeyword: function () {
+        this.search_input = ''
+        this.search_keyword = ''
+      },
     }
   }
-};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.top_row {
+  .top_row {
   font-size: 0.3rem;
   padding: 0.3rem 0.3rem;
   border-bottom: 1px #e5e5e5 solid;
   display: flex;
   align-items: center;
-}
-.title {
+  }
+  .title {
   font-size: 0.34rem;
   font-weight: 600;
   color: $title-color;
-}
-.department {
+  }
+  .department {
   text-align: center;
   ul {
-    li {
-      float: left;
-      font-size: 0.36rem;
-      margin: 0 0.2rem;
-      height: 0.64rem;
-      line-height: 0.64rem;
-      padding: 0 0.3rem;
-      color: $title-color;
-      &.active {
-        background: $main-color;
-        color: #fff;
-        border-radius: 30px;
-      }
-    }
+  li {
+  float: left;
+  font-size: 0.36rem;
+  margin: 0 0.2rem;
+  height: 0.64rem;
+  line-height: 0.64rem;
+  padding: 0 0.3rem;
+  color: $title-color;
+  &.active {
+  background: $main-color;
+  color: #fff;
+  border-radius: 30px;
+  }
+  }
+  }
   }
-}
 
-.add_schedule_btn {
+  .add_schedule_btn {
   margin-left: 10px;
   float: right;
   background-color: #ff7978;
   border: none;
-}
+  }
+
+  .redpoint{
+  display:inline-block;
+  height:16px;
+  width:16px;
+  line-height:16px;
+  text-align:center;
+  font-size:0.1em;
+  border-radius:16px;
+  color:#fff;
+  background:red;
+  position: relative;
+  top: -8px;
+  right: 8px;
+  }
 </style>
 

src/pages/main/WaitingArea.vue

@@ -16,7 +16,7 @@
           </div>
         </el-popover>
 
-         <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)" 
+         <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)"
         :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}</li>
       </ul>
     </div>
@@ -127,6 +127,20 @@ export default {
   created() {
     this.requestScheduals();
   },
+  mounted(){
+    this.timer =   window.setInterval(() => {
+      setTimeout(this.requestScheduals(), 0)
+    }, 30000)
+
+
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
+    // this.$once('hook:beforeDestroy', () => {
+    //   clearInterval(this.timer);
+    // })
+  },
   methods: {
     menuTabClick: function(tabIndex) {
       this.select_index = tabIndex;
@@ -139,6 +153,7 @@ export default {
     },
 
     requestScheduals() {
+
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
       getWaitingScheduals({ date: date }).then(rs => {
         var resp = rs.data;

src/pages/main/index.vue

@@ -1,84 +1,207 @@
 <template>
-<div class="mainBox">
-    <side-bar :active_index="0"></side-bar>
+
+  <div class="mainBox">
+    <div>
+    <side-bar :active_index="0" :total_read_dot="readNum"></side-bar>
     <div class="mainContent">
-      <record-page></record-page>
+      <record-page :un_read_wait_num="unReadWaitNum" :un_read_dialysis_num="unReadDialysisNum"></record-page>
+    </div>
     </div>
-</div>  
-</template>   
+
+  </div>
+</template>
 
 
 <script>
-import RecordPage from "./RecordPage";
-import SideBar from "@/pages/layout/SideBar"
-export default {
-  name: "Main",
-  components: {
-    RecordPage,
-    SideBar,
-  },
-  
-};
-</script>
+  import RecordPage from './RecordPage'
+  import SideBar from '@/pages/layout/SideBar'
+  import {getDialysisScheduals, getWaitingScheduals} from '@/api/dialysis'
+  import {parseTime} from '@/utils/index'
 
-<style style="stylesheet/scss" lang="scss"   scoped>
-html,
-body {
-  height: 100%;
-}
-.mainBox {
-  height: 100%;
-  font-size:0.3rem;
-  .sideColumn {
-    .column {
-      .head {
-        @include display-flex;
-        @include align-items-center;
-        @include flex-direction;
-        @include text-align;
-        @include justify-content-center;
-        margin: 0.5rem 0 0.5rem 0;  
-        img {
-          width: 100%;
-          height: 100%;
-          border-radius: 0.5rem;
-          width: 0.7rem;
-          height: 0.7rem;
-        }
+  export default {
+    name: 'Main',
+    data () {
+      return {
+        timer:null,
+        scheduals: [],
+        advice_groups: [],
+        unReadWaitNum: 0,
+        unReadDialysisNum: 0,
       }
-      .sidebar {
-        @include display-flex;
-        @include align-items-center;
-        @include flex-direction;
-        @include text-align;
-        padding: 0;
-        li {
-          padding:  0 0 0.8rem 0;
-          a {
-            color: #a8b3ba;
-            display: inline-block;
-            padding: 0;
-            margin: 0;
-            p {
-              font-size: 0.24rem;
-              margin-top: 0.2rem;
-            }
-            .iconfont {
-              font-size: 0.5rem;
-              display: inline-block;
+    },
+    components: {
+      RecordPage,
+      SideBar,
+    },
+    created () {
+      this.requestScheduals()
+      this.requestDialysisScheduals()
+
+    },
+    methods: {
+
+      requestScheduals () {
+        var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
+        getWaitingScheduals({date: date}).then(rs => {
+          var resp = rs.data
+          // console.log(resp);
+          if (resp.state == 1) {
+            var scheduals = resp.data.scheduals
+            this.scheduals = scheduals
+            console.log(this.scheduals)
+            let doctorAdvice = []
+            for (let i = 0; i < this.scheduals.length; i++) {
+              for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
+                if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                  doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                }
+              }
             }
+
+            const sorted = this.groupBy(doctorAdvice, function (item) {
+              return [item.groupno]
+            })
+
+            this.unReadWaitNum = sorted.length
+
+          } else {
+            this.$toast({
+              message: resp.msg
+            })
           }
-          &.active {
-            a {
-              color: #409eff;
+        })
+      },
+      requestDialysisScheduals () {
+        var date = this.$store.getters.app.dialysis_area.schedule_date
+        var type = 0
+        getDialysisScheduals({type: type, date: parseTime(date, '{y}-{m}-{d}')})
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              var scheduals = resp.data.scheduals
+              let doctorAdvice = []
+              for (let index = 0; index < scheduals.length; index++) {
+                const schedual = scheduals[index]
+                if (schedual.dialysis_order == null) {
+                  continue
+                }
+                for (let y = 0; y < schedual.doctor_advice.length; y++) {
+                  if (schedual.doctor_advice[y].execution_state == 2) {
+                    doctorAdvice.push(schedual.doctor_advice[y])
+                  }
+                }
+              }
+
+              const sorted = this.groupBy(doctorAdvice, function (item) {
+                return [item.groupno]
+              })
+
+              this.unReadDialysisNum = sorted.length
+
+            } else {
+              this.$toast({
+                message: resp.msg
+              })
             }
-          }
-        }
+          })
+          .catch(v => {
+          })
+      }, groupBy (array, f) {
+        const groups = {}
+        array.forEach(function (o) {
+          const group = JSON.stringify(f(o))
+          groups[group] = groups[group] || []
+          groups[group].push(o)
+        })
+        return Object.keys(groups).map(function (group) {
+          return groups[group]
+        })
+      },getData(){
+        console.log("111111")
+        this.requestScheduals()
+        this.requestDialysisScheduals()
       }
-    }
+
+    },
+    computed: {
+      readNum: function () {
+        return this.unReadWaitNum + this.unReadDialysisNum
+
+      }
+
+    }, mounted(){
+      this.timer =   window.setInterval(() => {
+        setTimeout(this.getData(), 0)
+      }, 30000)
+
+
+    },beforeDestroy() {
+      clearInterval(this.timer);
+      this.timer = null;
+    },
+
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  html,
+  body {
+  height: 100%;
+  }
+  .mainBox {
+  height: 100%;
+  font-size:0.3rem;
+  .sideColumn {
+  .column {
+  .head {
+  @include display-flex;
+  @include align-items-center;
+  @include flex-direction;
+  @include text-align;
+  @include justify-content-center;
+  margin: 0.5rem 0 0.5rem 0;
+  img {
+  width: 100%;
+  height: 100%;
+  border-radius: 0.5rem;
+  width: 0.7rem;
+  height: 0.7rem;
+  }
+  }
+  .sidebar {
+  @include display-flex;
+  @include align-items-center;
+  @include flex-direction;
+  @include text-align;
+  padding: 0;
+  li {
+  padding: 0 0 0.8rem 0;
+  a {
+  color: #a8b3ba;
+  display: inline-block;
+  padding: 0;
+  margin: 0;
+  p {
+  font-size: 0.24rem;
+  margin-top: 0.2rem;
   }
-}
-.mainContent{
+  .iconfont {
+  font-size: 0.5rem;
+  display: inline-block;
+  }
+  }
+  &.active {
+  a {
+  color: #409eff;
+  }
+  }
+  }
+  }
+  }
+  }
+  }
+  .mainContent{
   margin: 0 0 0 1.58rem;
-}
-</style>
+  }
+
+</style>

src/pages/main/today/TodayTab.vue

@@ -18,7 +18,10 @@
           </li>
           <li @click="menuClick(4)">
             <img src="@/assets/record/5.png">
+            <span class="redpoint" v-if="getUnReadNum()">{{getUnReadNum()}}
+           </span>
             <p>临时医嘱</p>
+
           </li>
           <li @click="menuClick(5)">
             <img src="@/assets/record/6.png">
@@ -992,6 +995,30 @@ export default {
     },
     destroyed() {
       window.removeEventListener("scroll", this.handleScroll);
+    },getUnReadNum(){
+        let doctorAdvice = []
+        for (let y = 0; y <  this.doctor_advices.length;y++) {
+          if (this.doctor_advices[y].execution_state == 2) {
+            doctorAdvice.push(this.doctor_advices[y])
+          }
+        }
+      const sorted = this.groupBy(doctorAdvice, function (item) {
+        return [item.groupno];
+      });
+
+      return sorted.length
+
+
+    }, groupBy (array, f) {
+      const groups = {}
+      array.forEach(function (o) {
+        const group = JSON.stringify(f(o))
+        groups[group] = groups[group] || []
+        groups[group].push(o)
+      })
+      return Object.keys(groups).map(function (group) {
+        return groups[group]
+      })
     }
   }
 };
@@ -1038,5 +1065,19 @@ export default {
     font-size: 20px!important;
   }
 }
+  .redpoint{
+  display:inline-block;
+  height:16px;
+  width:16px;
+  line-height:16px;
+  text-align:center;
+  font-size:0.1em;
+  border-radius:16px;
+  color:#fff;
+  background:red;
+  position: relative;
+  top: -8px;
+  right: 8px;
+  }
 </style>
 

src/pages/main/today/assessmentBefore.vue

@@ -14,6 +14,13 @@
           <span class="content">{{ systolic_blood_pressure?systolic_blood_pressure:''}}</span>
           <span class="unit">{{ systolic_blood_pressure?'mmHg':''}}</span>
         </li>
+
+        <li>
+          <label>舒张压 : </label>
+          <span class="content">{{ diastolic_blood_pressure?diastolic_blood_pressure:''}}</span>
+          <span class="unit">{{ diastolic_blood_pressure?'mmHg':''}}</span>
+        </li>
+
         <li>
           <label>前次透析后: </label>
           <span class="content">{{ last_post_dialysis}}</span>

src/pages/waitingRoom/components/data_list.vue

@@ -1,122 +1,125 @@
 <template>
   <div>
-    <div class="data" v-for="schedual in scheduals" :value="schedual.id" :key="schedual.id" @click="detailAction(schedual)">
-     <!-- <router-link to="/details"> -->
-        <div class="name">
-            <span>{{schedual.patient.name}}</span>
-            <span>{{schedual.treatment_mode.name}}</span>
-        </div>
-        <div class="state" :class="stateColor(schedual)">
-            <span>{{stateText(schedual)}}</span>
-            <span> | </span>
-            <span>{{schedual.device_number.number}}</span>
-        </div>
-     <!-- </router-link>  -->
+    <div class="data" v-for="schedual in scheduals" :value="schedual.id" :key="schedual.id"
+         @click="detailAction(schedual)">
+      <!-- <router-link to="/details"> -->
+
+      <div class="name">
+        <span>{{schedual.patient.name}}</span>
+        <span>{{schedual.treatment_mode.name}}</span>
+      </div>
+      <div class="state" :class="stateColor(schedual)">
+        <span>{{stateText(schedual)}}</span>
+        <span> | </span>
+        <span>{{schedual.device_number.number}}</span>
+
+        <span v-if="schedual.doc"></span>
+
+      </div>
+      <!-- </router-link>  -->
     </div>
   </div>
 </template>
 
 <script>
-export default {
-  name: "DataList",
-  data() {
-    return {
-      
-    };
-  },
-
-  props: {
-    scheduals: {
-      require: true,
-      type: Array,
-    }
-  },
-
-  methods:{
-    stateColor: function(schedual) {
-      var state = this.computeState(schedual)
-      if (state == 1) {
-        return "blue";
-      } else if (state == 2) {
-        return "gray";
-      } else if (state == 3) {
-        return "green";
-      } else {
-        return "blue";
-      }
+  export default {
+    name: 'DataList',
+    data () {
+      return {}
     },
-    stateText: function(schedual) {
-      var state = this.computeState(schedual)
-      if (state == 1) {
-        return "已上机";
-      } else if (state == 2) {
-        return "已下机";
-      } else if (state == 3) {
-        return "监测中";
-      } else {
-        return schedual.patient.gender == 1 ? "男" : "女"
-        // return "未上机";
+
+    props: {
+      scheduals: {
+        require: true,
+        type: Array,
       }
     },
-    computeState: function(schedual) {
-      if (schedual.dialysis_order == null) { // 未上机
-        return 4
-      } else if (schedual.dialysis_order.stage == 2) { // 已下机
-        return 2
-      } else if (schedual.dialysis_order.stage == 1 && schedual.monitoring_records != null && schedual.monitoring_records.length > 1) { // 监测中
-        return 3
-      } else {
-        return 1
+
+    methods: {
+      stateColor: function (schedual) {
+        var state = this.computeState(schedual)
+        if (state == 1) {
+          return 'blue'
+        } else if (state == 2) {
+          return 'gray'
+        } else if (state == 3) {
+          return 'green'
+        } else {
+          return 'blue'
+        }
+      },
+      stateText: function (schedual) {
+        var state = this.computeState(schedual)
+        if (state == 1) {
+          return '已上机'
+        } else if (state == 2) {
+          return '已下机'
+        } else if (state == 3) {
+          return '监测中'
+        } else {
+          return schedual.patient.gender == 1 ? '男' : '女'
+          // return "未上机";
+        }
+      },
+      computeState: function (schedual) {
+        if (schedual.dialysis_order == null) { // 未上机
+          return 4
+        } else if (schedual.dialysis_order.stage == 2) { // 已下机
+          return 2
+        } else if (schedual.dialysis_order.stage == 1 && schedual.monitoring_records != null && schedual.monitoring_records.length > 1) { // 监测中
+          return 3
+        } else {
+          return 1
+        }
+      },
+      detailAction: function (schedual) {
+        // console.log(schedual)
+        var patient_id = schedual.patient.id
+        var date = schedual.schedule_date
+        this.$router.push({path: '/details', query: {patient_id: patient_id, date: date}})
       }
-    },
-    detailAction: function(schedual) {
-      // console.log(schedual)
-      var patient_id = schedual.patient.id
-      var date = schedual.schedule_date
-      this.$router.push({ path: "/details", query: {patient_id: patient_id, date: date}})
     }
   }
-};
 </script>
 
-<style style="stylesheet/scss" lang="scss"  scoped>
- .data {
-      width: 3.32rem;
-      margin: 0 0 0.3rem 0.42rem;
-      float: left;
-      border-radius: 5px;
-      text-align: center;
-      font-size: 0.34rem;
-      background: $base-color;
-      .name {
-        font-size: 0.34rem;
-        padding: 0.55rem 0 0.4rem 0;
-        line-height: 0.5rem;
-        color: $pgh-color;
-        span {
-          display: block;
-        }
-      }
-      .state {
-        font-size: 0.28rem;
-        // background: $font-color;
-        height: 0.8rem;
-        line-height: 0.8rem;
-        color: $text-color;
-        border-radius: 0 0 5px 5px;
-      }
-      .blue {
-        background: $main-color;
-      }
-      .green {
-        background: #5bd18b;
-      }
-      .gray {
-        background: #a8b3ba;
-      }
-      .lightGray {
-        background: #c6cdd2;
-      }
-    }
+<style style="stylesheet/scss" lang="scss" scoped>
+  .data {
+  width: 3.32rem;
+  margin: 0 0 0.3rem 0.42rem;
+  float: left;
+  border-radius: 5px;
+  text-align: center;
+  font-size: 0.34rem;
+  background: $base-color;
+  .name {
+  font-size: 0.34rem;
+  padding: 0.55rem 0 0.4rem 0;
+  line-height: 0.5rem;
+  color: $pgh-color;
+  span {
+  display: block;
+  }
+  }
+  .state {
+  font-size: 0.28rem;
+  // background: $font-color;
+  height: 0.8rem;
+  line-height: 0.8rem;
+  color: $text-color;
+  border-radius: 0 0 5px 5px;
+  }
+  .blue {
+  background: $main-color;
+  }
+  .green {
+  background: #5bd18b;
+  }
+  .gray {
+  background: #a8b3ba;
+  }
+  .lightGray {
+  background: #c6cdd2;
+  }
+  }
 </style>
 

src/pages/waitingRoom/components/waitingcontent.vue

@@ -34,7 +34,7 @@ export default {
         { value: "2", label: "透前称量", count:0 },
         { value: "3", label: "制定处方", count:0 }
       ],
-      
+
       select_index: 0,
 
       scheduals: [],
@@ -44,7 +44,7 @@ export default {
     filtedScheduals: function() {
       if (this.select_index == 0) {
         return this.scheduals
-        
+
       } else if (this.select_index == 1) {
         var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
@@ -84,6 +84,7 @@ export default {
         console.log(resp)
         if (resp.state == 1) {
           var scheduals = resp.data.scheduals
+          console.log(scheduals)
           var totalCount = scheduals.length
           var prescription_count = 0
           var assessment_before_dislysis_count = 0
@@ -99,7 +100,7 @@ export default {
           this.menuList[1].count = assessment_before_dislysis_count
           this.menuList[2].count = prescription_count
           this.scheduals = scheduals
-          
+
         } else {
           this.$toast({
             message: resp.msg,