新分支

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

@@ -494,6 +494,7 @@ export default {
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
+    this.form.schedual_type = this.dialysis_order.schedule_type
     this.punctureNeedleOptions = getDataConfig(
       "hemodialysis",
       "puncture_needle"
@@ -808,7 +809,7 @@ export default {
           this.schedual_type = 3;
         }
       } else {
-        this.schedual_type = this.dialysis_order.schedual_type;
+        this.schedual_type = this.dialysis_order.schedule_type;
       }
 
       if (this.dialysis_order.id > 0) {

src/xt_pages/workforce/remind_print_setting.vue

@@ -127,7 +127,9 @@
                  <div>
                   <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器:</span>
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
-                  <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                  <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
+
+                  <span v-if="org_id == 10440 && main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                 </div>
                 <div v-if="printObj.doctor_advice == 1">
                     医嘱：
@@ -135,7 +137,7 @@
                 </div>
                 
                
-                <div>打印时间:{{currentDate}}</div>
+                <div v-if="org_id!=10440&&org_id!=0">打印时间:{{currentDate}}</div>
               </div>
 
               <div class="signPrint" style="font-size:16px;" v-else>
@@ -650,6 +652,29 @@
         if(name == 7){
          name = "低分子肝素钠"
        }
+       if(name == 8){
+         name = "依诺肝素"
+       }
+
+       if(name == 9){
+         name = "达肝素"
+       }
+       if(name == 10){
+         name = "体外抗凝"
+       }
+
+       if(name == 11){
+         name = "那屈肝素"
+       }
+
+       if(name == 12){
+         name = "无抗凝剂"
+       }
+       if(name == 13){
+         name = "那屈肝素钙"
+       }
+
+
 
        return name
      },