Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13800"
+  "version": "2999.999.13713"
 }

src/pages/main/PatientBox.vue

@@ -468,7 +468,7 @@
                 </span>
               </p>
 
-              <p v-if="$store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10612 || $store.getters.user.template_info.org_id == 10598 || $store.getters.user.template_info.org_id == 10679 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10702 ">
+              <p v-if="$store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10612 || $store.getters.user.template_info.org_id == 10598 || $store.getters.user.template_info.org_id == 10679 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10702|| $store.getters.user.template_info.org_id == 10745">
                 处方脱水量:
                   <span>{{patient.prescription? patient.prescription.prescription_water: ""}}L</span>
               </p>

src/pages/main/WaitingArea.vue

@@ -1473,7 +1473,7 @@ export default {
           item.sort = item.device_number.sort
         })
        
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10702 && this.$store.getters.user.template_info.org_id != 10740) {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587 || this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10599 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10740 || this.$store.getters.user.template_info.org_id == 10679) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4

src/pages/main/newActionBar/computer.vue

@@ -808,6 +808,8 @@ export default {
       this.record == null || this.record.id == ""
         ? this.$store.getters.user.admin.id
         : this.record.puncture_nurse;
+    console.log("穿刺==================",this.puncture_nurse)
+    console.log("admin_map----------------",this.admins)
     this.washpipe_nurse =
       this.record == null || this.record.id == ""
         ? this.$store.getters.user.admin.id

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -2248,7 +2248,7 @@ export default {
             if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
             }
-          }else if(this.$store.getters.user.template_info.org_id == 10731){
+          }else if(this.$store.getters.user.template_info.org_id == 10164){
             if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
             }

src/pages/main/newActionBar/doubleCheck.vue

@@ -34,7 +34,7 @@
                       <van-checkbox name="a">透析模式:<span v-if="prescription_prop!=null">{{getMode(prescription_prop.mode_id)}}</span></van-checkbox>
                       <van-checkbox name="b">透析时长:<span v-if="prescription_prop!=null">{{prescription_prop.dialysis_duration_hour}}小时{{prescription_prop.dialysis_duration_minute}}分</span></van-checkbox>
                       <van-checkbox name="c">目标超滤量:<span v-if="prescription_prop!=null">{{prescription_prop.target_ultrafiltration?prescription_prop.target_ultrafiltration:""}} </span> <span v-if="org_id==10617">L</span></van-checkbox>
-                      <van-checkbox name="m" v-if="org_id ==10469 || org_id ==10597 || org_id ==10679 || org_id ==10702">处方脱水量:<span v-if="prescription_prop!=null">{{prescription_prop.prescription_water?prescription_prop.prescription_water:""}}</span></van-checkbox>
+                      <van-checkbox name="m" v-if="org_id ==10469 || org_id ==10597 || org_id ==10679 || org_id ==10702 || org_id == 10745">处方脱水量:<span v-if="prescription_prop!=null">{{prescription_prop.prescription_water?prescription_prop.prescription_water:""}}</span></van-checkbox>
                       <van-checkbox name="d">抗凝剂:<span v-if="prescription_prop!=null">{{getAnticoagulant(prescription_prop.anticoagulant)}}</span></van-checkbox>
                       <van-checkbox name="e">首剂:<span v-if="prescription_prop!=null">{{prescription_prop.anticoagulant_shouji}}</span></van-checkbox>
                       <van-checkbox name="f">维持:<span v-if="prescription_prop!=null">{{prescription_prop.anticoagulant_weichi}}</span></van-checkbox>

src/pages/main/today/dialysisPrescription.vue

@@ -136,7 +136,8 @@
           <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
           <span v-if="this.$store.getters.user.template_info.org_id == 10013 || this.$store.getters.user.template_info.org_id == 10014">
              <span class="unit" v-if="this.prescription.anticoagulant == 2">iu/h</span>
-             <span class="unit" v-if="this.prescription.anticoagulant != 2"> ml/h</span>
+             <span class="unit" v-if="this.prescription.anticoagulant == 15">mg/h</span>
+             <span class="unit" v-if="this.prescription.anticoagulant != 2&& this.prescription.anticoagulant != 15"> ml/h</span>
           </span>
           <span v-if="this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.template_id == 45">
             <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>