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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -336,7 +336,7 @@
                                         </div>
                                     </div>
                                     <div class="row" style="padding: 2px 0;">
-                                        其他记录：<div class="under_line" style="width: 830px;">{{complicationsOther(record.assessment_after_dislysis)}}</div>
+                                        透析小结：<div class="under_line" style="width: 830px;">{{complicationsOther(record.assessment_after_dislysis)}}</div>
                                     </div>
                                     <div class="row" style="padding: 2px 0;"><!-- 同属“其他记录” -->
                                         <div class="under_line" style="width: 900px;"></div>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -715,7 +715,8 @@
                 <table class="table-box">
                   <tbody>
                   <tr>
-                    <td width="70">其他记录:</td>
+                    <!-- <td width="70">其他记录:</td> -->
+                    <td width="70">透析小结:</td>
                     <td width="">
                       <div class="under-line">&nbsp;{{afterdialysis.complications_other}}</div>
                     </td>
@@ -1982,7 +1983,7 @@
                     <td width="35">其它</td>
                     <td width="">
                       <div class="under-line">&nbsp;
-                        <span v-if="afterdialysis.in_advance_reason_other.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
+                        <span v-if="afterdialysis.in_advance_reason.length > 0">{{afterdialysis.in_advance_reason_other}}</span>
                       </div>
                     </td>
                     <td width="10">)</td>

src/xt_pages/user/components/PatientForm.vue

@@ -615,17 +615,18 @@
         GetPatientTotal().then(response => {
           if (response.data.state == 1) {
             this.patientTotal = response.data.data.total
-            if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
-              this.$alert('患者数已达到当前服务版本病人数，需要升级到更高的版本', '提示', {
-                confirmButtonText: '确定',
-                showClose: false,
-                callback: action => {
-                  this.$router.push('/service/buy')
-                }
-              })
-            } else {
-              this.subscibeFlag = true
-            }
+            this.subscibeFlag = true;
+            // if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
+            //   this.$alert('患者数已达到当前服务版本病人数，需要升级到更高的版本', '提示', {
+            //     confirmButtonText: '确定',
+            //     showClose: false,
+            //     callback: action => {
+            //       this.$router.push('/service/buy')
+            //     }
+            //   })
+            // } else {
+            //   this.subscibeFlag = true
+            // }
           } else {
             this.$message.error(response.data.msg)
           }