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/batch_print/batch_print_order_other.vue

@@ -1579,33 +1579,33 @@
                       <div class="inline_block">
                         内瘘震颤和血管杂音:
                         <check-box
-                          text="存在"
+                          text="正常"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'tremor_noise',
-                              1
-                            )
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                              '正常'
+                            ) > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                         <check-box
                           text="减弱"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'tremor_noise',
-                              2
-                            )
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                              '减弱'
+                            ) > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                         <check-box
                           text="不存在"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'tremor_noise',
-                              3
-                            )
+                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                              '不存在'
+                            ) > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                       </div>
@@ -1614,22 +1614,21 @@
                         <check-box
                           text="无"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'disequilibrium_syndrome',
-                              1
-                            )
-                          "
+                      record.assessment_after_dislysis.complication.indexOf('无') > -1
+                          ? true
+                          : false
+                      "
                         ></check-box>
                         <check-box
                           text="有"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'disequilibrium_syndrome',
-                              2
-                            )
-                          "
+                        record.assessment_after_dislysis.complication.indexOf('头晕') > -1 ||
+                         record.assessment_after_dislysis.complication.indexOf('头痛') > -1||
+                           record.assessment_after_dislysis.complication.indexOf('呕吐') > -1||
+                             record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false
+                      "
                         ></check-box>
                       </div>
                       <div class="inline_block">
@@ -1639,7 +1638,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_after_dislysis,
-                              'disequilibrium_syndrome_option',
+                              'complication',
                               '头晕'
                             )
                           "
@@ -1649,7 +1648,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_after_dislysis,
-                              'disequilibrium_syndrome_option',
+                              'complication',
                               '头痛'
                             )
                           "
@@ -1659,7 +1658,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_after_dislysis,
-                              'disequilibrium_syndrome_option',
+                              'complication',
                               '呕吐'
                             )
                           "
@@ -1669,7 +1668,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_after_dislysis,
-                              'disequilibrium_syndrome_option',
+                              'complication',
                               '低血压'
                             )
                           "

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="">