Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -294,10 +294,7 @@
                   </div>
                 </div>
 
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div
@@ -1389,10 +1386,7 @@
                     min
                   </div>
                 </div>
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <div  class="row"  style="padding: 2px 0;line-height:23px;display:flex;"  >
                   <div class="inline_block" style="flex:2;">
                     凝血程度：
                     <div

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1647,7 +1647,7 @@
         if (this.receiverTreatmentAccess.condition == 1) {
           this.patientInfo_source_1 = false
           this.patientInfo_source_2 = true
-        } else if (this.receiverTreatmentAccess.source == 2) {
+        } else if (this.receiverTreatmentAccess.condition == 2) {
           this.patientInfo_source_2 = false
           this.patientInfo_source_1 = true
         } else {