Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/store/modules/globalConfig.js

         zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      8: {
+        id: 8,
+        name: '依诺肝素',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

               <el-input v-model="form.weight_after"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8" v-if="isShow('衣物重')">
+            <el-form-item label="衣物重(kg): ">
+              <el-input v-model="form.additional_weight"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="20">
         supine_systolic_blood_pressure:'',
         setting_pressure:'',
         supine_diastolic_blood_pressure:'',
-        diastolic_pressure:''
+        diastolic_pressure:'',
+        additional_weight:'',
       }
     }
   },
       data['setting_pressure'] = this.form.setting_pressure
       data["supine_diastolic_blood_pressure"] = this.form.supine_diastolic_blood_pressure
       data["diastolic_pressure"] = this.form.diastolic_pressure
+      data["additional_weight"] = this.form.additional_weight ? parseFloat(this.form.additional_weight) : 0
       console.log('data', data)
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

             <td>
               &nbsp;{{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }}
             </td>
-            <td>&nbsp;</td>
+            <td>&nbsp;{{monitor.blood_sugar?monitor.blood_sugar:""}}</td>
             <td style="text-align:left;line-height:20px;">
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyThree.vue

                     <td width="20">
                         <span v-if="prescription.anticoagulant == 5">mg</span>
                         <span v-if="prescription.anticoagulant == 4">mg</span>
+                        <span v-if="prescription.anticoagulant == 8">iu</span>
                         <span v-if="prescription.anticoagulant == 3">iu</span>
                         <span v-if="prescription.anticoagulant == 2">mg</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>
                     <td width="40">
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                         <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                        <span v-if="prescription.anticoagulant == 8">iu/h</span>
                         <span v-if="prescription.anticoagulant == 3">iu/h</span>
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="prescription.anticoagulant == 1">mg/h</span>
                     <td width="20">
                         <span v-if="prescription.anticoagulant == 5">mg</span>
                         <span v-if="prescription.anticoagulant == 4">mg</span>
+                        <span v-if="prescription.anticoagulant == 8">iu</span>
                         <span v-if="prescription.anticoagulant == 3">iu</span>
                         <span v-if="prescription.anticoagulant == 2">mg</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>

src/xt_pages/user/components/PatientForm.vue

           if (this.isEdit) {
             this.form.age = parseInt(this.form.age);
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
-
+            this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
             editPatient(this.patientID, this.form)
+
               .then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);