pad

build/cdn.json

 {
-  "version": "1.0.52"
+  "version": "1.0.55"
 }

src/pages/main/dialog/AssessmentDialog.vue

         </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">
           skin_other:'',
           infect_other:'',
           ductus_arantii_other:'',
+          puncture_needle:'',
 
         },
 
               this.propForm.result = []
             }
             this.propForm.click_ref = 'ductus_arantii'
-            break
+
 
             break
 
             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
 
         }
 
           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

           </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>
           </div>
         </div>
 
+        
+
 
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
         isPremission: false,
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
+        template_id: 0,
+        blood_drawing:100
       }
     },
     props: {
       }
     },
     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)
         }
       }
 
+
+
     },
     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
         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) {
             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

                 <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>
             </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>
             </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>
         currentIndex: -1,
         currentRow: null,
         rowClass: 'row-class-active',
-
+        template_id: 0,
         visibility: false,
         today_last_monitor_record : {},
         propForm: {
     },
     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();
       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
 
           this.today_last_monitor_record = resp.monitor
 
           
-          this.form.operate_time = Date.parse(new Date())
+          // 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.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 = ''// this.last_monitor_record.ultrafiltration_volume;
+          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.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

                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <span>{{ advice.drug_spec }}{{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>

src/pages/main/dialog/PlaneDialog.vue

     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(){
 
   },
   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

             <!--<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">
           intravenous_tube:'',
           dialyzer:'',
           is_eat:'',
+          breathing_rate:'',
         },
 
         record_date: ''
       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

             </tr>
             <tr v-for="(advice, index) in advices" :key="index" :class="{ 'row-class-active': index == current_advice_index }" @click="selectAdviceAction(index, advice)">
               <td :class="{ 'advice_name': advice.parent_id == 0, 'subdrug_name': advice.parent_id > 0 }">{{ advice.advice_name }}</td>
-              <td>{{ advice.drug_spec }}{{advice.drug_spec_unit}}</td>
+              <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
               <td>{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
               <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
               <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>

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

             </div>
             <div class="cell">
               <label>药品规格</label>
-              <!--<input class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
-              <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="单位"

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

                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
-                <td>{{ advice.drug_spec }}{{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>
                 <td
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
                 >{{ subdrug.title }}</td>
-                <td>{{ subdrug.drug_spec }} {{subdrug.drug_spec_unit}}</td>
+                <td>{{ subdrug.advice_desc }} {{subdrug.drug_spec_unit}}</td>
                 <td><span v-if="subdrug.prescribing_number">{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span></td>
                 <td><span v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span></td>
                 <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->

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

               <label>药品规格</label>
               <!--<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="单位"

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

       }, getContent (val) {
         let prescribing_number = ''
         let single_dose = ''
+        let advice_desc = ''
+
         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
         }
+
+        if (val.advice_desc > 0) {
+          advice_desc = val.advice_desc + val.drug_spec_unit
+        }
+
         let name = ""
         if (val.child.length > 0){
           for (let i = 0 ; i < val.child.length; i++){
               val.child[i]['single'] = ''
             }
             name = name+"▲"+val.child[i].advice_name+""
-              + val.child[i].drug_spec
+              + val.child[i].advice_desc
               + val.child[i].drug_spec_unit
               + val.child[i].presc
               + val.child[i].single
           }
-          return  val.advice_name +"  "+ val.drug_spec+" "
+          return  val.advice_name +"  "+advice_desc+" "
             + 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
+          return val.advice_name +"  "+advice_desc
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
         }

src/pages/main/today/TodayTab.vue

     <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" :status="status" :targetAdvices="targetAdvices"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"  :admin_users_prop="admin_users" @advice="adviceFunc"
+                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
+                           :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
+                           :admin_users_prop="admin_users" @advice="adviceFunc"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
                        :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">
     </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>
 
   import MonitDialog from '../dialog/MonitDialog'
   import ComputerDialog from '../dialog/ComputerDialog'
 
-  import {dialysisGlobalConfig, getDialysisRecord,CreateGroupAdvice} from '@/api/dialysis'
+  import {CreateGroupAdvice, dialysisGlobalConfig, getDialysisRecord} from '@/api/dialysis'
   import {GetRemindLongAdvice} from '@/api/advice'
 
   import {parseTime} from '@/utils'
         goodInfos: [],
 
         longAdvices: [],
-        targetAdvices:[],
-        status:'',
+        waitUploadAdvices: [],
+        is_open: 0,
+        targetAdvices: [],
+        status: '',
       }
     },
     computed: {
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
-      // this.requestLongAdvice()
+      this.requestLongAdvice()
 
     },
     mounted () {
         // }
         this.monitor_records.reverse()
         this.last_monitor_record = monitor
+        this.$refs.plane_dialog.set_last_monitor_record(monitor)
       },
 
       didEditMonitor (monitor) {
 
             switch (status) {
               case 2:
-                this.longAdvices = resp.data.advices
-
+                var totalAdvice = resp.data.advices
                 var longAdvicesTwo = resp.data.advices_two
+                var waitUploadAdvices = []
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  totalAdvice[i]['isCheck'] = 1
 
-                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
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  for (let a = 0; a < longAdvicesTwo.length; a++) {
+                    if (totalAdvice[i].template_id == longAdvicesTwo[a].template_id) {
+                      totalAdvice[i]['isCheck'] = 0
+                    }
                   }
                 }
 
-                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
-                  }
+                for (let i = 0; i < totalAdvice.length; i++) {
+                    if( totalAdvice[i].isCheck == 1){
+                      waitUploadAdvices.push(totalAdvice[i])
+                    }
                 }
-                this.targetAdvices = dayAdvices.concat(advices_two)
+
+
+                this.is_open = resp.data.is_open_remind
+                this.longAdvices = totalAdvice
+                this.waitUploadAdvices = waitUploadAdvices
+                console.log(this.longAdvices)
+                console.log(this.waitUploadAdvices)
+
                 break
+
             }
           } else {
 
           }
         })
+
       }, getNowFormatDate () {
         var date = new Date()
         var seperator1 = '-'
           }
         )
       }
-      ,adviceFunc:function(){
-
+      , adviceFunc: function () {
 
       },
       prescriptionFunc: function (val) {
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        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){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        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){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }

src/pages/main/today/assessmentAfter.vue

           <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>
             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

           <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/statOrder.vue

             <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.drug_spec}}{{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

       </h1>
       <div class="information">
         <div class="blueBorder"></div>
-        <div class="name" v-show="showpan == 'canvas'">
+        <div
+          class="name"
+          v-show="showpan == 'canvas'"
+          style="display:fixed;width:100%;left:0;top:0;"
+        >
           <canvas
             id="canvas"
             class="fl"
             width="600"
             height="400"
+            disable-scroll="true"
             @mousedown="canvasDown($event)"
             @mouseup="canvasUp($event)"
             @mousemove="canvasMove($event)"
       height: 400px;
       margin: 0 auto;
       border-radius: 4px;
+
       @media only screen and (max-width: 812px) {
         width: 500px !important;
         height: 200px !important;

src/store/index.js

   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,

src/styles/style.scss

       background: -webkit-linear-gradient(#dfe4ea, #ebf1f7);
     }
     .DialogContent {
-      height: 6.8rem;
+      height: 8.8rem;
       overflow-y: scroll;
       background: #fff;
       @media only screen and (max-width: 812px) {