Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.41"
+  "version": "1.0.52"
 }

config/prod.env.js

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

src/api/advice.js

@@ -128,4 +128,11 @@ export function ModifyExecDoctorAdvice(params){
   })
 }
 
+export function GetRemindLongAdvice(params){
+  return request({
+    url:'/m/api/dialysis/advice_remind',
+    method:'Get',
+    params:params,
+  })
+}
 

src/api/dialysis.js

@@ -188,6 +188,14 @@ export function GetMonitor (params) {
   })
 }
 
+export function GetMonitorToday (params) {
+  return request({
+    url: '/m/api/monitor/gettodaylast',
+    method: 'get',
+    params: params
+  })
+}
+
 export function PostSearch (keyword) {
   return request({
     url: '/m/api/patients/search?keyword=' + keyword,
@@ -213,3 +221,15 @@ export function PostModifyEndDialysis (params) {
 }
 
 
+
+
+export function CreateGroupAdvice(id, groupno, advices){
+  return request({
+    url:'/m/api/advice_remind/create?id='+id + '&groupno=' + groupno,
+    method:'post',
+    data:advices,
+  })
+
+}
+
+

src/pages/main/dialog/AssessmentDialog.vue

@@ -189,6 +189,15 @@
         </div>
 
 
+        <div @click="showSubMenu('puncture_needle')" class="item" ref="puncture_needle" v-if="isShow('穿刺针')">
+          <h2 class="name">穿刺针</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{formValue.puncture_needle}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+
         <div @click="showSubMenu('puncture_way')" class="item" ref="puncture_way" v-if="isShow('穿刺方式')">
           <h2 class="name">穿刺方式</h2>
           <div class="content">
@@ -408,6 +417,7 @@
           skin_other:'',
           infect_other:'',
           ductus_arantii_other:'',
+          puncture_needle:'',
 
         },
 
@@ -860,7 +870,7 @@
               this.propForm.result = []
             }
             this.propForm.click_ref = 'ductus_arantii'
-            break
+
 
             break
 
@@ -926,9 +936,27 @@
             this.propForm.click_ref = 'skin'
             break
 
-
-
-
+          case 'puncture_needle':
+            this.propForm.result = []
+            this.propForm.isHasOther = 2
+            this.propForm.type = 22
+            this.isShowDialog = false
+            this.propForm.title = '穿刺针'
+            this.visibility = true
+            this.propForm.list = this.$store.getters.puncture_needle
+            this.propForm.optionList = []
+            this.propForm.isMultiple = 2
+            if (this.formValue.puncture_needle != undefined || this.formValue.puncture_needle != null) {
+              if (this.formValue.puncture_needle.length > 0) {
+                this.propForm.result = this.formValue.puncture_needle.split(',')
+              } else {
+                this.propForm.result = []
+              }
+            } else {
+              this.propForm.result = []
+            }
+            this.propForm.click_ref = 'puncture_needle'
+            break
 
         }
 
@@ -1028,6 +1056,9 @@
           case 21:
             this.formValue.skin = val.selectId.toString()
             break
+          case 22:
+            this.formValue.puncture_needle = val.result.join(',')
+            break
         }
 
       }, QueryPartById: function (val) {

src/pages/main/dialog/ComputerDialog.vue

@@ -33,6 +33,12 @@
           </div>
         </div>
 
+        <div class="item" v-if="template_id == 6">
+          <label class="name" for="xll">引血(ml/min)</label>
+          <div class="content">
+            <input type="tel" @focus="inputFocus"  id="xll" v-model="blood_drawing"/>
+          </div>
+        </div>
 
         <div class="item">
           <h2 class="name">上机时间</h2>
@@ -42,6 +48,8 @@
           </div>
         </div>
 
+        
+
 
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
@@ -83,6 +91,8 @@
         isPremission: false,
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
+        template_id: 0,
+        blood_drawing:100
       }
     },
     props: {
@@ -124,6 +134,8 @@
       }
     },
     created () {
+    
+      this.template_id = this.$store.getters.user.template_info.template_id;
       var date = this.$route.query && this.$route.query.date
       date *= 1000
       var newDate = new Date(date)
@@ -145,15 +157,21 @@
       if (this.puncture_nurse_id == 0) {
         this.puncture_nurse_id = this.$store.getters.user.user.id
       }
+      
+      // var beds = []
+      // for (let index = 0; index < this.device_numbers.length; index++) {
+      //   const device_number = this.device_numbers[index]
+      //   if (device_number.zone_id == this.schedule.partition_id) {
+      //     beds.push(device_number)
+      //   }
+      // }
+      // this.zone_beds = beds
 
-      var beds = []
       for (let index = 0; index < this.device_numbers.length; index++) {
         const device_number = this.device_numbers[index]
-        if (device_number.zone_id == this.schedule.partition_id) {
-          beds.push(device_number)
-        }
+        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
       }
-      this.zone_beds = beds
+      this.zone_beds = this.device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {
@@ -171,8 +189,26 @@
         }
       }
 
