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

src/pages/main/dialog/PrescriptionDialog.vue

@@ -2116,10 +2116,7 @@
     },
     created () {
       this.template_id = this.$store.getters.user.template_info.template_id
-      if (this.$store.getters.user.user.user_type == 2) {
-        this.isShowSign = true
 
-      }
       this.modeOption = this.$store.getters.treatment_mode
       delete this.modeOption['0']
 
@@ -2157,10 +2154,6 @@
 
       }
 
-
-
-
-
       if (this.dialysisPrescription.dialysis_duration_hour.length == 0 || this.dialysisPrescription.dialysis_duration_minute.length == 0) {
         this.timeValue = ''
         this.time = '03:00'
@@ -2189,20 +2182,6 @@
         y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
       // this.patient.id = this.patient_prop.id
 
-      if (this.dialysisPrescription.prescription_doctor == '') {
-        this.isShowDesc = true
-        this.isShowDoctorSign = false
-      } else {
-        this.isShowDesc = false
-        this.isShowDoctorSign = true
-
-        for (let i = 0; i < this.operators.length; i++) {
-          if (this.operators[i].creator == this.dialysisPrescription.prescription_doctor) {
-            this.signUrl = this.operators[i].url
-          }
-        }
-
-      }
       this.dialysisPrescription.kalium = this.getFloat(this.dialysisPrescription.kalium)
       this.dialysisPrescription.sodium = this.getFloat(this.dialysisPrescription.sodium)
       this.dialysisPrescription.calcium = this.getFloat(this.dialysisPrescription.calcium)

src/pages/main/today/assessmentBefore.vue

@@ -212,6 +212,18 @@
           <span class="content">{{ skin_other }}</span>
           <span class="unit"> </span>
         </li>
+
+        <li  v-if="isShow('血管通路部位')">
+          <label>血管通路部位:</label>
+          <span class="content">{{ getBloodAccessPart(this.record.blood_access_part_id) }}</span>
+          <span class="unit"> </span>
+        </li>
+
+        <li  v-if="isShow('血管通路操作')">
+          <label>血管通路操作:</label>
+          <span class="content">{{ getBloodAccessOpera(this.record.blood_access_part_opera_id) }}</span>
+          <span class="unit"> </span>
+        </li>
       </ul>
     </div>
     <div class="note">
@@ -221,8 +233,11 @@
 </template>
 
 <script>
-export default {
+  import { getDataConfig } from "@/utils/data";
+
+  export default {
   name: "assessmentBefore",
+
   data() {
     return {
       title: "透前评估 ",
@@ -434,6 +449,26 @@ export default {
     }
   },
   methods: {
+    getBloodAccessPart: function(id) {
+      var BloodAccessPart = getDataConfig('hemodialysis', 'vascular_access')
+      var BloodAccessPartName = ''
+      for (let i = 0; i < BloodAccessPart.length; i++) {
+        if (BloodAccessPart[i].id == id) {
+          BloodAccessPartName = BloodAccessPart[i].name
+        }
+      }
+      return BloodAccessPartName
+    },
+    getBloodAccessOpera: function(id) {
+      var BloodAccessOpera =  getDataConfig('hemodialysis', 'vascular_access_desc')
+      var BloodAccessOperaName = ''
+      for (let i = 0; i < BloodAccessOpera.length; i++) {
+        if (BloodAccessOpera[i].id == id) {
+          BloodAccessOperaName = BloodAccessOpera[i].name
+        }
+      }
+      return BloodAccessOperaName
+    },
     isShow(name) {
       var filedList = this.$store.getters.user.fileds;