Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1201,7 +1201,7 @@
                         压迫后内瘘震颤：
                         <label-box
                           :isChecked="
-                            record.assessment_before_dislysis.internal_fistula.indexOf(
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
                               '震颤-存在'
                             ) > -1
                               ? true
@@ -1211,7 +1211,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            record.assessment_before_dislysis.internal_fistula.indexOf(
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
                               '震颤-减弱'
                             ) > -1
                               ? true
@@ -1221,7 +1221,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            record.assessment_before_dislysis.internal_fistula.indexOf(
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
                               '震颤-无'
                             ) > -1
                               ? true

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -665,13 +665,13 @@
                 <td width="10"></td>
                 <td width="105">压迫后内瘘震颤:</td>
                 <td width="140">
-                  <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-存在')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-存在')>-1?true:false"
                                showValue='存在'></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱')>-1?true:false"
+                    <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-减弱')>-1?true:false"
                                showValue='减弱'></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-无')>-1?true:false"
+                    <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-无')>-1?true:false"
                                showValue='无'></label-box>
                 </td>
                 <td width="">