+
+
     },
     methods: {
+      inputFocus: function (event) {
+        var input = event.target
+        setTimeout(function () {
+          input.scrollIntoView()
+        }, 0)
+
+        if (input.setSelectionRange) {
+          setTimeout(function () {
+            input.setSelectionRange(0, input.value.length)
+          }, 0)
+        } else if (input.createTextRange) {
+          var rng = input.createTextRange()
+          rng.move('character', input.value.length)
+          rng.select()
+        }
+      },
       modify(){
         let ParamsQuery = {}
         ParamsQuery['id'] = this.record.id
@@ -223,6 +259,7 @@
         ParamsQuery['bed'] = this.bed_id
         ParamsQuery['start_time'] = this.start_time_str
         ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+        ParamsQuery['blood_drawing'] = this.blood_drawing
 
         startDialysis(ParamsQuery).then(response => {
           if (response.data.state == 0) {
@@ -230,6 +267,8 @@
             return false
           } else {
             Toast.success('上机成功')
+            var monitor = response.data.data.monitor
+            this.$emit('did_add_monitor', monitor)
             this.$emit('did_start', response.data.data.dialysis_order)
             var record = this.record
             for (const key in response.data.data.dialysis_order) {

src/pages/main/dialog/MonitDialog.vue

@@ -26,7 +26,8 @@
                 <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
                 <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-                <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
+                <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
+                <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
                 <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
                 <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
@@ -114,16 +115,17 @@
             </div>
             <div class="cell">
               <label>静脉压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.venous_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.venous_pressure" style="width:60%">
+               <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(1)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('跨膜压')">
               <label>跨膜压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.transmembrane_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.transmembrane_pressure" style="width:60%">
+              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(2)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('超滤量')">
-              <label>超滤量(L)</label>
+              <label v-if="template_id == 6">超滤量(ml)</label>
+              <label v-else>超滤量(L)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
                      v-model="form.ultrafiltration_volume">
             </div>
@@ -134,8 +136,8 @@
             </div>
             <div class="cell">
               <label>动脉压(mmHg)</label>
-              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
-                     v-model="form.arterial_pressure">
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.arterial_pressure" style="width:60%">
+              <button style="width:30%;padding: 0.18rem 0; color: #fff; background: #409eff;" @click="venousPressureChange(3)" >转换</button>
             </div>
             <div class="cell" v-if="isShow('钠浓度')">
               <label>钠浓度(mmol/L)</label>
@@ -225,7 +227,7 @@
 </template>
 
 <script>
-  import {addMonitorRecord, deleteMonitorRecord, editMonitorRecord, GetMonitor} from '@/api/dialysis'
+  import {addMonitorRecord, deleteMonitorRecord, editMonitorRecord, GetMonitor,GetMonitorToday} from '@/api/dialysis'
   import {parseTime} from '@/utils'
   import {Dialog, Toast} from 'vant'
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
@@ -262,8 +264,9 @@
         currentIndex: -1,
         currentRow: null,
         rowClass: 'row-class-active',
-
+        template_id: 0,
         visibility: false,
+        today_last_monitor_record : {},
         propForm: {
           title: '',
           list: [],
@@ -308,6 +311,7 @@
     },
     created () {
       var date = this.$route.query && this.$route.query.date
+      this.template_id = this.$store.getters.user.template_info.template_id;
       // date *= 1000;
       // var newDate = new Date(date);
       // var cDate = new Date();
@@ -336,6 +340,15 @@
       this.form.operate_time = this.pickertime.getTime()
     },
     methods: {
+      venousPressureChange(type){
+        if (type == 1) {
+          this.form.venous_pressure = this.form.venous_pressure * 7.5
+        } else if(type == 2) {
+          this.form.transmembrane_pressure = this.form.transmembrane_pressure * 7.5
+        } else {
+          this.form.arterial_pressure = this.form.arterial_pressure * 7.5
+        }
+      },
       isShow (name) {
         var filedList = this.$store.getters.user.fileds
 
@@ -346,6 +359,45 @@
         }
         return false
       },
+      getLastRecordTody(){
+        let params = {
+          patient_id: this.patient.id
+        }
+
+        GetMonitorToday(params).then(rs => {
+          var resp =rs.data.data
+          this.today_last_monitor_record = resp.monitor
+
+          
+          // this.form.operate_time = Date.parse(new Date())
+          this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time+3600)* 1000 : Date.parse(new Date())
+          this.form.pulse_frequency = '' //this.last_monitor_record.pulse_frequency;
+          this.form.breathing_rated = resp.monitor.breathing_rate?resp.monitor.breathing_rate:'';
+          this.form.systolic_bp = '' //this.last_monitor_record.systolic_blood_pressure;
+          this.form.diastolic_bp = '' //this.last_monitor_record.diastolic_blood_pressure;
+          this.form.blood_flow_volume = resp.monitor.blood_flow_volume?resp.monitor.blood_flow_volume:'';
+          this.form.venous_pressure = ''//this.last_monitor_record.venous_pressure;
+          this.form.arterial_pressure = '' //this.last_monitor_record.arterial_pressure;
+          this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+          this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate?resp.monitor.ultrafiltration_rate:'';
+          this.form.ultrafiltration_volume =  resp.monitor.ultrafiltration_volume?resp.monitor.ultrafiltration_volume:'';
+          this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:'';
+          this.form.dialysate_temperature =  resp.monitor.dialysate_temperature?resp.monitor.dialysate_temperature:'';
+          this.form.temperature = resp.monitor.temperature?resp.monitor.temperature:'';
+          this.form.replacement_rate =  resp.monitor.replacement_rate?resp.monitor.replacement_rate:'';
+          this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
+          this.form.conductivity = ''
+          this.form.displacement_flow_quantity = ''
+
+          this.form.ktv = '' //this.last_monitor_record.ktv;
+          this.form.symptom = ''// this.last_monitor_record.symptom;
+          this.form.dispose = '' // this.last_monitor_record.dispose;
+          this.form.result = '' //this.last_monitor_record.result;
+          this.form.id = -1
+          console.log(this.form)
+        })
+      },
+
       getLastRecord () {
         let params = {
           patient_id: this.patient.id
@@ -716,7 +768,7 @@
         this.formPanel = true
         this.listPanel = false
         // if(this.monitor_time_str == "") {
-
+          
         var date = this.$route.query && this.$route.query.date
         date *= 1000
         var newDate = new Date(date)
@@ -732,33 +784,8 @@
         // this.monitor_time_str = this.handleTime(nowTime);
         // this.monitor_time_str = record_date + " " + this.form.monitor_time;
 
-        // this.getLastRecord()
-
-        this.form.operate_time = Date.parse(new Date())
-        this.form.pulse_frequency = '' //this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated = '' //this.last_monitor_record.breathing_rate;
-        this.form.systolic_bp = '' //this.last_monitor_record.systolic_blood_pressure;
-        this.form.diastolic_bp = '' //this.last_monitor_record.diastolic_blood_pressure;
-        this.form.blood_flow_volume = '' //this.last_monitor_record.blood_flow_volume;
-        this.form.venous_pressure = ''//this.last_monitor_record.venous_pressure;
-        this.form.arterial_pressure = '' //this.last_monitor_record.arterial_pressure;
-        this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
-        this.form.ultrafiltration_rate = ''// this.last_monitor_record.ultrafiltration_rate;
-        this.form.ultrafiltration_volume = ''// this.last_monitor_record.ultrafiltration_volume;
-        this.form.sodium_concentration = ''//this.last_monitor_record.sodium_concentration;
-        this.form.dialysate_temperature = '' //this.last_monitor_record.dialysate_temperature;
-        this.form.temperature = '' //this.last_monitor_record.temperature;
-        this.form.replacement_rate = '' // this.last_monitor_record.replacement_rate;
-        this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
-        this.form.conductivity = ''
-        this.form.displacement_flow_quantity = ''
-
-        this.form.ktv = '' //this.last_monitor_record.ktv;
-        this.form.symptom = ''// this.last_monitor_record.symptom;
-        this.form.dispose = '' // this.last_monitor_record.dispose;
-        this.form.result = '' //this.last_monitor_record.result;
-        this.form.id = -1
-        console.log(this.form)
+        this.getLastRecordTody()
+        
         // }
       },
       submitEditAction: function () {
@@ -904,10 +931,10 @@
               this.form.conductivity = ''
               this.form.displacement_flow_quantity = ''
 
-              this.last_monitor_record.sodium_concentration =
-                monitor.sodium_concentration
-              this.last_monitor_record.dialysate_temperature =
-                monitor.dialysate_temperature
+              // this.last_monitor_record.sodium_concentration =
+              //   monitor.sodium_concentration
+              // this.last_monitor_record.dialysate_temperature =
+              //   monitor.dialysate_temperature
 
               Toast.success('新增成功')
               this.formPanel = false

src/pages/main/dialog/OrdersDialog.vue

@@ -78,7 +78,7 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <span>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
+                    <span v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
                     <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                     <span v-if="advice.single_dose"
                     >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -381,7 +381,7 @@
           advice_desc: advice.advice_desc,
           remark: advice.remark,
           start_time: advice.start_time,
-          // drug_spec: String(advice.drug_spec),
+          drug_spec: String(advice.drug_spec),
           drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
@@ -402,7 +402,7 @@
                     advice.advice_desc = resp_advice.advice_desc
                     advice.remark = resp_advice.remark;
                     advice.start_time = resp_advice.start_time;
-                    // advice.drug_spec = resp_advice.drug_spec;
+                    advice.drug_spec = resp_advice.drug_spec;
                     (advice.drug_spec_unit = resp_advice.drug_spec_unit),
                     (advice.delivery_way = resp_advice.delivery_way),
                       (advice.execution_frequency =
@@ -494,7 +494,7 @@
           start_time: subdrug.start_time,
           advice_name: subdrug.title,
           advice_desc: subdrug.advice_desc,
-          // drug_spec: String(subdrug.drug_spec),
+          drug_spec: String(subdrug.drug_spec),
           drug_spec_unit: subdrug.drug_spec_unit,
           single_dose: String(subdrug.single_dose),
           single_dose_unit: subdrug.single_dose_unit,
@@ -1139,7 +1139,7 @@
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
             remark: advice.remark,
-            // drug_spec: advice.drug_spec,
+            drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
@@ -1167,7 +1167,7 @@
             advice_desc: advice.advice_desc,
             remark: advice.remark,
             start_time: advice.start_time,
-            // drug_spec: advice.drug_spec,
+            drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
@@ -1187,7 +1187,7 @@
               advice_desc: advice.advice_desc,
               remark: advice.remark,
 
-              // drug_spec: advice.drug_spec,
+              drug_spec: advice.drug_spec,
               drug_spec_unit: advice.drug_spec_unit,
               delivery_way: advice.delivery_way,
               execution_frequency: advice.execution_frequency,

src/pages/main/dialog/PlaneDialog.vue

@@ -83,15 +83,14 @@
     special_premission: {
       type: Array,
     },
+    last_monitor_record: {
+      type: Object,
+    }
   },mounted() {
-      if(this.record.id == 0){
+      if(this.last_monitor_record.id == 0){
         this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
       }else{
-        if(this.record.end_time == 0){
-          this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-        }else{
-          this.end_time_str = parseTime(this.record.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-        }
+        this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
       }
     },
   created(){
@@ -138,6 +137,10 @@
 
   },
   methods: {
+    set_last_monitor_record(monitor) {
+      this.last_monitor_record = monitor
+      this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    },
     modify(){
       let ParamsQuery = {}
       ParamsQuery['id'] = this.record.id

src/pages/main/dialog/ThorougDialog.vue

@@ -173,6 +173,16 @@
             <!--<span class="iconfont">&#xe6f9;</span>-->
           </div>
         </div>
+        <div class="item" v-if="isShow('呼吸频率')">
+          <label class="name" for="ml">呼吸频率(次/min)</label>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" id="ml" v-model="formValue.breathing_rate"/>
+            <!--<span class="text">HD</span>-->
+            <!--<span class="iconfont">&#xe6f9;</span>-->
+          </div>
+        </div>
+
+
         <div class="item" v-if="isShow('脉搏')">
           <label class="name" for="ml">脉搏(次/分)</label>
           <div class="content">
@@ -471,6 +481,7 @@
           intravenous_tube:'',
           dialyzer:'',
           is_eat:'',
+          breathing_rate:'',
         },
 
         record_date: ''
@@ -1235,18 +1246,27 @@
       let tempHour = ''
       let tempMinute = ''
 
-      if (this.record != null && this.record.id != '') {
+      if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
-      } else if (this.last_record != null && this.last_record.id != "") {
-        this.$set(this.formValue, "patient_gose", this.last_record.patient_gose)
-        this.$set(this.formValue, "blood_access_part_id", this.last_record.blood_access_part_id)
-        this.$set(this.formValue, "blood_access_part_opera_id", this.last_record.blood_access_part_opera_id)
-        this.$set(this.formValue, "internal_fistula", this.last_record.internal_fistula)
-        this.$set(this.formValue, "internal_fistula_tremor_ac", this.last_record.internal_fistula_tremor_ac)
-      }
+      }else if (this.last_record != null && this.last_record.id != "") {
+        for (const key in this.formValue) {
+          // console.log(key, this.record[key]);
+          this.formValue[key] = this.last_record[key];
+        }
+        if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
+          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+          this.$set(this.formValue, "weight_after", this.record.weight_after)
+          this.$set(this.formValue, "weight_loss", this.record.weight_loss)
+        } else {
+          this.$set(this.formValue, "actual_ultrafiltration", '')
+          this.$set(this.formValue, "weight_after", '')
+          this.$set(this.formValue, "weight_loss", '')
+        }
+      } 
+  
 
 
 

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -225,7 +225,7 @@ export default {
           parent_id: this.current_advice.parent_id,
           title: this.current_advice.advice_name,
           advice_desc: this.current_advice.advice_desc,
-          // drug_spec: this.current_advice.drug_spec,
+          drug_spec: this.current_advice.drug_spec,
           drug_spec_unit: this.current_advice.drug_spec_unit,
           delivery_way: this.current_advice.delivery_way,
           execution_frequency: this.current_advice.execution_frequency,

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -22,8 +22,7 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
-              <!--<input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">-->
+              <input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.advice_desc">
               <input
                 type="text"
                 placeholder="单位"
@@ -219,7 +218,7 @@ export default {
         // record_time: "",
         title: "",
         advice_desc: "",
-        // drug_spec: "",
+        drug_spec: "",
         drug_spec_unit: "",
         remark:"",
         delivery_way: "",
@@ -261,7 +260,7 @@ export default {
 
       this.start_time_str = parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
 
-      // this.order.drug_spec = order.drug_spec;
+      this.order.drug_spec = order.drug_spec;
       this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way =
         order.delivery_way == undefined || order.delivery_way == null
@@ -306,6 +305,7 @@ export default {
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
           start_time:this.start_time_str,
+          drug_spec:this.order.drug_spec,
           drug_spec_unit:this.order.drug_spec_unit,
 
         });

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -52,7 +52,7 @@
                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
-                <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
+                <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
                 <td v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
                 <td v-else></td>
                 <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
@@ -276,7 +276,7 @@ export default {
         var json = {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
-          // drug_spec: String(advice.drug_spec),
+          drug_spec: String(advice.drug_spec),
           drug_spec_unit: advice.drug_spec_unit,
           single_dose: String(advice.single_dose),
           single_dose_unit: advice.single_dose_unit,
@@ -292,7 +292,7 @@ export default {
           json.subdrugs.push({
             advice_name: subdrug.title,
             advice_desc: subdrug.advice_desc,
-            // drug_spec: String(subdrug.drug_spec),
+            drug_spec: String(subdrug.drug_spec),
             drug_spec_unit: subdrug.drug_spec_unit,
             single_dose: String(subdrug.single_dose),
             single_dose_unit: subdrug.single_dose_unit,
@@ -344,7 +344,7 @@ export default {
             id: adv.id,
             title: adv.advice_name,
             advice_desc: adv.advice_desc,
-            // drug_spec: adv.drug_spec,
+            drug_spec: adv.drug_spec,
             drug_spec_unit: adv.drug_spec_unit,
             delivery_way: adv.delivery_way,
             execution_frequency: adv.execution_frequency,
@@ -366,7 +366,7 @@ export default {
                 id: resp_adv.id,
                 title: resp_adv.advice_name,
                 advice_desc: resp_adv.advice_desc,
-                // drug_spec: resp_adv.drug_spec,
+                drug_spec: resp_adv.drug_spec,
                 drug_spec_unit: resp_adv.drug_spec_unit,
                 delivery_way: resp_adv.delivery_way,
                 execution_frequency: resp_adv.execution_frequency,

src/pages/main/dialog/new_order/order_form.vue

@@ -18,9 +18,9 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
+              <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
 
-              <!--<input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
+              <input type="number" class="inputBox" style="width:62.5%" v-model="order.advice_desc">
               <input
                 type="text"
                 placeholder="单位"
@@ -204,7 +204,7 @@ export default {
       order: {
         title: "",
         advice_desc: "",
-        // drug_spec: "",
+        drug_spec: "",
         drug_spec_unit: "",
         delivery_way: "",
         execution_frequency: "",
@@ -239,7 +239,7 @@ export default {
 
       this.order.title = "";
       this.order.advice_desc = "";
-      // this.order.drug_spec = "";
+      this.order.drug_spec = "";
       this.order.drug_spec_unit = "";
       this.order.delivery_way = "";
       this.order.execution_frequency = "";
@@ -256,7 +256,7 @@ export default {
 
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
-      // this.order.drug_spec = order.drug_spec;
+      this.order.drug_spec = order.drug_spec;
       this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way = order.delivery_way;
       this.order.execution_frequency = order.execution_frequency;
@@ -284,7 +284,7 @@ export default {
       this.order.advice_desc = "";
       this.order.remark = "";
 
-      // this.order.drug_spec = "";
+      this.order.drug_spec = "";
       this.order.drug_spec_unit = "";
       this.order.delivery_way =
         parent_delivery_way == undefined || parent_delivery_way == null
@@ -326,6 +326,8 @@ export default {
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
           remark: this.order.remark,
+          drug_spec: this.order.drug_spec,
+
           drug_spec_unit: this.order.drug_spec_unit,
 
         });
@@ -334,7 +336,7 @@ export default {
 
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
+          drug_spec: this.order.drug_spec,
           drug_spec_unit: this.order.drug_spec_unit,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,
@@ -352,7 +354,7 @@ export default {
           start_time: this.order.start_time,
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
+          drug_spec: this.order.drug_spec,
           drug_spec_unit: this.order.drug_spec_unit,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -0,0 +1,204 @@
+<template>
+  <div v-if="visibility" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()">
+        <span class="iconfont">&#xe720; </span>返回
+      </div>
+      <h1 class="name">长期医嘱推送</h1>
+      <span @click="comfirm" class="success"
+      >确定</span
+      >
+    </div>
+
+    <div class="CheckBox">
+      <ul>
+        <li>
+          <van-checkbox-group v-model="propsForm.result">
+            <van-checkbox
+              style="border-bottom: 1px #e5e5e5 solid;padding: 0 0.38rem"
+              v-for="(advice, index) in propsForm.list"
+              :key="index"
+              :name="advice.id"
+            >
+             <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
+              <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
+              <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
+
+            </van-checkbox>
+          </van-checkbox-group>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {parseTime} from '@/utils'
+
+  export default {
+    name: 'LongAdviceSubMenu',
+    created () {
+    },
+    data () {
+      return {
+        result: [],
+        id: 0,
+        selectName: ''
+      }
+    },
+    props: {
+      propsForm: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+    },
+    methods: {
+      getDoctorName (doctor_id) {
+        for (let i = 0; i < this.propsForm.operators.length; i++) {
+          if (this.propsForm.operators[i].id == doctor_id) {
+            return this.propsForm.operators[i].name
+          }
+        }
+      }, getTime (val) {
+        return parseTime(val, '{y}-{m}-{d} {h}:{i}')
+
+      }, getContent (val) {
+        let prescribing_number = ''
+        let single_dose = ''
+        if (val.prescribing_number > 0) {
+          prescribing_number = val.prescribing_number + val.prescribing_number_unit
+        }
+        if (val.single_dose > 0) {
+          single_dose = ' 单次用量 ' + val.single_dose + val.single_dose_unit
+        }
+        let name = ""
+        if (val.child.length > 0){
+          for (let i = 0 ; i < val.child.length; i++){
+            if(val.child[i].prescribing_number > 0){
+              val.child[i]['presc'] = val.child[i].prescribing_number + val.child[i].prescribing_number_unit
+            }else{
+              val.child[i]['presc'] = ''
+            }
+
+            if(val.child[i].single_dose > 0){
+              val.child[i]['single'] = " "+' 单次用量 '+" "+val.child[i].single_dose + val.child[i].single_dose_unit
+            }else{
+              val.child[i]['single'] = ''
+            }
+            name = name+"▲"+val.child[i].advice_name+""
+              + val.child[i].drug_spec
+              + val.child[i].drug_spec_unit
+              + val.child[i].presc
+              + val.child[i].single
+          }
+          return  val.advice_name +"  "+ val.drug_spec+" "
+            + val.drug_spec_unit
+            + prescribing_number
+            + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
+
+        } else {
+          return val.advice_name +"  "+ val.drug_spec+" "
+            + val.drug_spec_unit
+            + prescribing_number
+            + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
+        }
+
+
+      },
+
+      cancle: function () {
+        this.$emit('menu-cancle-three')
+      },
+      comfirm: function () {
+        this.$emit('menu-comfirm-three', this.getValue())
+      },
+      getValue: function () {
+        let form = {}
+
+        let results = []
+
+        for (let i = 0; i < this.propsForm.list.length; i++){
+          for (let a = 0; a < this.propsForm.result.length; a++){
+            if( this.propsForm.list[i].id == this.propsForm.result[a]){
+              results.push(this.propsForm.list[i])
+            }
+          }
+        }
+
+        var obj5={}
+        results = results.reduce((cur, next) => {
+          obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+        results
+
+        return results
+      },
+
+    },
+    watch: {
+      visibility (val) {
+        //初始化数据操作
+      }
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10rem;
+  min-height: 5rem;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  overflow-y: scroll;
+  max-height: 9rem;
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color: $title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  max-height: 8rem !important;
+  min-height: 8rem !important;
+  }
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/index.vue

@@ -118,8 +118,8 @@
         })
       },getData(){
         console.log("111111")
-        this.requestScheduals()
-        this.requestDialysisScheduals()
+        // this.requestScheduals()
+        // this.requestDialysisScheduals()
       }
 
     },

src/pages/main/today/TodayTab.vue

@@ -109,8 +109,8 @@
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
-                           :types="goodTypes" :info="goodInfos"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
+                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="targetAdvices"
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"  :admin_users_prop="admin_users" @advice="adviceFunc"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -141,7 +141,7 @@
                        :device_numbers="device_numbers" :admin_map="admin_user_map"
                        :special_premission="special_premission"
                        :device_number_map="device_number_map" @did_start="closeDialysisComputer"
-                       @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
+                        @did_add_monitor="didAddMonitor" @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
     </van-popup>
 
     <van-popup title="透析监测" v-model="menuList[6].showPopup" :overlay="true" :close-on-click-overlay="false">
@@ -153,8 +153,8 @@
     </van-popup>
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <plane-dialog :patient_prop="patient" :record="dialysis_order" :admins="admin_users" :admin_map="admin_user_map"
-                    :special_premission="special_premission"
+      <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
+                    :special_premission="special_premission" 
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
@@ -217,7 +217,9 @@
   import MonitDialog from '../dialog/MonitDialog'
   import ComputerDialog from '../dialog/ComputerDialog'
 
-  import {dialysisGlobalConfig, getDialysisRecord} from '@/api/dialysis'
+  import {dialysisGlobalConfig, getDialysisRecord,CreateGroupAdvice} from '@/api/dialysis'
+  import {GetRemindLongAdvice} from '@/api/advice'
+
   import {parseTime} from '@/utils'
 
   export default {
@@ -300,6 +302,10 @@
         goTopShow: false,
         goodTypes: [],
         goodInfos: [],
+
+        longAdvices: [],
+        targetAdvices:[],
+        status:'',
       }
     },
     computed: {
@@ -373,6 +379,8 @@
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
+      // this.requestLongAdvice()
+
     },
     mounted () {
       window.addEventListener('scroll', this.handleScroll)
@@ -410,6 +418,7 @@
         // }
         this.monitor_records.reverse()
         this.last_monitor_record = monitor
+        this.$refs.plane_dialog.set_last_monitor_record(monitor)
       },
 
       didEditMonitor (monitor) {
@@ -469,7 +478,7 @@
           monitor.conductivity
         this.monitor_records[monitor_index].displacement_flow_quantity =
           monitor.displacement_flow_quantity
-        this.monitor_records.sort((a, b) =>a.operate_time - b.operate_time )
+        this.monitor_records.sort((a, b) => a.operate_time - b.operate_time)
 
         // if (monitor_index >= 0) {
         //   var record = this.monitor_records[monitor_index]
@@ -918,6 +927,148 @@
           }
         })
       },
+      requestLongAdvice () {
+        var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+
+        var params = {
+          id: this.patient_id,
+        }
+        GetRemindLongAdvice(params).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+
+            var status = parseInt(resp.data.status)
+            this.status = status
+
+            switch (status) {
+              case 2:
+                this.longAdvices = resp.data.advices
+
+                var longAdvicesTwo = resp.data.advices_two
+
+                for (let i = 0; i < this.longAdvices.length; i++) {
+                  this.longAdvices[i]['isCheck'] = 0
+                  switch (this.longAdvices[i].frequency_type) {
+                    case 1: //每日推送
+                      this.longAdvices[i]['isCheck'] = 1
+                      break
+                    case 2: //用今天的日期与推送类型为2的医嘱进行比较如果相差天数等于设定的天数，则设置为选中状态
+                      for (let i = 0;i < this.longAdvices.length;i++){
+                        for (let a = 0; a < longAdvicesTwo.length;a++){
+                          if(this.longAdvices[i].advice_name == longAdvicesTwo[a].advice_name && this.longAdvices[i].advice_desc == longAdvicesTwo[a].advice_desc){
+                            this.longAdvices[i]['isCheck'] = 1
+                          }
+                        }
+                      }
+                      break
+                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则设置为选中状态
+                      let day = new Date().getDay()
+                      console.log(day)
+                      let name =""
+                      switch (day) {
+                        case 1:
+                          name="周一"
+                          break
+                        case 2:
+                          name="周二"
+
+                          break
+                        case 3:
+                          name="周三"
+
+                          break
+                        case 4:
+                          name="周四"
+                          break
+                        case 5:
+                          name="周五"
+                          break
+                        case 6:
+                          name="周六"
+                          break
+                        case 0:
+                          name="周日"
+                          break
+                      }
+
+
+                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
+                        console.log("11111")
+                        this.longAdvices[i]['isCheck'] = 1
+                      }
+                      break
+                  }
+                }
+
+                console.log( this.longAdvices)
+                this.targetAdvices = this.longAdvices
+
+                break
+              case 3:
+                this.longAdvices = resp.data.advices
+
+                var advices_two = resp.data.advices_two
+                let dayAdvices = []
+                for (let i = 0; i < this.longAdvices.length; i++) {
+                  switch (this.longAdvices[i].frequency_type) {
+                    case 1: //每日推送，则加入到待上传数组里面
+                      dayAdvices.push(this.longAdvices[i])
+                      break
+                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则加入到待上传数组里面
+                      let day = new Date().getDay()
+                      let name =""
+
+                      switch (day) {
+                        case 1:
+                          name="周一"
+                          break
+                        case 2:
+                          name="周二"
+                          break
+                        case 3:
+                          name="周三"
+                          break
+                        case 4:
+                          name="周四"
+                          break
+                        case 5:
+                          name="周五"
+                          break
+                        case 6:
+                          name="周六"
+                          break
+                        case 0:
+                          name="周日"
+                          break
+                      }
+                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
+                        dayAdvices.push(this.longAdvices[i])
+                      }
+                      break
+                  }
+                }
+                this.targetAdvices = dayAdvices.concat(advices_two)
+                break
+            }
+          } else {
+
+          }
+        })
+      }, getNowFormatDate () {
+        var date = new Date()
+        var seperator1 = '-'
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        var strDate = date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate
+        return currentdate
+      },
       newAdviceGroupObject: function () {
         return Object.assign(
           {},
@@ -931,69 +1082,108 @@
             // checker: 0,
           }
         )
+      }
+      ,adviceFunc:function(){
+
+
       },
       prescriptionFunc: function (val) {
+        if (this.status == 2){
+          if(val.creater > 0 && val.modifier == 0){
+            this.requestDialysisRecord()
+          }
+
+        }else if(this.status == 3){
+          if(val.creater > 0 && val.modifier == 0){
+            this.requestDialysisRecord()
+          }
+        }
+
         this.prescription = val
 
-      },
+      }
+      ,
       longSolutionFunc: function (val) {
         this.solution = val
+        if (this.status == 2){
+          if(val.creater > 0 && val.modifier == 0){
+            this.requestDialysisRecord()
+          }
 
-      },
+        }else if(this.status == 3){
+          if(val.creater > 0 && val.modifier == 0){
+            this.requestDialysisRecord()
+          }
+        }
+
+      }
+      ,
       closePrescriptionDialog: function () {
         this.closeDialog(1)
         this.scrollToView('prescription')
-      },
+      }
+      ,
       closeAcceptsAssessment: function () {
         this.closeDialog(2)
         this.scrollToView('accepts_assessment')
-      },
+      }
+      ,
       closeAssessmentBefore: function () {
         this.closeDialog(3)
         this.scrollToView('assessment_before')
-      },
+      }
+      ,
       update_evaluation: function (evaluation) {
         this.predialysis_evaluation = evaluation
         this.closeAssessmentBefore()
-      },
+      }
+      ,
       closeStatOrder: function () {
         this.closeDialog(4)
         this.doctor_advices.push([])
         this.scrollToView('stat_order')
-      },
+      }
+      ,
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
         this.scrollToView('dialysis_computer')
-      },
+      }
+      ,
       closeDoubleCheck: function () {
         this.closeDialog(5)
         this.scrollToView('double_check')
-      },
+      }
+      ,
       closeMonitoring: function () {
         this.closeDialog(6)
         this.scrollToView('monitoring')
-      },
+      }
+      ,
       closeDialysisOff: function () {
         this.closeDialog(7)
         this.scrollToView('dialysis_off')
-      },
+      }
+      ,
       closeAssessmentAfter: function (assessment_after_dislysis) {
         this.closeDialog(8)
         this.scrollToView('assessment_after')
         if (assessment_after_dislysis != undefined) {
           this.assessment_after_dislysis = assessment_after_dislysis
         }
-      },
+      }
+      ,
       closeTreatmentOf: function () {
         this.closeDialog(9)
         this.scrollToView('treatment_of')
-      },
+      }
+      ,
       scrollToView: function (id) {
         document.body.scrollTop =
           document.querySelector('#' + id).offsetTop - 100
         document.documentElement.scrollTop =
           document.querySelector('#' + id).offsetTop - 100
-      },
+      }
+      ,
       handleScroll () {
         this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
         if (this.scrollTop > 50) {
@@ -1001,7 +1191,8 @@
         } else {
           this.goTopShow = false
         }
-      },
+      }
+      ,
       goTop () {
         let timer = null,
           _that = this
@@ -1017,10 +1208,13 @@
             _that.goTopShow = false
           }
         })
