Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -24,7 +24,7 @@
       </tr>
       <tr>
         <td width="90">就医登记号</td>
-        <td colspan="11">{{info.psn_no}}</td>
+        <td colspan="11">{{info.mdtrt_id}}</td>
       </tr>
       <tr>
         <td width="80">姓名</td>
@@ -36,7 +36,7 @@
         <td width="80">出生日期</td>
         <td width="100">{{info.brdy}}</td>
         <td width="90">个人电脑号</td>
-        <td width="110"></td>
+        <td width="110">{{info.psn_no}}</td>
         <td width="80">人员类别</td>
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
         <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
@@ -77,7 +77,7 @@
         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110"></td>
+        <td width="110">{{}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
@@ -93,7 +93,7 @@
         <td>出院日期</td>
         <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td>{{getDay(info.begndate,info.enddate)}}</td>
+        <td>{{getDay(info.begndate,info.enddate) + 1}}</td>
 
       </tr>
       <tr>
@@ -117,17 +117,18 @@
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊慢性病</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
+<!--        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>-->
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time.split(' ')[0]}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{info.psn_pay - info.preselfpay_amt}} )
         </td>
       </tr>
       <tr>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -14,9 +14,9 @@
                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>-->
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>-->
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>-->
       </div>
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>