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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.98"
+  "version": "1.0.104"
 }

src/pages/main/DialysisArea.vue

@@ -65,6 +65,10 @@
             我的病人
             <span class="iconfont">&#xe74a;</span>
           </li>
+          <!--<li @click="clearPatient()">-->
+            <!--全部病人-->
+            <!--<span class="iconfont">&#xe74a;</span>-->
+          <!--</li>-->
 
         </ul>
       </div>
@@ -336,6 +340,17 @@ export default {
     this.timer = null
   },
   methods: {
+    clearPatient(){
+      this.search_keyword = ''
+      this.ismypatient = false
+      this.$emit('clear_search_keyword')
+      this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
+        zone: this.zone_selected,
+        schedule_type: this.schedual_type_selected,
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
+      })
+    },
     mypatient () {
       this.search_keyword = ''
       this.ismypatient = true
@@ -366,9 +381,7 @@ export default {
       })
     },
     handleZoneChange: function (index) {
-      if(!this.ismypatient){
-        this.ismypatient = false
-      }
+      this.ismypatient = false
       this.zone_options_visible = false
       this.zone_selected = index
       this.$emit('clear_search_keyword')

src/pages/main/dialog/OrdersDialog.vue

@@ -80,6 +80,7 @@
                     <span>{{advice.advice_name }}</span>
                     <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
                     <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                    <span v-if="advice.single_dose && template_id == 6" >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
                     <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>

src/pages/main/dialog/PlaneDialog.vue

@@ -1,256 +1,281 @@
 <template>
- <div>
+  <div>
     <div class="Dialog" v-show="!selecting">
-        <div class="DialogTit">
-            <span @click="close()" class="iconfont">&#xe6e9;</span>
-            <h1 class="name">透析下机</h1>
-            <span class="success" v-if="this.record.state == 1 || this.$store.getters.user.user.id != this.creator"></span>
-            <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
+      <div class="DialogTit">
+        <span @click="close()" class="iconfont">&#xe6e9;</span>
+        <h1 class="name">透析下机</h1>
+        <span class="success" v-if="this.record.state == 1 || this.$store.getters.user.user.id != this.creator"></span>
+        <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
 
-        </div>
+      </div>
 
-        <div class="DialogContent ">
-          <div class="item" @click="select_nurse">
-            <h2 class="name">下机护士</h2>
-            <div class="content">
-              <span class="text" style="width: 100px">{{ nurse_id == 0 ? '' : admin_map[nurse_id].name }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+      <div class="DialogContent ">
+        <div class="item" @click="select_nurse">
+          <h2 class="name">下机护士</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{ nurse_id == 0 ? '' : admin_map[nurse_id].name }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
 
-          <div class="item">
-            <h2 class="name">下机时间</h2>
-            <div class="content">
-              <span class="text" style="width: 100px"  @click="selectStartTimeAction">{{ end_time_str }}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
+        <div class="item">
+          <h2 class="name">下机时间</h2>
+          <div class="content">
+            <span class="text" style="width: 100px" @click="selectStartTimeAction">{{ end_time_str }}</span>
+            <span class="iconfont">&#xe6f9;</span>
           </div>
+        </div>
 
-          <div class="perform">
-            <button @click="commitInfo" v-show="(record != null && record.id != '' && record.stage == 1)">执行下机</button>
-            <button :disabled="true" style="background-color:lightgray;" v-show="(record != null && record.id != '' && record.stage == 2)">已下机</button>
-            <button :disabled="true" style="background-color:lightgray;" v-show="record == null || record.id == ''">未上机</button>
-          </div>
+        <div class="perform">
+          <button @click="commitInfo" v-show="(record != null && record.id != '' && record.stage == 1)">执行下机</button>
+          <button :disabled="true" style="background-color:lightgray;"
+                  v-show="(record != null && record.id != '' && record.stage == 2)">已下机
+          </button>
+          <button :disabled="true" style="background-color:lightgray;" v-show="record == null || record.id == ''">未上机
+          </button>
         </div>
+      </div>
     </div>
     <two-menu ref="selector"></two-menu>
-   <mt-datetime-picker
-     ref="start_time_picker"
-     type="datetime"
-     @confirm="didSelectStartTime"
-     v-model="end_time"
-   ></mt-datetime-picker>
+    <mt-datetime-picker
+      ref="start_time_picker"
+      type="datetime"
+      @confirm="didSelectStartTime"
+      v-model="end_time"
+    ></mt-datetime-picker>
   </div>
 </template>
 
 <script>
-  import {
-    finish,PostModifyEndDialysis
-  } from "@/api/dialysis";
-  import { Toast } from 'vant';
+  import {finish, PostModifyEndDialysis} from '@/api/dialysis'
+  import {Toast} from 'vant'
   import TwoMenu from './TwoMenu'
-  import { parseTime } from "@/utils";
+  import {parseTime} from '@/utils'
 
   export default {
-  name: "PlaneDialog",
-  components: {
-    TwoMenu
-  },
-  data() {
-    return {
-      selecting: false,
-      end_time_str: "",
-      end_time:new Date(),
-      nurse_id: 0,
-      isPremission:false,
-      creator:0,
-    }
-  },
-  props:{
-    patient_prop: {
-      type: Object,
-    },
-    record: {
-      type: Object,
-    },
-    admins: {
-      type: Array,
+    name: 'PlaneDialog',
+    components: {
+      TwoMenu
     },
-    admin_map: {
-      type: Object,
-    },
-    special_premission: {
-      type: Array,
-    },
-    last_monitor_record: {
-      type: Object,
-    }
-  },mounted() {
-      if(this.last_monitor_record.id == 0){
-        this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-      }else{
-        this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    data () {
+      return {
+        selecting: false,
+        end_time_str: '',
+        end_time: new Date(),
+        nurse_id: 0,
+        isPremission: false,
+        creator: 0,
       }
     },
-  created(){
-    var date = this.$route.query && this.$route.query.date;
-    date *= 1000;
-    var newDate = new Date(date);
-    var y = newDate.getFullYear();
-    var m = newDate.getMonth() + 1;
-    var d = newDate.getDate();
-    if (isNaN(y) || isNaN(m) || isNaN(d)) {
-      newDate = new Date();
-      y = newDate.getFullYear();
-      m = newDate.getMonth() + 1;
-      d = newDate.getDate();
-    }
-    this.record_date = y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
-
-    if (this.record == null || this.record.id == '') {
-      this.nurse_id = 0
-    } else if (this.record.stage == 1) {
-      this.nurse_id = this.$store.getters.user.user.id
-    } else {
-      this.nurse_id = this.record.finish_nurse
-    }
+    props: {
+      prescription_prop: {
+        type: Object,
+      },
+      patient_prop: {
+        type: Object,
+      },
+      record: {
+        type: Object,
+      },
+      admins: {
+        type: Array,
+      },
+      admin_map: {
+        type: Object,
+      },
+      special_premission: {
+        type: Array,
+      },
+      last_monitor_record: {
+        type: Object,
+      }
+    }, mounted () {
+      if (this.record.id == '') { //没有上下机记录
+        this.end_time_str = parseTime(Date.parse(new Date()) / 1000, '{y}-{m}-{d} {h}:{i}') + ':00'
+      } else {
+        if (this.record.start_time > 0) {
+          if(this.prescription_prop.id != ""){
+            let endTime = 0
+            endTime = this.record.start_time + this.prescription_prop.dialysis_duration_hour * 3600 + this.prescription_prop.dialysis_duration_minute * 60
+            this.end_time_str = parseTime(endTime, '{y}-{m}-{d} {h}:{i}') + ':00'
+          }else{
+            this.end_time_str = parseTime(Date.parse(new Date()) / 1000, '{y}-{m}-{d} {h}:{i}') + ':00'
+          }
+          if(this.record.end_time > 0){
+            this.end_time_str = parseTime(this.record.end_time , '{y}-{m}-{d} {h}:{i}') + ':00'
+          }
+        } else {
+          this.end_time_str = parseTime(Date.parse(new Date()) / 1000, '{y}-{m}-{d} {h}:{i}') + ':00'
+        }
+      }
+      this.end_time = this.end_time_str
 
-    console.log("下机:"+this.nurse_id)
+      // if(this.record.idthis.record.end_time == 0)
 
-    if (this.record.id > 0) {
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-          this.isPremission = true
-        }
+      // if(this.last_monitor_record.id == 0){
+      //
+      //   this.end_time_str = parseTime(this.last_monitor_record.operate_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      // }else{
+      //   this.end_time_str = parseTime(this.end_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      //
+      // }
+    },
+    created () {
+      var date = this.$route.query && this.$route.query.date
+      date *= 1000
+      var newDate = new Date(date)
+      var y = newDate.getFullYear()
+      var m = newDate.getMonth() + 1
+      var d = newDate.getDate()
+      if (isNaN(y) || isNaN(m) || isNaN(d)) {
+        newDate = new Date()
+        y = newDate.getFullYear()
+        m = newDate.getMonth() + 1
+        d = newDate.getDate()
       }
-    }
+      this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
 
-    if (this.record.id > 0) {
-      if (this.record.finish_creator == 0) {
-        this.creator = this.record.finish_nurse
+      if (this.record == null || this.record.id == '') {
+        this.nurse_id = 0
+      } else if (this.record.stage == 1) {
+        this.nurse_id = this.$store.getters.user.user.id
       } else {
-        this.creator = this.record.finish_creator
+        this.nurse_id = this.record.finish_nurse
       }
-    }
 
+      if (this.record.id > 0) {
+        for (let i = 0; i < this.special_premission.length; i++) {
+          if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
+            this.isPremission = true
+          }
+        }
+      }
 
-  },
-  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
-      ParamsQuery["nurse"] = this.nurse_id
-      ParamsQuery["end_time"] = this.end_time_str
-      PostModifyEndDialysis(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          Toast.fail(response.data.msg)
-          return false
+      if (this.record.id > 0) {
+        if (this.record.finish_creator == 0) {
+          this.creator = this.record.finish_nurse
         } else {
-          Toast.success('修改成功')
-          this.$emit('did_off', response.data.data.dialysis_order)
-          var record = this.record
-          for (const key in response.data.data.dialysis_order) {
-            this.$set(record, key, response.data.data.dialysis_order[key])
-          }
+          this.creator = this.record.finish_creator
         }
-      })
-    },
-    didSelectStartTime: function(time) {
-      this.end_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      }
+
     },
-    selectStartTimeAction: function() {
-      if (this.record.id != 0) {
-        if(this.record.end_time > 0){
-          var creator = 0
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse
+    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
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['end_time'] = this.end_time_str
+        PostModifyEndDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
           } else {
-            creator = this.record.finish_creator
+            Toast.success('修改成功')
+            this.$emit('did_off', response.data.data.dialysis_order)
+            var record = this.record
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key])
+            }
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.$refs.start_time_picker.open()
+        })
+      },
+      didSelectStartTime: function (time) {
+        this.end_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
+      },
+      selectStartTimeAction: function () {
+        if (this.record.id != 0) {
+          if (this.record.end_time > 0) {
+            var creator = 0
+            if (this.record.finish_creator == 0) {
+              creator = this.record.finish_nurse
+            } else {
+              creator = this.record.finish_creator
+            }
+            if (this.$store.getters.user.user.id == creator || this.isPremission) {
+              this.$refs.start_time_picker.open()
+            } else {
+              return
+            }
           } else {
-            return
+            this.$refs.start_time_picker.open()
           }
-        }else{
-          this.$refs.start_time_picker.open();
+        } else {
+          this.$refs.start_time_picker.open()
         }
-      }else{
-        this.$refs.start_time_picker.open();
-      }
 
-    },
-    commitInfo: function () {
-      Toast.loading({forbidClick: true, duration: 0})
-      let ParamsQuery = {}
-      ParamsQuery['patient'] = this.patient_prop.id
-      ParamsQuery['record_date'] = this.record_date
-      ParamsQuery["nurse"] = this.nurse_id
-      ParamsQuery["end_time"] = this.end_time_str
+      },
+      commitInfo: function () {
+        Toast.loading({forbidClick: true, duration: 0})
+        let ParamsQuery = {}
+        ParamsQuery['patient'] = this.patient_prop.id
+        ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['end_time'] = this.end_time_str
 
-      finish(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          Toast.fail(response.data.msg);
-          return false;
-        } else {
-          Toast.success("下机成功");
-          this.$emit('did_off', response.data.data.assessmentAfterDislysis);
-          var record = this.record
-          for (const key in response.data.data.dialysisOrder) {
-            this.$set(record, key, response.data.data.dialysisOrder[key])
-            // record[key] = response.data.data.dialysisOrder[key]
-          }
-          // console.log(this.record)
-        }
-      });
-    },
-    close: function() {
-      this.$emit('close')
-    },
-    select_nurse: function() {
-      if (this.record != null && this.record.id != '') {
-        if(this.record.stage == 1){
-          this.selecting = true
-          var t = this
-          this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
-            console.log("nurse id: ", select_id)
-            t.nurse_id = select_id
-          }, function() {
-            t.selecting = false
-          })
-        }else{
-          var creator = 0
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse
+        finish(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
           } else {
-            creator = this.record.finish_creator
+            Toast.success('下机成功')
+            this.$emit('did_off', response.data.data.assessmentAfterDislysis)
+            var record = this.record
+            for (const key in response.data.data.dialysisOrder) {
+              this.$set(record, key, response.data.data.dialysisOrder[key])
+              // record[key] = response.data.data.dialysisOrder[key]
+            }
+            // console.log(this.record)
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+        })
+      },
+      close: function () {
+        this.$emit('close')
+      },
+      select_nurse: function () {
+        if (this.record != null && this.record.id != '') {
+          if (this.record.stage == 1) {
             this.selecting = true
             var t = this
-            this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择下机护士", "name", "id", function(select_id) {
-              console.log("nurse id: ", select_id)
+            this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择下机护士', 'name', 'id', function (select_id) {
+              console.log('nurse id: ', select_id)
               t.nurse_id = select_id
-            }, function() {
+            }, function () {
               t.selecting = false
             })
           } else {
-            return
+            var creator = 0
+            if (this.record.finish_creator == 0) {
+              creator = this.record.finish_nurse
+            } else {
+              creator = this.record.finish_creator
+            }
+            if (this.$store.getters.user.user.id == creator || this.isPremission) {
+              this.selecting = true
+              var t = this
+              this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择下机护士', 'name', 'id', function (select_id) {
+                console.log('nurse id: ', select_id)
+                t.nurse_id = select_id
+              }, function () {
+                t.selecting = false
+              })
+            } else {
+              return
+            }
           }