-      },
+      }
+      ,
       destroyed () {
         window.removeEventListener('scroll', this.handleScroll)
-      }, getUnReadNum () {
+      }
+      ,
+      getUnReadNum () {
         let doctorAdvice = []
         for (let y = 0; y < this.doctor_advices.length; y++) {
           if (this.doctor_advices[y].execution_state == 2) {
@@ -1033,7 +1227,9 @@
 
         return sorted.length
 
-      }, groupBy (array, f) {
+      }
+      ,
+      groupBy (array, f) {
         const groups = {}
         array.forEach(function (o) {
           const group = JSON.stringify(f(o))
@@ -1043,19 +1239,26 @@
         return Object.keys(groups).map(function (group) {
           return groups[group]
         })
-      }, getDeviceNumber () {
+      }
+      ,
+      getDeviceNumber () {
         if (this.dialysis_order.id && this.dialysis_order.DeviceNumber && this.dialysis_order.DeviceNumber.number.length > 0) {
           return this.dialysis_order.DeviceNumber.number
-
         } else {
           if (this.schedual.device_number == null) {
             return ''
           } else {
             return this.schedual.device_number.number
           }
-
         }
-
+      }
+      ,
+      dateDiff (firstDate, secondDate) {
+        var firstDate = new Date(firstDate)
+        var secondDate = new Date(secondDate)
+        var diff = Math.abs(firstDate.getTime() - secondDate.getTime())
+        var result = parseInt(diff / (1000 * 60 * 60 * 24))
+        return result
       }
     }
   }

src/pages/main/today/assessmentAfter.vue

@@ -44,6 +44,13 @@
           <span class="content" id="tw">{{temperature?temperature:''}}</span>
           <span class="unit">{{temperature?"℃":''}}</span>
         </li>
+
+        <li v-if="isShow('呼吸频率')">
+          <label for="ml">呼吸频率 : </label>
+          <span id="ml" class="content">{{breathing_rate?breathing_rate:''}}</span>
+          <span class="unit">{{breathing_rate?"次/min":''}}</span>
+        </li>
+
         <li v-if="isShow('脉搏')">
           <label for="ml">脉搏 : </label>
           <span id="ml" class="content">{{pulse_frequency?pulse_frequency:''}}</span>
@@ -383,6 +390,12 @@
             break;
         }
       },
