518合并代码

src/xt_pages/dialysis/details/index.vue

           @click="next"
           >下一位</el-button
         >
-        <el-button
+        <!-- <el-button
           size="small"
           type="primary"
           @click="printOrderOne"
           icon="el-icon-printer"
-          >打印上机单</el-button>
+          >打印上机单</el-button> -->
 
         <el-button
           size="small"

src/xt_pages/dialysis/dialysisPage.vue

                     <p>{{ DialysisPrescriptionComfirmUserName }}</p>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescriptionAndOther">提交并设为长期处方</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescription">提交</el-button>
-                    <el-button type="primary" @click="printDan">打印上机单</el-button>
+                    <!-- <el-button type="primary" @click="printDan">打印上机单</el-button> -->
                   </el-form-item>
                 </el-col>
 

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

           </span>
           <span style="position: absolute; top: 235px; left: 250px">
             <span v-if="zhongwen.indexOf('仟') > -1">
-              {{
-                zhongwen.substring(
-                  zhongwen.indexOf("仟") - 1,
-                  zhongwen.indexOf("仟")
-                )
-              }}
+              {{zhongwen.substring(zhongwen.indexOf("仟") - 1,zhongwen.indexOf("仟"))}}
             </span>
             <span v-else>零</span>
           </span>

src/xt_pages/outpatientCharges/summary.vue

         number: obj.mdtrt_id,
         name: obj.patient.name,
         age: obj.age,
-        gend: obj.gend,
+        gend: obj.patient.gender,
         setl_time: obj.setl_time,
         chargeName: this.getName(obj.creator),
       };