-        }
 
+        }
+      },
+      open: function () {
+        this.selecting = false
+        this.$refs.selector.hide()
       }
-    },
-    open:function(){
-      this.selecting = false;
-      this.$refs.selector.hide();
-    }
-  }, watch: {
+    }, watch: {
       'record.stage': function (val) {
         if (val == 2) {
           for (let i = 0; i < this.special_premission.length; i++) {
@@ -268,33 +293,32 @@
         console.log(this.creator)
         console.log(this.$store.getters.user.user.id)
 
-
       }
 
     }
-};
+  }
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
 
-.perform{
+  .perform{
   text-align: center;
   font-size: 0.3rem;
   padding-top: 2rem;
   .crew{
-    color: $pgh-color;
+  color: $pgh-color;
   }
   button{
-    background:$main-color;
-    color: #fff;
-    font-size: 0.3rem;
-    text-align:center;
-    width: 3rem;
-    height: 0.7rem;
-    line-height: 0.7rem;
-    border-radius:4px;
-    margin-top:10px;
+  background:$main-color;
+  color: #fff;
+  font-size: 0.3rem;
+  text-align:center;
+  width: 3rem;
+  height: 0.7rem;
+  line-height: 0.7rem;
+  border-radius:4px;
+  margin-top:10px;
+  }
   }
-}
 </style>
 

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1080,14 +1080,14 @@
       },
       commitInfo: function () {
 
-        if(this.$store.getters.user.template_info.template_id == 6) {
-          if (this.dialysisPrescription.mode_id == 2) {
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
-              Toast.fail("HDF模式下置换方式和置换量不能为空！")
-              return
-            }
-          }
-        }
+        // if(this.$store.getters.user.template_info.template_id == 6) {
+        //   if (this.dialysisPrescription.mode_id == 2) {
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空！")
+        //       return
+        //     }
+        //   }
+        // }
 
         this.is_pre = 1
         if (this.prescription_prop.id == '') {
@@ -1375,14 +1375,14 @@
 
         }
       }, commitSolutionInfo: function () {
-        if(this.$store.getters.user.template_info.template_id == 6) {
-          if (this.dialysisPrescription.mode_id == 2) {
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
-              Toast.fail("HDF模式下置换方式和置换量不能为空！")
-              return
-            }
-          }
-        }
+        // if(this.$store.getters.user.template_info.template_id == 6) {
+        //   if (this.dialysisPrescription.mode_id == 2) {
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空！")
+        //       return
+        //     }
+        //   }
+        // }
         this.is_pre = 2
 
         if (this.prescription_prop.id == '') {
@@ -1933,12 +1933,33 @@
     },
     watch: {
       "dialysisPrescription.anticoagulant_shouji":function(val){
-        console.log(val)
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+         console.log(this.dialysisPrescription.anticoagulant_shouji)
+        console.log(this.dialysisPrescription.anticoagulant_weichi)
+
+        if(this.dialysisPrescription.anticoagulant_shouji == "" && this.dialysisPrescription.anticoagulant_weichi == ""){
+            this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
+          }else if(this.dialysisPrescription.anticoagulant_shouji != "" && this.dialysisPrescription.anticoagulant_weichi != "" ){
+            this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+          }else if(this.dialysisPrescription.anticoagulant_shouji != "" && this.dialysisPrescription.anticoagulant_shouji == ""){
+            this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
+          }else if(this.dialysisPrescription.anticoagulant_shouji == "" && this.dialysisPrescription.anticoagulant_shouji != ""){
+            this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
+
+          }
 
       }, "dialysisPrescription.anticoagulant_weichi":function(val){
-        console.log(val)
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        console.log(this.dialysisPrescription.anticoagulant_shouji)
+        console.log(this.dialysisPrescription.anticoagulant_weichi)
+        if(this.dialysisPrescription.anticoagulant_shouji == "" && this.dialysisPrescription.anticoagulant_weichi == ""){
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(0)
+        }else if(this.dialysisPrescription.anticoagulant_shouji != "" && this.dialysisPrescription.anticoagulant_weichi != "" ){
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        }else if(this.dialysisPrescription.anticoagulant_shouji != "" && this.dialysisPrescription.anticoagulant_shouji == ""){
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(0)
+        }else if(this.dialysisPrescription.anticoagulant_shouji == "" && this.dialysisPrescription.anticoagulant_shouji != ""){
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(0) + parseInt(this.dialysisPrescription.anticoagulant_shouji)
+
+        }
       },
 
       isShowDialog (val) {

src/pages/main/today/TodayTab.vue

@@ -186,7 +186,7 @@
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
       <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"
+                    :special_premission="special_premission"  :prescription_prop="prescription"
                     @did_off="closeDialysisOff" @close="closeDialysisOffclose" ref="plane_dialog"></plane-dialog>
     </van-popup>
 

src/pages/main/today/statOrder.vue

@@ -25,7 +25,10 @@
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_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>
+              <!--<span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>-->
+              <!--<span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>-->
+              <span v-if="advice.single_dose && template_id == 6" >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+              <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
               <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
               <span v-if="advice.parent_id == 0&&advice.remark.length > 0">({{advice.remark}})</span>