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

src/api/his/his.js

@@ -597,4 +597,13 @@ export function deleteNCDSRecord(params) {
 }
 
 
+export function getBaiLinRecord(params) {
+  return request({
+    url: '/api/bailin/export',
+    method: 'get',
+    params: params
+  })
+}
+
+
 

src/xt_pages/hospitalStation/template/printFour.vue

@@ -58,7 +58,9 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
+            <p>药费：551.20元</p>
+
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/hospitalStation/template/printOne.vue

@@ -59,7 +59,9 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
+            <p>药费：551.20元</p>
+
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -35,7 +35,9 @@
             <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
-            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
+<!--            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>-->
+          <p>药费：551.20元</p>
+
         </div>
     </div>
 </template>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -46,9 +46,9 @@
                         <tr v-for="(subItem,index) in item.details" :key="index">
                             <td>
                                 <span v-if="item.type == 1">药品费</span>
-                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 2">诊疗费</span>
                                 <span v-if="item.type == 3">耗材费</span>
-                                <span v-if="item.type == 4">检验费</span>
+                                <span v-if="item.type == 4">诊疗费</span>
 
                             </td>
                             <td>
@@ -107,9 +107,9 @@
                             <div style="display:flex;flez-wrap:wrap;">
                                 <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 2">诊疗费: {{ item.total.toFixed(2) }}</span>
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 4">诊疗费: {{ item.total.toFixed(2) }}</span>
 
                                     <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
 
@@ -185,9 +185,9 @@
                         <tr v-for="(subItem,index) in item.details" :key="index">
                             <td>
                                 <span v-if="item.type == 1">药品费</span>
-                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 2">诊疗费</span>
                                 <span v-if="item.type == 3">耗材费</span>
-                                <span v-if="item.type == 4">检验费</span>
+                                <span v-if="item.type == 4">诊疗费</span>
 
                             </td>
                             <td>
@@ -244,9 +244,9 @@
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
                                      :key="index">
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 2">诊疗费: {{ item.total.toFixed(2) }}</span>
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 4">诊疗费: {{ item.total.toFixed(2) }}</span>
 
                                 </div>
                             </div>

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -56,6 +56,10 @@
                  <p>核对：</p>
                  <p>发药：</p>
                  <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--            <p>药费：551.2元</p>-->
+<!--            <p>药费：466.2元</p>-->
+
+
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -64,6 +64,8 @@
                  <p>核对：</p>
                  <p>发药：</p>
                  <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--            <p>药费：466.2元</p>-->
+
           </div>
           <div class="actionBar" v-else>
             <p style="visibility: hidden;">审核：</p>
@@ -71,6 +73,10 @@
             <p style="visibility: hidden;">核对：</p>
             <p style="visibility: hidden;">发药：</p>
             <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--            <p>药费：551.2元</p>-->
+<!--            <p>药费：466.2元</p>-->
+
+
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -36,6 +36,8 @@
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
             <p>药费：{{advicePrint[0].price.toFixed(2)?advicePrint[0].price.toFixed(2):""}}</p>
+<!--          <p>药费：466.2元</p>-->
+
         </div>
     </div>
 </template>