+      breathing_rate:function(){
+        if (this.record == null || this.record.id == "") {
+          return "-"
+        }
+        return this.record.breathing_rate
+      },
       temperature: function () {
         if (this.record == null || this.record.id == "") {
           return "-"

src/pages/main/today/assessmentBefore.vue

@@ -106,6 +106,12 @@
           <label>血管杂音 : </label>
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
+
+        <li v-if="isShow('穿刺针')">
+          <label>穿刺针 : </label>
+          <span class="content">{{this.record.puncture_needle}}</span>
+        </li>
+
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>

src/pages/main/today/dialysisPrescription.vue

@@ -82,7 +82,12 @@
         <li v-if="isShow('总量')">
           <label>总量: </label>
           <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
-          <span class="unit">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_zongliang != '0'?"IU":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
+
         </li>
         <li v-if="isShow('钠')">
           <label>钠 : </label>

src/pages/main/today/statOrder.vue

@@ -23,7 +23,7 @@
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
-              <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>

src/pages/personal/ElectronicSignature.vue

@@ -131,7 +131,7 @@ export default {
       middleAry: [],
       // 配置参数
       config: {
-        lineWidth: 15,
+        lineWidth: 3,
         lineColor: "#000",
         shadowBlur: 1,
         fillStyle: "#fff"

src/store/index.js

@@ -48,7 +48,7 @@ const getters = {
   ductus_arantii: state => state.global_config.ductus_arantii,
   emergency_treatment: state => state.global_config.emergency_treatment,
   skin: state => state.global_config.skin,
-
+  puncture_needle: state => state.global_config.puncture_needle,
 
 
   dialysis_process: state => state.global_config.dialysis_process,