Browse Source

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

28169 1 year ago
parent
commit
405f84fab9

+ 13 - 5
src/xt_pages/outpatientDoctorStation/template/prineight.vue View File

38
                 透析号:{{ item.patient.dialysis_no }}
38
                 透析号:{{ item.patient.dialysis_no }}
39
               </div>
39
               </div>
40
               <div style="flex: 1;">
40
               <div style="flex: 1;">
41
-                费别:
42
-                <span v-if="hisPatient.balance_accounts_type==1">
41
+                费别:自费
42
+                <!-- <span v-if="hisPatient.balance_accounts_type==1">
43
                   <span v-if="hisPatient.insutype==390">城乡医保</span>
43
                   <span v-if="hisPatient.insutype==390">城乡医保</span>
44
                   <span v-if="hisPatient.insutype==310">职工医保</span>
44
                   <span v-if="hisPatient.insutype==310">职工医保</span>
45
                 </span>
45
                 </span>
46
                 <span v-else>
46
                 <span v-else>
47
                   {{ getsettlement(hisPatient.balance_accounts_type) }}
47
                   {{ getsettlement(hisPatient.balance_accounts_type) }}
48
-                </span>
48
+                </span> -->
49
               </div>
49
               </div>
50
             </div>
50
             </div>
51
             <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
51
             <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
86
             </div>
86
             </div>
87
             <div style="display: flex;margin: 10px 0;">
87
             <div style="display: flex;margin: 10px 0;">
88
               <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
88
               <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
89
-              <div style="flex: 1;">费别:居民医保/职工医保/自费</div>
89
+              <div style="flex: 1;">费别:自费
90
+                <!-- <span v-if="hisPatient.balance_accounts_type==1">
91
+                  <span v-if="hisPatient.insutype==390">城乡医保</span>
92
+                  <span v-if="hisPatient.insutype==310">职工医保</span>
93
+                </span>
94
+                <span v-else>
95
+                  {{ getsettlement(hisPatient.balance_accounts_type) }}
96
+                </span> -->
97
+              </div>
90
             </div>
98
             </div>
91
             <div style="display: flex;">
99
             <div style="display: flex;">
92
               <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
100
               <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
394
               <div style="flex: 1;">核/发药师:</div>
402
               <div style="flex: 1;">核/发药师:</div>
395
             </div>
403
             </div>
396
           </div>
404
           </div>
397
-          <div v-if="prescriptions[index].med_type == '1112'">
405
+          <div v-if="prescriptions[index].med_type == '1112' || prescriptions[index].med_type == '1111'">
398
             <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
406
             <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
399
               <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
407
               <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
400
               <div style="flex: 1;">金额:
408
               <div style="flex: 1;">金额:

+ 7 - 7
src/xt_pages/outpatientTool/components/print9919.vue View File

235
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
235
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
236
         <td style="text-align:right;padding-right:10px;">0</td>
236
         <td style="text-align:right;padding-right:10px;">0</td>
237
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
237
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
238
-<!--        <td>护理费</td>-->
239
-<!--        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>-->
240
-<!--        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>-->
241
-<!--        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>-->
238
+        <td>护理费</td>
239
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_total}}</td>
240
+        <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>
241
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>
242
       </tr>
242
       </tr>
243
 
243
 
244
       <tr>
244
       <tr>
247
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
247
           parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
248
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
248
           parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
249
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
249
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
250
-          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total) ).toFixed(2) }}
250
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total) + parseFloat(info.huli_cost_total)).toFixed(2) }}
251
         </td>
251
         </td>
252
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
252
         <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
253
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
253
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
254
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
254
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
255
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
255
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
256
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
256
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.huli_cost_self_total)).toFixed(2)}}
257
         </td>
257
         </td>
258
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
258
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
259
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
259
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
260
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
260
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
261
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
261
           parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
262
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
262
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
263
-          parseFloat(info.treat_cost_part_self_total) ).toFixed(2)}}
263
+          parseFloat(info.treat_cost_part_self_total) + parseFloat(info.huli_cost_part_self_total)).toFixed(2)}}
264
         </td>
264
         </td>
265
 
265
 
266
         <td>报销比例</td>
266
         <td>报销比例</td>