修改华侨医院bug

src/pages/main/DialysisArea.vue

@@ -226,6 +226,7 @@ export default {
     handleScheduleDateChange: function(date) {
       this.zone_selected = 0;
       this.schedual_type_selected = 0;
+
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         zone: this.zone_selected,

src/pages/main/PatientBox.vue

@@ -37,7 +37,9 @@
 <script>
   import {parseTime} from '@/utils'
   import {jsGetAge} from '@/utils/tools'
-
+  import {
+    setDialysisOrWaitSelectedConfig
+  } from '@/utils/data_config'
   export default {
     name: 'PatientBox',
     props: {
@@ -208,6 +210,12 @@
         })
       },
       detailAction: function (schedual) {
+        if(schedual.dialysis_order != null){
+          setDialysisOrWaitSelectedConfig(1)
+        }else{
+          setDialysisOrWaitSelectedConfig(0)
+        }
+
         var patient_id = schedual.patient_id
         var date = schedual.schedule_date
         this.$router.push({

src/pages/main/Print.vue

@@ -1034,7 +1034,7 @@
 
               <td width="100">时间</td>
               <td width="80">血压<br/>mmHg</td>
-              <td width="40">脉率<br/>次/分</td>
+              <td width="40">脉搏<br/>次/分</td>
               <td width="40">呼吸<br/>次/分</td>
               <td width="60">血流量<br/>ml/min</td>
               <td width="60">超滤量<br/>L</td>

src/pages/main/RecordPage.vue

@@ -67,6 +67,7 @@
   import {Popover} from 'vux'
   import {getDialysisScheduals, getWaitingScheduals} from '@/api/dialysis'
   import {parseTime} from '@/utils/index'
+  import {getDialysisOrWaitSelectedConfig} from '@/utils/data_config'
 
   export default {
     name: 'RecordPage',
@@ -84,9 +85,9 @@
         search_input: '',
         search_keyword: '',
         scheduals: [],
-        advice_groups:[],
-        unReadWaitNum:0,
-        unReadDialysisNum:0,
+        advice_groups: [],
+        unReadWaitNum: 0,
+        unReadDialysisNum: 0,
 
       }
     },
@@ -110,6 +111,12 @@
         this.search_input = ''
         this.search_keyword = ''
       },
+    }, created () {
+      var index = getDialysisOrWaitSelectedConfig()
+      console.log(index)
+      if (index != null){
+        this.index = index
+      }
     }
   }
 </script>

src/pages/main/WaitingArea.vue

@@ -60,6 +60,12 @@
   import {getWaitingScheduals} from '@/api/dialysis'
   import {parseTime} from '@/utils'
   import {Popover} from 'vux'
+  import {
+    getSelectedAreaDataConfigList,
+    getSelectedTimesDataConfigList,
+    setSelectedAreaDataConfigList,
+    setSelectedTimesDataConfigList
+  } from '@/utils/data_config'
 
   export default {
     name: 'WaitingArea',
@@ -225,6 +231,24 @@
       }
     },
     created () {
+      var area = getSelectedAreaDataConfigList()
+      var time = getSelectedTimesDataConfigList()
+
+
+
+      if (area != null){
+        this.zone_options_visible = false
+        this.zone_selected = parseInt(area)
+        this.select_index = -1
+      }
+
+      if(time != null){
+        this.time_selected = parseInt(time)
+        this.select_index = -1
+        this.time_options_visible = false
+      }
+
+
       this.requestScheduals()
     },
     mounted () {
@@ -257,11 +281,12 @@
         this.zone_options_visible = false
         this.zone_selected = index
         this.select_index = -1
+        setSelectedAreaDataConfigList(index.toString())
       }, handleTimeChange: function (index) {
         this.time_selected = index
         this.select_index = -1
         this.time_options_visible = false
-
+        setSelectedTimesDataConfigList(index.toString())
       },
 
       requestScheduals () {

src/pages/main/dialog/AssessmentDialog.vue

@@ -96,8 +96,8 @@
             <input type="tel" @focus="inputFocus" v-model="formValue.diastolic_blood_pressure"/>
           </div>
         </div>
-        <div class="item" v-if="isShow('脉率')">
-          <h2 class="name">脉率(次/分)</h2>
+        <div class="item" v-if="isShow('脉搏')">
+          <h2 class="name">脉搏(次/分)</h2>
           <div class="content">
             <input type="tel" @focus="inputFocus" v-model="formValue.pulse_frequency"/>
           </div>

src/pages/main/dialog/MonitDialog.vue

@@ -20,8 +20,9 @@
             <tr @click="selectRow(-1, null)">
                 <th  v-if="isShow('监测时间')"  width="124px">时间</th>
                 <th  v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-                <th  v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
+                <th  v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
                 <th  v-if="isShow('体温')" width="80px">体温(℃)</th>
+                <td v-if="isShow('心率')"  width="80px">心率(次/分)</td>
                 <th  v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
                 <th  v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
@@ -38,7 +39,7 @@
             <tr v-for="(item,index) in monitorRecords" :key="index" :value="item.value" @click="selectRow(index, item)" :class="index==currentIndex?rowClass:''">
                 <td   v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
                 <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:""}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:""}}</td>
