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

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -38,14 +38,14 @@
                 透析号:{{ item.patient.dialysis_no }}
               </div>
               <div style="flex: 1;">
-                费别:
-                <span v-if="hisPatient.balance_accounts_type==1">
+                费别:自费
+                <!-- <span v-if="hisPatient.balance_accounts_type==1">
                   <span v-if="hisPatient.insutype==390">城乡医保</span>
                   <span v-if="hisPatient.insutype==310">职工医保</span>
                 </span>
                 <span v-else>
                   {{ getsettlement(hisPatient.balance_accounts_type) }}
-                </span>
+                </span> -->
               </div>
             </div>
             <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
@@ -86,7 +86,15 @@
             </div>
             <div style="display: flex;margin: 10px 0;">
               <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
-              <div style="flex: 1;">费别:居民医保/职工医保/自费</div>
+              <div style="flex: 1;">费别:自费
+                <!-- <span v-if="hisPatient.balance_accounts_type==1">
+                  <span v-if="hisPatient.insutype==390">城乡医保</span>
+                  <span v-if="hisPatient.insutype==310">职工医保</span>
+                </span>
+                <span v-else>
+                  {{ getsettlement(hisPatient.balance_accounts_type) }}
+                </span> -->
+              </div>
             </div>
             <div style="display: flex;">
               <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
@@ -394,7 +402,7 @@
               <div style="flex: 1;">核/发药师：</div>
             </div>
           </div>
-          <div v-if="prescriptions[index].med_type == '1112'">
+          <div v-if="prescriptions[index].med_type == '1112' || prescriptions[index].med_type == '1111'">
             <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
               <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
               <div style="flex: 1;">金额:

src/xt_pages/outpatientTool/components/print9919.vue

@@ -235,10 +235,10 @@
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
-<!--        <td>护理费</td>-->
-<!--        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>-->
-<!--        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>-->
-<!--        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>-->
+        <td>护理费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>
       </tr>
 
       <tr>
@@ -247,20 +247,20 @@
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total) ).toFixed(2) }}
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total) + parseFloat(info.huli_cost_total)).toFixed(2) }}
         </td>
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.huli_cost_self_total)).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-          parseFloat(info.treat_cost_part_self_total) ).toFixed(2)}}
+          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.huli_cost_part_self_total)).toFixed(2)}}
         </td>
 
         <td>报销比例</td>