-                <td v-if="isShow('脉率')">{{item.pulse_frequency?item.pulse_frequency:""}}</td>
+                <td v-if="isShow('脉搏')">{{item.pulse_frequency?item.pulse_frequency:""}}</td>
                 <td v-if="isShow('体温')">{{item.temperature?item.temperature:""}}</td>
                 <td v-if="isShow('心率')">{{item.pulse_frequency?item.pulse_frequency:""}}</td>
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:""}}</td>
@@ -80,8 +81,8 @@
               <label>舒张压(mmHg)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.diastolic_bp">
             </div>
-            <div class="cell"  v-if="isShow('脉率')">
-              <label>脉率(次/分)</label>
+            <div class="cell"  v-if="isShow('脉搏')">
+              <label>脉搏(次/分)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.pulse_frequency">
             </div>
             <div class="cell"  v-if="isShow('体温')">

src/pages/main/dialog/OrdersDialog.vue

@@ -1062,7 +1062,7 @@
         this.$refs.exec_time.open()
       },
       openNewChild () {
-        if (this.currentAdvices.length == 0) {
+        if (this.currentAdvices.length == 0) {0
           return false
         }
         this.current_advice = this.currentAdvices[0]

src/pages/main/dialog/PrescriptionDialog.vue

@@ -242,7 +242,7 @@
 
 
 
-        <div class="item">
+        <div class="item" style="display: none">
           <label class="name" for="dtl">医生签名</label>
           <div class="content">
             <div v-if="isShowDesc">医生尚未签名</div>

src/pages/main/dialog/ThorougDialog.vue

@@ -165,8 +165,8 @@
             <!--<span class="iconfont">&#xe6f9;</span>-->
           </div>
         </div>
-        <div class="item" v-if="isShow('脉率')">
-          <label class="name" for="ml">脉率(次/分)</label>
+        <div class="item" v-if="isShow('脉搏')">
+          <label class="name" for="ml">脉搏(次/分)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="ml" v-model="formValue.pulse_frequency"/>
             <!--<span class="text">HD</span>-->

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -1,4 +1,4 @@
-<template>   
+<template>
   <div id="dialysis-print-box">
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>

src/pages/main/today/TodayTab.vue

@@ -296,8 +296,8 @@ export default {
         { title: "接诊评估", name: "accepts_assessment", value: 0 },
         { title: "透前评估", name: "assessment_before", value: 0 },
         { title: "临时医嘱", name: "stat_order", value: 0 },
-        { title: "透析上机", name: "dialysis_computer", value: 0 },
         { title: "双人核对", name: "double_check", value: 0 },
+        { title: "透析上机", name: "dialysis_computer", value: 0 },
         { title: "透析监测", name: "dialysis_monitoring", value: 0 },
         { title: "透析下机", name: "dialysis_off", value: 0 },
         { title: "透后评估", name: "assessment_after", value: 0 },
@@ -325,7 +325,7 @@ export default {
       }
 
       if (!isNaN(this.dialysis_order.id) && this.dialysis_order.id > 0) {
-        steps[4].value = 1;
+        steps[5].value = 1;
         if (this.dialysis_order.stage == 2) {
           steps[7].value = 1;
         }
@@ -336,7 +336,7 @@ export default {
         !isNaN(this.double_check.modifier) &&
         this.double_check.modifier > 0
       ) {
-        steps[5].value = 1;
+        steps[4].value = 1;
       }
       if (this.monitor_records.length > 0) {
         steps[6].value = 1;
@@ -945,7 +945,7 @@ export default {
       this.doctor_advices.push([])
       this.scrollToView("stat_order");
     },
-    closeDialysisComputer: function() {
+    closeDialysisComputer: function(dialysis_order) {
       this.closeDialog(0);
       this.scrollToView("dialysis_computer");
     },

src/pages/main/today/assessmentAfter.vue

@@ -44,8 +44,8 @@
           <span class="content" id="tw">{{temperature?temperature:''}}</span>
           <span class="unit">{{temperature?"℃":''}}</span>
         </li>
-        <li v-if="isShow('脉率')">
-          <label for="ml">脉率 : </label>
+        <li v-if="isShow('脉搏')">
+          <label for="ml">脉搏 : </label>
           <span id="ml" class="content">{{pulse_frequency?pulse_frequency:''}}</span>
           <span class="unit">{{pulse_frequency?"次/分":''}}</span>
         </li>

src/pages/main/today/assessmentBefore.vue

@@ -50,8 +50,8 @@
           <span class="content">{{ temperature?temperature:''}}</span>
           <span class="unit">{{ temperature?'℃':''}}</span>
         </li>
-        <li v-if="isShow('脉率')">
-          <label>脉率 : </label>
+        <li v-if="isShow('脉搏')">
+          <label>脉博 : </label>
           <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
           <span class="unit">{{ pulse_frequency?'次/分':''}}</span>
         </li>

src/pages/main/today/dialysisMonitoring.vue

@@ -5,13 +5,12 @@
       <table  class="table" style="">
         <tr>
           <th  v-if="isShow('监测时间')" width="124px">时间</th>
-          <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-          <th v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
-          <th v-if="isShow('心率')" width="80px">心率(次/分)</th>
-          <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
-          <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
+          <th v-if="isShow('脉搏')" width="80px">脉率(次/分)</th>
+          <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
+          <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
           <th  width="76px">静脉压/动脉压(mmHg)</th>
+          <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
           <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
@@ -24,13 +23,12 @@
         </tr>
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
           <td v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
-          <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
-          <td v-if="isShow('脉率')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
           <td v-if="isShow('体温')">{{item.temperature?item.temperature:''}}</td>
-          <td v-if="isShow('心率')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
-          <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
-          <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
+          <td v-if="isShow('脉搏')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
+          <td v-if="isShow('呼吸频率')">{{item.breathing_rate?item.breathing_rate:''}}</td>
+          <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
           <td>{{item.venous_pressure?item.venous_pressure:''}}/{{item.arterial_pressure?item.arterial_pressure:''}}</td>
+          <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
           <td v-if="isShow('跨膜压')">{{item.transmembrane_pressure?item.transmembrane_pressure:''}}</td>
           <td v-if="isShow('超滤量')">{{item.ultrafiltration_volume?item.ultrafiltration_volume:''}}</td>
           <td v-if="isShow('钠浓度')">{{item.sodium_concentration?item.sodium_concentration:''}}</td>

src/utils/data_config.js

@@ -3,6 +3,17 @@ const dataConfigKey = 'data_config_list'
 const filedConfigKey = 'filed_config_list'
 
 
+const areaConfigKey = 'area_config_list'
+const timeConfigKey = 'time_config_list'
+
+
+const dialysisAreaConfigKey = 'dialysis_area_config'
+const dialysisTimeConfigKey = 'dialysis_time_config'
+
+const dialysisOrWaitConfigKey = 'dialysis_or_wait_config'
+
+
+
 
 export function getDataConfigList() {
   return window.sessionStorage.getItem(dataConfigKey)
@@ -28,3 +39,53 @@ export function setFiledConfigList(infoJSONStr) {
 export function removeFiledConfigList() {
   window.sessionStorage.removeItem(filedConfigKey)
 }
+
+
+export function setSelectedAreaDataConfigList(value) {
+  console.log(value)
+  window.sessionStorage.setItem(areaConfigKey, value)
+}
+
+export function setSelectedTimesDataConfigList(value) {
+  console.log(value)
+  window.sessionStorage.setItem(timeConfigKey, value)
+}
+
+
+
+export function setDialysisSelectedAreaDataConfigList(value) {
+  window.sessionStorage.setItem(dialysisAreaConfigKey, value)
+}
+
+export function setDialysisSelectedTimesDataConfigList(value) {
+  window.sessionStorage.setItem(dialysisTimeConfigKey, value)
+}
+
+
+
+export function getSelectedAreaDataConfigList() {
+  return window.sessionStorage.getItem(areaConfigKey)
+}
+
+export function getSelectedTimesDataConfigList() {
+  return  window.sessionStorage.getItem(timeConfigKey)
+}
+
+
+
+export function getDialysisSelectedAreaDataConfigList() {
+  return window.sessionStorage.getItem(dialysisAreaConfigKey)
+}
+
+export function getDialysisSelectedTimesDataConfigList() {
+  return  window.sessionStorage.getItem(dialysisTimeConfigKey)
+}
+
+export function setDialysisOrWaitSelectedConfig(value) {
+  window.sessionStorage.setItem(dialysisOrWaitConfigKey, value)
+}
+
+
+export function getDialysisOrWaitSelectedConfig() {
+  return window.sessionStorage.getItem(dialysisOrWaitConfigKey)
+}