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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -173,7 +173,7 @@
                   prescription.target_ultrafiltration
                     ? prescription.target_ultrafiltration
                     : "/"
-                }}L
+                }}ml
               </span>
             </td>
             <td style="text-align: left" colspan="1">
@@ -294,7 +294,7 @@
                   afterdialysis.actual_ultrafiltration
                     ? afterdialysis.actual_ultrafiltration
                     : "/"
-                }}L
+                }}ml
               </span>
             </td>
             <td style="text-align: left" colspan="2">
@@ -808,7 +808,7 @@
               <span style="display: inline-block; margin-left: 15px"
                 >使用特殊药物:</span
               >
-              <!-- <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
+              <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
               <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>:
               <label-box
                 :isChecked="prescription.special_medicine == 3 ? true : false"
@@ -817,7 +817,7 @@
               <label-box
                 :isChecked="prescription.special_medicine == 4 ? true : false"
                 showValue="抗凝药"
-              ></label-box> -->
+              ></label-box>
               其他：{{ prescription.special_medicine_other }}
             </td>
           </tr>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -2749,6 +2749,7 @@ export default {
         let overlmt_amt = 0
         let inscp_scp_amt = 0
         let preselfpay_amt = 0
+        let day = 0
         for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
           if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id == drug_month_prescriptions.advices[a].drug_id) {
 
@@ -2756,7 +2757,6 @@ export default {
             obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
             obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
             obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
-            obj['day'] = drug_month_prescriptions.advices[a].day
             // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
             obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
             obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
@@ -2773,11 +2773,13 @@ export default {
             overlmt_amt = overlmt_amt + drug_month_prescriptions.advices[a].order_info.overlmt_amt
             inscp_scp_amt = inscp_scp_amt + drug_month_prescriptions.advices[a].order_info.inscp_scp_amt
             preselfpay_amt = preselfpay_amt + drug_month_prescriptions.advices[a].order_info.preselfpay_amt
+            // day =day + parseNumber(drug_month_prescriptions.advices[a].day)
 
 
           }
         }
         obj['prescribing_number'] = count
+        obj['day'] = day
         obj['fulamt_ownpay_amt'] = fulamt_ownpay_amt.toFixed(2)
         obj['overlmt_amt'] = overlmt_amt.toFixed(2)
         obj['inscp_scp_amt'] = inscp_scp_amt.toFixed(2)

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="prescription-print" class="print_page_main_content">
-    <div class="title">广东省社会医疗保障基金结算清单</div>
-    <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line">{{ info.mdtrt_id }}</div></div>
+    <div class="title">赤峰社会医疗保障基金结算清单</div>
+    <div style="text-align:right;">清单流水号 <div style="width:200px;" class="under_line">{{ info.mdtrt_id }}</div></div>
     <div class="row">
-      <div>定点医疗机构名称<div style="width:120px;" class="under_line">{{info.fixmedins_name}}</div></div>
-      <div>定点医疗机构代码<div style="width:120px;" class="under_line">{{info.fixmedins_code}}</div></div>
+      <div>定点医疗机构名称<div style="width:200px;" class="under_line">{{info.fixmedins_name}}</div></div>
+      <div>定点医疗机构代码<div style="width:200px;" class="under_line">{{info.fixmedins_code}}</div></div>
       <div>医保结算等级
         <div style="width:120px;" class="under_line">
           <span v-if="info.hosp_lv == '01'">三级特等</span>
@@ -23,8 +23,8 @@
       </div>
     </div>
     <div class="row">
-      <div>医保编号<div style="width:120px;" class="under_line">{{ info.psn_no }}</div></div>
-      <div>病案号<div style="width:120px;" class="under_line">{{ info.psn_no ? info.psn_no : '' }}</div></div>
+      <div>医保编号<div style="width:220px;" class="under_line">{{ info.psn_no }}</div></div>
+      <div>病案号<div style="width:220px;" class="under_line">{{ info.psn_no ? info.psn_no : '' }}</div></div>
       <div>申报时间
         <div style="width:40px;" class="under_line">{{ info.setl_time ? info.setl_time.split(' ')[0].slice(0,4) : '' }}</div>年
         <div style="width:40px;" class="under_line">{{ info.setl_time ? info.setl_time.split(' ')[0].slice(5,7) : '' }}</div>月
@@ -63,7 +63,7 @@
             </div>
             <div class="row">
               <div class="inline_block">(年龄不足1周岁)年龄
-                <div style="width:80px;" class="under_line">{{info.age}}</div>天
+                <div style="width:80px;" class="under_line"></div>天
               </div>
               <div class="inline_block">民族
                 <div style="width:80px;" class="under_line">{{getNaty(info.naty)}}</div>
@@ -72,7 +72,7 @@
                 <div style="width:80px;" class="under_line">身份证</div>
               </div>
               <div class="inline_block">患者证件号码
-                <div style="width:140px;" class="under_line">{{info.certno}}</div>
+                <div style="width:200px;" class="under_line">{{info.certno}}</div>
               </div>
             </div>
             <div>
@@ -80,19 +80,19 @@
                 <div style="width:80px;" class="under_line"></div>
               </div>
               <div class="inline_block" style="width:80px;"></div>
-              <div class="inline_block">现住址
+              <div class="inline_block" >现住址
 <!--                <div style="width:80px;" class="under_line"></div>省（区、市）-->
 <!--                <div style="width:80px;" class="under_line"></div>市-->
 <!--                <div style="width:80px;" class="under_line"></div>县-->
-                <div style="width:140px;" class="under_line">{{info.patient.home_address}}</div>
+                <div style="width:400px;" class="under_line">{{info.patient.home_address}}</div>
               </div>
             </div>
             <div class="row">
               <div class="inline_block">工作单位名称
-                <div style="width:80px;" class="under_line">{{info.emp_name}}</div>
+                <div style="width:300px;" class="under_line">{{info.emp_name}}</div>
               </div>
               <div class="inline_block">工作单位地址
-                <div style="width:160px;" class="under_line">{{info.patient.unit_address}}</div>
+                <div style="width:180px;" class="under_line">{{info.patient.unit_address}}</div>
               </div>
               <div class="inline_block">单位电话
                 <div style="width:120px;" class="under_line"></div>
@@ -115,12 +115,12 @@
                 <div style="width:140px;" class="under_line"></div>
               </div>
               <div class="inline_block">电话
-                <div style="width:80px;" class="under_line">{{info.patinet.phone}}</div>
+                <div style="width:150px;" class="under_line">{{info.patient.phone}}</div>
               </div>
             </div>
             <div class="row">
-              <div v-if="info.insutype == '310'" style="width:33%;">医保类型<div style="width:120px;" class="under_line">职工基本医疗保险</div></div>
-              <div v-if="info.insutype == '390'"  style="width:33%;">医保类型<div style="width:120px;" class="under_line">城乡居民基本医疗保险</div></div>
+              <div v-if="info.insutype == '310'" style="width:40%;">医保类型<div style="width:200px;" class="under_line">职工基本医疗保险</div></div>
+              <div v-if="info.insutype == '390'"  style="width:40%;">医保类型<div style="width:200px;" class="under_line">城乡居民基本医疗保险</div></div>
               <div  style="width:33%;">特殊人员类型<div style="width:120px;" class="under_line"></div></div>
               <div style="width:33%;" v-if="info.his.insuplc_admdvs == '150499'">参保地<div style="width:120px;" class="under_line" >{{'赤峰市'}}</div></div>
               <div style="width:33%;" v-else>参保地<div style="width:120px;" class="under_line" ></div></div>
@@ -166,9 +166,9 @@
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
               </tr>
-              <tr v-for="item in 5">
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+              <tr v-for="item in info.dia_config">
+                <td>&nbsp;{{item.class_name}}</td>
+                <td>&nbsp;{{item.country_code}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
               </tr>
@@ -184,7 +184,7 @@
         <tr>
           <td>
             <div class="inline_block">住院医疗类型
-              <label-box :isChecked="false" showValue="1.住院"></label-box>
+              <label-box :isChecked="true" showValue="1.住院"></label-box>
               <label-box :isChecked="false" showValue="2.日间手术"></label-box>
             </div>
           </td>
@@ -196,7 +196,7 @@
                 <label-box :isChecked="false" showValue="1.急诊"></label-box>
                 <label-box :isChecked="false" showValue="2.门诊"></label-box>
                 <label-box :isChecked="false" showValue="3.其他医疗机构转入"></label-box>
-                <label-box :isChecked="false" showValue="9.其他"></label-box>
+                <label-box :isChecked="true" showValue="9.其他"></label-box>
               </div>
             </div>
           </td>
@@ -205,7 +205,7 @@
           <td>
             <div>
               <div class="inline_block">治疗类别
-                <label-box :isChecked="false" showValue="1.西医"></label-box>
+                <label-box :isChecked="true" showValue="1.西医"></label-box>
                 <label-box :isChecked="false" showValue="2.中医"></label-box>
                 （
                 <label-box :isChecked="false" showValue="2.1 中医"></label-box>
@@ -220,7 +220,7 @@
           <td>
             <div class="row">
               <div style="width:40%" class="inline_block">入院时间
-                <div style="width:40px;" class="under_line">{{info.his.in_hosptial_time}}</div>
+                <div style="width:160px;" class="under_line">{{info.his.in_hosptial_time}}</div>
               </div>
               <div style="width:30%" class="inline_block">入院科别
                 <div style="width:80px;" class="under_line">{{'血透科'}}</div>
@@ -235,7 +235,7 @@
           <td>
             <div class="row">
               <div style="width:40%" class="inline_block">出院时间
-                <div style="width:40px;" class="under_line">{{info.his.out_hosptial_time}}</div>
+                <div style="width:160px;" class="under_line">{{info.his.out_hosptial_time}}</div>
               </div>
               <div style="width:30%" class="inline_block">出院科别
                 <div style="width:80px;" class="under_line">{{'血透科'}}</div>
@@ -250,10 +250,10 @@
           <td>
             <div class="row">
               <div style="width:40%" class="inline_block">门（急）诊诊断（西医诊断）
-                <div style="width:80px;" class="under_line">{{ info.dise_name }}</div>
+                <div style="width:80px;" class="under_line">{{ info.dia_config[0].class_name }}</div>
               </div>
               <div style="width:30%" class="inline_block">疾病代码
-                <div style="width:80px;" class="under_line">{{ info.dise_code }}</div>
+                <div style="width:80px;" class="under_line">{{ info.dia_config[0].country_code }}</div>
               </div>
               <div style="width:30%" class="inline_block">
               </div>
@@ -491,11 +491,11 @@
           <td>
             <div class="inline_block" style="width:50%">
               主诊医师姓名*
-              <div style="width:80px;" class="under_line"></div>
+              <div style="width:80px;" class="under_line">{{info.doctor_info.user_name}}</div>
             </div>
             <div class="inline_block">
               主诊医师代码*
-              <div style="width:80px;" class="under_line"></div>
+              <div style="width:80px;" class="under_line">{{info.doctor_info.doctor_number}}</div>
             </div>
           </td>
         </tr>
@@ -512,29 +512,26 @@
                 <td style="width:20%;text-align:left;">
                   <div>
                     业务流水号：
-                    <div style="width:80px;" class="under_line">{{ info.setl_id }}</div>
+                    <div style="width:160px;" class="under_line">{{ info.setl_id }}</div>
                   </div>
                   <div>
                     票据代码：
-                    <div style="width:80px;" class="under_line"></div>
+                    <div style="width:160px;" class="under_line"></div>
                   </div>
                   <div>
                     票据号码：
-                    <div style="width:80px;" class="under_line"></div>
+                    <div style="width:160px;" class="under_line"></div>
                   </div>
                 </td>
                 <td style="width:80%;">
                   <div>
                     结算期间：
                     <div class="inline_block">
-                      <div style="width:40px;" class="under_line">{{ info.begndate ? info.begndate.slice(0,4) : '' }}</div>年
-                      <div style="width:40px;" class="under_line">{{ info.begndate ? info.begndate.slice(5,7) : '' }}</div>月
-                      <div style="width:40px;" class="under_line">{{ info.begndate ? info.begndate.slice(8,11) : '' }}</div>日
+                      <div style="width:100px;" class="under_line">{{  info.his.in_hosptial_time ? info.his.in_hosptial_time.split(' ')[0] : '' }}</div>
                     </div>——
                     <div class="inline_block">
-                      <div style="width:40px;" class="under_line">{{ info.enddate ? info.enddate.slice(0,4) : '' }}</div>年
-                      <div style="width:40px;" class="under_line">{{ info.enddate ? info.enddate.slice(5,7) : '' }}</div>月
-                      <div style="width:40px;" class="under_line">{{ info.enddate ? info.enddate.slice(8,11) : '' }}</div>日
+                      <div style="width:100px;" class="under_line">{{  info.his.out_hosptial_time ? info.his.out_hosptial_time.split(' ')[0] : '' }}</div>
+
                     </div>
                   </div>
                 </td>
@@ -557,10 +554,10 @@
               </tr>
               <tr>
                 <td>床位费</td>
-                <td>&nbsp;{{info.bed_cost_total}}</td>
+                <td>&nbsp;{{info.bed_cost_total?info.bed_cost_total:''}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.bed_cost_self_total}}</td>
+                <td>&nbsp;{{info.bed_cost_self_total?info.bed_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -573,34 +570,34 @@
               </tr>
               <tr>
                 <td>检查费</td>
-                <td>&nbsp;{{info.check_cost_total}}</td>
+                <td>&nbsp;{{info.check_cost_total?info.check_cost_total:''}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.check_cost_self_total}}</td>
+                <td>&nbsp;{{info.check_cost_self_total?info.check_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>化验费</td>
-                <td>&nbsp;{{info.laboratory_cost_total}}</td>
+                <td>&nbsp;{{info.laboratory_cost_total?info.laboratory_cost_total:''}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.laboratory_cost_self_total}}</td>
+                <td>&nbsp;{{info.laboratory_cost_self_total?info.laboratory_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>治疗费</td>
-                <td>&nbsp;{{info.treat_cost_total}}</td>
+                <td>&nbsp;{{info.treat_cost_total?info.treat_cost_total:''}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.treat_cost_self_total}}</td>
+                <td>&nbsp;{{info.treat_cost_self_total?info.treat_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>手术费</td>
-                <td>&nbsp;{{info.operation_cost_total}}</td>
+                <td>&nbsp;{{info.operation_cost_total?info.operation_cost_total:''}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.operation_cost_self_total}}</td>
+                <td>&nbsp;{{info.operation_cost_self_total?info.operation_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -613,18 +610,18 @@
               </tr>
               <tr>
                 <td>卫生材料费</td>
-                <td>&nbsp;{{info.material_cost_total}}</td>
+                <td>&nbsp;{{info.material_cost_total?info.material_cost_total:""}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.material_cost_self_total}}</td>
+                <td>&nbsp;{{info.material_cost_self_total?info.material_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
                 <td>西药费</td>
-                <td>&nbsp;{{info.western_medicine_cost_total}}</td>
+                <td>&nbsp;{{info.western_medicine_cost_total?info.western_medicine_cost_total:""}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.western_medicine_cost_self_total}}</td>
+                <td>&nbsp;{{info.western_medicine_cost_self_total?info.western_medicine_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -637,10 +634,10 @@
               </tr>
               <tr>
                 <td>中成药费</td>
-                <td>&nbsp;{{info.chinese_traditional_medicine_cost_total}}</td>
+                <td>&nbsp;{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:""}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;{{info.chinese_traditional_medicine_cost_self_total}}</td>
+                <td>&nbsp;{{info.chinese_traditional_medicine_cost_self_total?info.chinese_traditional_medicine_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -669,10 +666,15 @@
               </tr>
               <tr>
                 <td>金额合计</td>
+                <td>{{(parseFloat(info.bed_cost_total) +
+                    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) }}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>
+                </td>
                 <td>&nbsp;</td>
               </tr>
               </tbody>
@@ -692,31 +694,31 @@
                   </tr>
                   <tr>
                     <td>医保统筹基金支付</td>
-                    <td>&nbsp;{{info.hifp_pay}}</td>
+                    <td>&nbsp;{{info.hifp_pay?info.hifp_pay:info.order.hifp_pay}}</td>
                   </tr>
                   <tr>
                     <td>其他支付：</td>
-                    <td>&nbsp;{{info.oth_pay}}</td>
+                    <td>&nbsp;{{info.oth_pay?info.oth_pay:info.order.oth_pay}}</td>
                   </tr>
                   <tr>
                     <td>大病保险</td>
-                    <td>&nbsp;{{info.hifes_pay}}</td>
+                    <td>&nbsp;{{info.hifmi_pay?info.hifmi_pay:info.order.hifmi_pay}}</td>
                   </tr>
                   <tr>
                     <td>医疗救助</td>
-                    <td>&nbsp;{{info.maf_pay}}</td>
+                    <td>&nbsp;{{info.maf_pay?info.maf_pay:info.order.maf_pay}}</td>
                   </tr>
                   <tr>
                     <td>公务员医疗补助</td>
-                    <td>&nbsp;{{info.cvlserv_pay}}</td>
+                    <td>&nbsp;{{info.cvlserv_pay?info.cvlserv_pay:info.order.cvlserv_pay}}</td>
                   </tr>
                   <tr>
                     <td>大额补充</td>
-                    <td>&nbsp;{{info.hifob_pay}}</td>
+                    <td>&nbsp;{{info.hifob_pay?info.hifob_pay:info.order.hifob_pay}}</td>
                   </tr>
                   <tr>
                     <td>企业补充</td>
-                    <td>&nbsp;{{info.hifes_pay}}</td>
+                    <td>&nbsp;{{info.hifes_pay?info.hifes_pay:info.order.hifes_pay}}</td>
                   </tr>
                   <tr>
                     <td>......</td>
@@ -736,19 +738,19 @@
                   <tr>
                     <td rowspan="4" style="width:4%;">个人支付</td>
                     <td style="width:36%">个人自付</td>
-                    <td>{{info.psn_part_amt}}</td>
+                    <td>{{info.psn_part_amt?info.psn_part_amt:info.order.psn_part_amt}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人自费</td>
-                    <td>{{info.psn_cash_pay}}</td>
+                    <td>{{info.psn_cash_pay?info.psn_cash_pay:info.order.psn_cash_pay}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人账户支付</td>
-                    <td>{{info.acct_pay}}</td>
+                    <td>{{info.acct_pay?info.acct_pay:info.order.acct_pay}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人现金支付</td>
-                    <td>{{info.psn_cash_pay}}</td>
+                    <td>{{info.psn_cash_pay?info.psn_cash_pay:info.order.psn_cash_pay}}</td>
                   </tr>
 
                   </tbody>
@@ -775,11 +777,11 @@
       <div class="row">
         <div style="width:50%">
           医疗机构填报部门
-          <div style="width:80px;" class="under_line">{{ info.fixmedins_name }}</div>
+          <div style="width:160px;" class="under_line">{{ info.fixmedins_name }}</div>
         </div>
         <div style="width:50%">
           医疗机构接收部门
-          <div style="width:80px;" class="under_line"></div>
+          <div style="width:160px;" class="under_line"></div>
         </div>
       </div>
       <div class="row">

src/xt_pages/hospitalStation/statementPrint.vue

@@ -84,14 +84,32 @@ export default {
       var ptime = Math.round(new Date().getTime() / 1000)
       this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
 
-      const style =
-          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}'
-      printJS({
-        printable: 'statement-print',
-        type: 'html',
-        style: style,
-        scanStyles: false
-      })
+      if(this.org_id == 10265){
+
+        const style =
+            '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+        const style1 = "@media print{#prescription-print{font-size:14px;}.title{text-align: center;font-size: 22px;font-weight: bold;}.row{display: flex;justify-content: space-between;}.under_line{border-bottom: 1px solid #999;width: 95%;text-align: center;margin-left: 2px;display: inline-block;}.inline_block{display: inline-block;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 14px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; /* 解决边框冲突 */border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid;text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}}";
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style1,
+          scanStyles: false
+        });
+
+      }else{
+
+        const style =
+            '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}'
+        printJS({
+          printable: 'statement-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
+      }
+
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -294,14 +312,21 @@ export default {
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
                 that.order_infos = response.data.data
-
+                that.info['patient'] = response.data.data.patient
+                that.info['diagnosis'] = response.data.data.diagnosis
                 that.info['p_admin'] = that.p_admin
                 that.info['charge_admin'] = that.charge_admin
+                that.info['fixmedins_name'] = response.data.data.org_name
+                that.info['fixmedins_code'] = response.data.data.org_code
+                that.info['order'] = response.data.data.order
 
                 that.info['date'] = response.data.data.date
                 that.info['number'] = response.data.data.number
                 that.info['order_infos'] = response.data.data.order_infos
                 that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['dia_config'] = response.data.data.dia_config
+                that.info['doctor_info'] = response.data.data.doctor_info
+
 
                 that.info['bed_cost_total'] = response.data.data.bedCostTotal
                 that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
@@ -342,6 +367,8 @@ export default {
                 that.info['number'] = response.data.data.number
                 that.info['order_infos'] = response.data.data.order_infos
                 that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['his'] = response.data.data.his_hospital
+
               }
             })
             .catch(function(error) {

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -77,7 +77,7 @@
         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110">{{patient.phone}}</td>
+        <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
@@ -105,12 +105,12 @@
         <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
         <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
-
-
         <td>入院第一诊断</td>
-        <td colspan="3"></td>
+        <td colspan="3">{{info.diagnosis}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4"></td>
+        <td colspan="4">{{info.diagnosis}}</td>
+
+
       </tr>
       <tr>
         <td>业务类别</td>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -14,7 +14,9 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <summary-print v-if="org_id == 10215|| org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
+
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>
@@ -25,10 +27,12 @@
   import { uParseTime } from '@/utils/tools'
   import printOne from './allListTemplate/printOne'
   import ListPrintTwo from './listTemplate/listPrintTwo'
+  import SummaryPrint from './allListTemplate/summaryPrint'
 
   export default {
     name: 'allListPrint',
     components: {
+      SummaryPrint,
       ListPrintTwo,
       printOne
     },
@@ -42,12 +46,13 @@
         order: {},
         admin: {},
         his_hospital:{},
+        org_id:0,
       }
     },
 
     created() {
       this.getInfo(this.paramsObj.id)
-
+      this.org_id = this.$store.getters.xt_user.org_id
     },
     methods: {
       getTimes(time) {
@@ -62,49 +67,97 @@
             return false
           } else {
             this.order = response.data.data.order
+            this.order['bedCostTotal'] = response.data.data.bedCostTotal
+            this.order['operationCostTotal'] = response.data.data.operationCostTotal
+            this.order['otherCostTotal'] = response.data.data.otherCostTotal
+            this.order['materialCostTotal'] = response.data.data.materialCostTotal
+            this.order['westernMedicineCostTotal'] = response.data.data.westernMedicineCostTotal
+            this.order['chineseTraditionalMedicineCostTotal'] = response.data.data.chineseTraditionalMedicineCostTotal
+            this.order['checkCostTotal'] = response.data.data.checkCostTotal
+            this.order['zhenChaCostTotal'] = response.data.data.zhenChaCostTotal
+            this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
+            this.order['treatCostTotal'] = response.data.data.treatCostTotal
+
+
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
 
-            //获取所有项目类型进行去重
-            let med_chrgitm_types = []
-            for (let i = 0; i < order_info.length; i++) {
-              med_chrgitm_types.push(order_info[i].med_chrgitm_type)
-            }
-            const obj = {}
-            med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
-              obj[next] ? '' : obj[next] = true && cur.push(next)
-              return cur
-            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
-            let tempOrderInfo = []
-
-            for (let i = 0; i < med_chrgitm_types.length; i++) {
-              let obj = {
-                total: 0,
-                details: []
+            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
               }
-              let tempDetails = []
-              for (let b = 0; b < order_info.length; b++) {
-                if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
-                  tempDetails.push(order_info[b])
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              let tempOrderInfo = []
+
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: []
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
                 }
-              }
 
-              obj.details = this.setNewData(tempDetails)
-              obj.total = this.getTotal(obj.details)
+                obj.details = this.setNewData(tempDetails)
+                // obj.total = this.getTotal(obj.details)
+                //
+                // obj.details.push({
+                //   total: obj.total,
+                //   is_total: 1,
+                // })
+                this.list =  this.list.concat(obj.details)
+              }
 
-              obj.details.push({
-                total: obj.total,
-                is_total: 1,
-              })
-              this.list =  this.list.concat(obj.details)
-            }
 
+            }else{
 
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              }
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              let tempOrderInfo = []
+
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: []
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
+                }
 
+                obj.details = this.setNewData(tempDetails)
+                obj.total = this.getTotal(obj.details)
 
+                obj.details.push({
+                  total: obj.total,
+                  is_total: 1,
+                })
+                this.list =  this.list.concat(obj.details)
+              }
+            }
           }
         })
       }, getTotal:function(items){
@@ -158,8 +211,8 @@
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name
                 obj['spec'] = details[a].advice.drug.drug_spec
-                obj['unit'] = details[a].advice.drug.max_unit
-
+                obj['unit'] = details[a].advice.drug.min_unit
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
@@ -179,12 +232,17 @@
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
+                 obj['spec'] = '次'
+                 obj['unit'] = details[a].project.project.unit
+
+
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
-               }
-                obj['unit'] = details[a].project.unit
+                 obj['spec'] = details[a].project.good_info.specification_name
+                 obj['unit'] = this.getGoodUnit( details[a].project.good_info.good_unit)
 
-                obj['spec'] = '1'
+               }
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
@@ -199,7 +257,14 @@
 
         return list
 
-      }, unique(array) {
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
+      },unique(array) {
         // res用来存储结果
         var res = []
         for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
@@ -214,9 +279,7 @@
           }
         }
         return res
-      },
-
-      getType(med_chrgitm_type) {
+      },getType(med_chrgitm_type){
         switch (med_chrgitm_type) {
           case '01':
             return '床位费'
@@ -275,6 +338,24 @@
 
         }
 
+
+      },
+
+      getMedicineInsuranceType(type) {
+        switch (type) {
+          case "01":
+            return '甲类'
+            break
+          case "02":
+            return '乙类'
+
+            break
+          case "03":
+            return '自费'
+            break
+
+        }
+
       },
       printThisPage() {
 

src/xt_pages/outpatientCharges/allListTemplate/summary.vue

@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'summary'
-}
-</script>
-
-<style scoped>
-
-</style>

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

@@ -0,0 +1,241 @@
+<template>
+  <div id="allList-print" class="allList-print">
+    <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}汇总清单</div>
+    <div class="allListInfo">
+      <div>科别：门诊</div>
+      <div>床号：</div>
+      <div>门诊号：{{ order.mdtrt_id }}</div>
+      <div>患者姓名：{{ patient.name }}</div>
+    </div>
+
+    <div class="allListInfo">
+      <div>预交款：</div>
+      <div>门诊日期：</div>
+      <div>总费用：{{ order.medfee_sumamt }}</div>
+    </div>
+
+    <div class="allListInfo">
+      <div>西药:{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
+      <div >中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
+      <div >中草药:</div>
+      <div >检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
+    </div>
+
+
+    <div class="allListInfo">
+      <div >输氧费:</div>
+      <div>手术费:{{order.operationCostTotal?order.operationCostTotal:''}}</div>
+      <div >化验费:{{order.laboratoryCostTotal?order.laboratoryCostTotal:''}}</div>
+      <div>输血费:</div>
+    </div>
+
+
+    <div class="allListInfo">
+      <div >诊察费:{{order.zhenChaCostTotal?order.zhenChaCostTotal:''}}</div>
+      <div >治疗费:{{order.treatCostTotal?order.treatCostTotal:''}}</div>
+      <div >护理费:</div>
+      <div >床位费:{{order.bedCostTotal?order.bedCostTotal:''}}</div>
+    </div>
+
+
+    <div class="allListInfo">
+      <div >麻醉费:</div>
+      <div >材料费:{{order.materialCostTotal?order.materialCostTotal:''}}</div>
+      <div >其他费:{{order.otherCostTotal?order.otherCostTotal:''}}</div>
+    </div>
+    <!--    <div style="display:flex;justify-content: space-between;">-->
+<!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
+<!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
+<!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
+<!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
+<!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
+<!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
+<!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
+<!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+<!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
+<!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+    <!--    </div>-->
+    <!--    <div style="display:flex;justify-content: space-between;">-->
+    <!--      <div style="position: absolute;top:190px;left:40px">中成药</div>-->
+    <!--      <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>-->
+    <!--      <div style="position: absolute;top:190px;left:180px">输氧费</div>-->
+    <!--      <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>-->
+    <!--      <div style="position: absolute;top:190px;left:340px">输血费</div>-->
+    <!--      <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>-->
+    <!--      <div style="position: absolute;top:190px;left:500px">护理费</div>-->
+    <!--      <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>-->
+
+    <!--      <div style="position: absolute;top:160px;left:500px">材料费</div>-->
+    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+    <!--    </div>-->
+    <!--    <div style="display:flex;justify-content: space-between;">-->
+    <!--      <div style="position: absolute;top:210px;left:40px">中草药</div>-->
+    <!--      <div style="position: absolute;top:210px;left:110px"></div>-->
+    <!--      <div style="position: absolute;top:210px;left:180px">手术费</div>-->
+    <!--      <div style="position: absolute;top:210px;left:260px"></div>-->
+    <!--      <div style="position: absolute;top:210px;left:340px">诊察费</div>-->
+    <!--      <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>-->
+    <!--      <div style="position: absolute;top:210px;left:500px">床位费</div>-->
+    <!--      <div style="position: absolute;top:210px;left:580px"></div>-->
+    <!--      <div style="position: absolute;top:160px;left:500px">其他</div>-->
+    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+    <!--    </div>-->
+
+
+    <table class="allListTable" border="1">
+      <tr>
+        <td style="width:10%">费用类别</td>
+        <td style="width:35%">项目名称</td>
+        <td style="width:15%">规格</td>
+        <td style="width:5%">单位</td>
+        <td style="width:10%">数量</td>
+        <td style="width:10%">单价</td>
+        <td style="width:10%">金额</td>
+        <td style="width:10%">医保类型</td>
+
+      </tr>
+      <template v-for='(item,index) in list'>
+        <tr>
+          <td style="width:10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width:35%">{{ item.name }}</td>
+          <td style="width:15%">{{ item.spec }}</td>
+          <td style="width:5%">{{ item.unit }}</td>
+          <td style="width:10%">{{ item.count }}</td>
+          <td style="width:10%">{{ item.price }}</td>
+          <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
+          <td style="width:10%">{{ item.medicine_insurance_kind }}</td>
+
+        </tr>
+      </template>
+    </table>
+
+  </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, patient: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, order: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, hospital: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+
+    }
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: []
+    }
+  },
+  methods: {
+    getNowTime: function() {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    }, getTotal: function(items) {
+      let total = 0
+      for (let i = 0; i < items.length; i++) {
+        total = total + (items[i].count * items[i].price).toFixed(2)
+      }
+      return total
+
+    }
+
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        this.getPage()
+      },
+      deep: true
+    }
+  }
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.allList-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+
+.allListTitle {
+  font-size: 24px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.allListInfo {
+  display: flex;
+  font-size: 16px;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+
+.allListTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable tr td {
+  padding: 0 5px;
+}
+
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
+}
+
+.tableBottomOne {
+  margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,12 +1,12 @@
 <template>
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index" >
-            <div :style="{position: 'absolute',top:(20 + (index * 570))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
-            <div :style="{position: 'absolute',top:(80 + (index * 570))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(20 + (index * 660))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+            <div :style="{position: 'absolute',top:(70 + (index * 660))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
             <div style="display:flex;justify-content: space-between;">
-                <div :style="{position: 'absolute',top:(130 + (index * 570))  + 'px',left:80+ 'px',}">{{ paramsObj.name }}</div>
+                <div :style="{position: 'absolute',top:(100 + (index * 660))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(190 + (index * 570))  + 'px',left:80+ 'px',}">
+            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:120+ 'px',}">
                 <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
                 <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
                 <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
@@ -16,7 +16,7 @@
                 <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
                 <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
             </div>
-            <div :style="{position: 'absolute',top:(190 + (index * 570))  + 'px',left:260+ 'px'}">
+            <div :style="{position: 'absolute',top:(190 + (index * 660))  + 'px',left:300+ 'px'}">
                 <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
                     <span style="display:inline-block;width:200px;">
                         <span v-if="item.advice.id == 0">
@@ -41,9 +41,9 @@
                     </span>
                 </div>
             </div>
-            <div :style="{position: 'absolute',top:(390 + (index * 570))  + 'px',left:110+ 'px'}">{{ zhongwen }}</div>
-            <div :style="{position: 'absolute',top:(390 + (index * 570))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
-            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(420 + (index * 570))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+            <div :style="{position: 'absolute',top:(390 + (index * 660))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
+            <div :style="{position: 'absolute',top:(390 + (index * 660))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
+            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(420 + (index * 660))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
                 <div style="display:flex;">
                   <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
                   <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
@@ -70,15 +70,15 @@
 
             </div>
             <div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:100+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:520+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:550+ 'px'}">
                     <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:560+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:610+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
                 </div>
-                <div :style="{position: 'absolute',top:(500 + (index * 570))  + 'px',left:600+ 'px'}">
+                <div :style="{position: 'absolute',top:(480 + (index * 660))  + 'px',left:650+ 'px'}">
                     <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
                 </div>
             </div>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,9 +14,10 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106 && org_id != 10215 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+      <list-print-two v-if="org_id == 10215 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
 <!--      <list-print-two></list-print-two>-->
     </div>
   </div>
@@ -26,6 +27,7 @@
   import printOne from './listTemplate/printOne'
   import printTwo from './listTemplate/printTwo'
   // import printThree from './listTemplate/printThree'
+  import print from "print-js";
 
   import { getHisOrderDetail,getPrivateExpensesOrder } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
@@ -77,7 +79,7 @@
 
     methods: {
       getTimes(time) {
-        return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       getInfo(order_id) {
         let params = {
@@ -104,21 +106,29 @@
               console.log(infos)
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+                obj['feedetl_sn'] = infos.feedetl_sn
+
                 if(infos.project.type == 2){
                   obj['name'] = infos.project.project.project_name
+                  obj['spec'] = ''
+                  obj['unit'] =  infos.project.project.unit
+
+
                 }else if (infos.project.type == 3){
                   obj['name'] = infos.project.good_info.good_name
+                  obj['spec'] = infos.project.good_info.specification_name
+                  obj['unit'] = this.getGoodUnit(infos.project.good_info.good_unit)
+
                 }
-                obj['spec'] = 1
-                obj['unit'] = infos.project.unit
 
               }
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                 obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                 obj['name'] = infos.advice.advice_name
-                obj['spec'] = infos.advice.drug.drug_spec
-                obj['unit'] = infos.advice.drug.max_unit
+                obj['unit'] = infos.advice.drug.min_unit
+                obj['feedetl_sn'] =  infos.feedetl_sn
+
 
               }
               this.list.push(obj)
@@ -192,14 +202,27 @@
       },
       printThisPage() {
         if(this.org_id != 10106){
-          const style =
-          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
-          printJS({
-            printable: 'list-print',
-            type: 'html',
-            style: style,
-            scanStyles: false
-          })
+          if(this.org_id == 10215 || this.org_id == 0){
+            const style =
+                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+            printJS({
+              printable: 'allList-print',
+              type: 'html',
+              style: style,
+              scanStyles: false
+            })
+
+
+          }else {
+            const style =
+                '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+            printJS({
+              printable: 'list-print',
+              type: 'html',
+              style: style,
+              scanStyles: false
+            })
+          }
         }else{
           const style =
           '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
@@ -242,6 +265,13 @@
           }
         })
 
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
       },
       getInfo10106(order_id) {
         if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -4,38 +4,45 @@
       <div class="allListInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
-        <div>结算类型：{{balance_accounts_type == 1 ?'医保':'自费'}}</div>
+        <div>结算类型：{{order.is_medicine_insurance == 1 ?'医保':'自费'}}</div>
         <div>发票号码：</div>
+      </div>
+
+    <div class="allListInfo">
         <div>住院/门诊号：{{order.mdtrt_id}}</div>
-        <div>科室：</div>
-        <div>就诊流水号：</div>
+        <div>科室：血透</div>
+        <div>就诊流水号：{{order.mdtrt_id}}</div>
         <div>总费用：{{order.medfee_sumamt}}</div>
-        <div>个人支付：{{order.psn_part_amt}}</div>
+    </div>
+
+      <div class="allListInfo">
+
+      <div>个人支付：{{order.psn_part_amt}}</div>
         <div>基金支付记账：{{order.fund_pay_sumamt}}</div>
         <div>补充医疗支付记账：0.00</div>
         <div>救助支付金额：{{order.maf_pay}}</div>
       </div>
       <table class="allListTable" border="1">
         <tr>
-          <td style="width:10%">序号</td>
-          <td style="width:10%">处方日期</td>
+          <td style="width:5%">序号</td>
+          <td style="width:15%">处方日期</td>
           <td style="width:10%">费用编号</td>
-          <td style="width:10%">费用名称/规格</td>
-          <td style="width:10%">单位</td>
-          <td style="width:10%">数量</td>
+          <td style="width:40%">费用名称/规格</td>
+          <td style="width:5%">单位</td>
+          <td style="width:5%">数量</td>
           <td style="width:10%">单价</td>
           <td style="width:10%">金额</td>
         </tr>
         <template v-for='(item,index) in list'>
           <tr>
-            <td style="width:10%">{{index + 1}}</td>
-            <td style="width:10%">{{}}</td>
-            <td style="width:10%">{{ item.feedetl_sn }}</td>
-            <td style="width:50%">{{ }}</td>
-            <td style="width:10%">{{ }}</td>
-            <td style="width:10%">{{ item.cnt }}</td>
-            <td style="width:10%">{{ item.pric }}</td>
-            <td style="width:10%">{{ (item.pric * item.cnt).toFixed(2) }}</td>
+            <td style="width:5%">{{index + 1}}</td>
+            <td style="width:15%">{{item.p_time}}</td>
+            <td style="width:10%">{{item.feedetl_sn.split("-")[2]}}</td>
+            <td style="width:40%">{{item.name}}/{{item.spec}}</td>
+            <td style="width:5%">{{item.unit}}</td>
+            <td style="width:5%">{{ item.count }}</td>
+            <td style="width:10%">{{ item.price }}</td>
+            <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
           </tr>
         </template>
       </table>
@@ -114,7 +121,7 @@ export default {
   watch: {
     list: {
       handler(newVal) {
-        this.getPage()
+        // this.getPage()
       },
       deep: true
     }

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -14,8 +14,8 @@
           id="prescription-print"
           class="prescription-print"
           style="page-break-after: always"
-          v-for="(item, index) in i.prescriptions"
-          v-if="item.project.length > 0 && getTeam(i.prescriptions).length > 0"
+          v-for="(item, index) in i.new_prescriptions"
+          v-if="item.project.length > 0 && getTeam(i.new_prescriptions).length > 0"
           :key="index"
       >
         <div class="printTitle">检验申请单</div>
@@ -41,7 +41,7 @@
               }}
             </div>
             <div
-                v-for="item in getSingleTeam(i.prescriptions)"
+                v-for="item in getSingleTeam(i.new_prescriptions)"
                 :key="item"
                 style="margin-bottom: 10px"
             >
@@ -87,7 +87,7 @@
             <div>检验项目：</div>
             <div>
               <div
-                  v-for="item in getTeam(i.prescriptions)"
+                  v-for="item in getTeam(i.new_prescriptions)"
                   :key="item.id"
                   style="margin-bottom: 10px"
               >

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintTwo.vue

@@ -7,8 +7,8 @@
           <div class="infoTitle">
             <p>姓名：{{i.his_patient.id != 0 ? i.his_patient.name : i.name}}</p>
             <p>性别：
-              <span v-if="item.gender == 1">男</span>
-              <span v-if="item.gender == 2">女</span>
+              <span v-if="i.gender == 1">男</span>
+              <span v-if="i.gender == 2">女</span>
             </p>
             <p>年龄：{{ i.his_patient.id != 0 ? getAge(i.his_patient) : i.age}}岁</p>
           </div>

src/xt_pages/outpatientDoctorStation/batch_print_template/index.vue

@@ -14,8 +14,8 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       <div v-if="org_id != 10138 && org_id != 10278">
-        <printOne v-if="org_id != 10088 && org_id != 10215  && org_id != 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <batch-print-two v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></batch-print-two>
+        <printOne v-if="org_id != 10215" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+<!--        <batch-print-two v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></batch-print-two>-->
 <!--        <print-six v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></print-six>-->
 <!--        <printFour v-if="org_id == 10088 || org_id == 0"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>-->
 <!--        <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>-->

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -385,9 +385,8 @@ export default {
               }
             })
           } else {
-            // 过滤检查单数据出来，筛选出有检查项目的单子，不显示没有检查项目的单子
             Arr.forEach((el) => {
-              el.prescriptions.forEach((o) => {
+              el.new_prescriptions.forEach((o) => {
                 o.project.forEach((i) => {
                   if (i.team.project_team != '') {
                     new_patients.push(el)
@@ -397,7 +396,7 @@ export default {
             })
             let projectPrint = []
             new_patients.forEach((el) => {
-              el.prescriptions.map((item) => {
+              el.new_prescriptions.map((item) => {
                 if (item.project.length > 0) {
                   item.project.map((it) => {
                     projectPrint.push(it)

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -98,7 +98,7 @@
             </div>
             <div style="margin-bottom: 10px; display: flex">
               临床诊断：{{
-                hisPatient.diagnosis ? getDiagnosis(hisPatient.diagnosis) : ""
+                item.info ? getDiagnosis(item.info.diagnosis) : ""
               }}
             </div>
             <div style="margin-bottom: 10px; display: flex">

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -1,12 +1,7 @@
 <template>
-  <!-- <div class="main-contain outpatientChargesManagement">
-      <div class="position">
-          <bread-crumb :crumbs='crumbs'></bread-crumb>
-      </div> -->
   <div>
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
       <div>
-
         <el-select size="small" v-model="item_type" placeholder="请选择"
                    style="width:150px;margin-left:10px;" @change="changeItem">
           <el-option
@@ -21,15 +16,20 @@
           </el-option>
         </el-select>
 
-        <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small"  v-model.trim="search_input"
-                    class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
-                     @click="searchAction">
-            搜索
-          </el-button>
-        </div>
-
+        <el-input
+            size="small"
+            style="width: 150px"
+            v-model="keywords"
+            class="filter-item"
+        />
+        <el-button
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="searchAction"
+        >搜索
+        </el-button>
         <el-date-picker
             v-model="chargeDate"
             type="daterange"
@@ -40,6 +40,8 @@
             end-placeholder="结束日期">
         </el-date-picker>
       </div>
+      <div>
+      </div>
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -81,16 +83,22 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetSummaryDetail } from '@/api/his/his'
-import { uParseTime } from '@/utils/tools'
-import axios from 'axios'
+import {  } from '@/api/his/his'
 const moment = require('moment')
 export default {
   components: {
     BreadCrumb
 
   },
+  props: {
+    patient_id: {
+      type: Number,
+      default: 0
+    }
+  },
+
   data() {
+
     return {
       detail_loading: false,
       tempArr: [],
@@ -123,274 +131,18 @@ export default {
       this.getSummaryDetailList()
     },
     getSummaryDetailList() {
-      this.detail_loading = true
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
       let params = {
+        patient_id:this.patient_id,
         start_time: start_time,
         end_time: end_time,
         type: this.item_type,
         keyword: this.keywords
       }
-      GetSummaryDetail(params).then(response => {
-        if (response.data.state == 0) {
-          this.detail_loading = false
-
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.detail_loading = false
-
-          this.tableData = []
-          let tempPatients = []
-          let tempPatientsTwo = []
-
-          let tempData = response.data.data.patients
-          let data = response.data.data.patients
-          let orders = this.unique(tempData)
-          for (let i = 0; i < orders.length; i++) {
-            let obj = {
-              patient_id: orders[i].id,
-              name: orders[i].name,
-              orders: []
-            }
-            for (let b = 0; b < data.length; b++) {
-              if (orders[i].id == data[b].id) {
-                obj.orders = obj.orders.concat(data[b].orders)
-              }
-            }
-            tempPatients.push(obj)
-          }
-
-          for (let i = 0; i < tempPatients.length; i++) {
-            let obj = {
-              patient_id: tempPatients[i].patient_id,
-              name: tempPatients[i].name,
-              order_info: []
-            }
-            let orders = tempPatients[i].orders
-            for (let b = 0; b < orders.length; b++) {
-              for (let c = 0; c < orders[b].order_info.length; c++) {
-                let newObj = {}
-
-                newObj['count'] = orders[b].order_info[c].cnt
-                newObj['price'] = orders[b].order_info[c].pric
-                if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
-                  newObj['type'] = 1
-                  newObj['item_name'] = orders[b].order_info[c].advice.advice_name
-                  newObj['item_id'] = orders[b].order_info[c].advice.drug_id
-
-                  if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
-                    newObj['item_spec'] =  orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit
-                  } else {
-
-                    newObj['item_spec'] = ''
-                  }
-
-                }
-                if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
-                  newObj['type'] = 2
-                  newObj['item_id'] = orders[b].order_info[c].project.project_id
-
-                  if (orders[b].order_info[c].project.type == 2) {
-                    newObj['item_spec'] =""
-                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
-
-
-                  } else if (orders[b].order_info[c].project.type == 3) {
-                    newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
-                    newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
-
-
-                  }
-                }
-                obj.order_info.push(newObj)
-              }
-            }
-            tempPatientsTwo.push(obj)
-          }
-
-          for (let d = 0; d < tempPatientsTwo.length; d++) {
-            tempPatientsTwo[d]['new_order_info'] = []
-            let project = []
-            let advice = []
-            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
-              if (tempPatientsTwo[d].order_info[b].type == 1) {
-                advice.push(tempPatientsTwo[d].order_info[b])
-              } else {
-                project.push(tempPatientsTwo[d].order_info[b])
-              }
-            }
-            project = this.uniqueProjectAndAdvice(project)
-            advice = this.uniqueProjectAndAdvice(advice)
-
-            for (let i = 0; i < project.length; i++) {
-              let obj = {}
-              let count = 0
-              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
-                if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
-                  count = count + tempPatientsTwo[d].order_info[a].count
-                }
-              }
-
-
-
-              obj['price'] = project[i].price
-              obj['type'] = project[i].type
-              obj['item_name'] = project[i].item_name
-              obj['item_spec'] = project[i].item_spec
-
-              obj['item_id'] = project[i].item_id
-              obj['name'] = tempPatientsTwo[d].name
-              obj['patient_id'] = tempPatientsTwo[d].patient_id
-              obj['count'] = count
-              tempPatientsTwo[d].new_order_info.push(obj)
-            }
-
-            for (let i = 0; i < advice.length; i++) {
-              let obj = {}
-              let count = 0
-              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
-                if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
-                  count = count + tempPatientsTwo[d].order_info[a].count
-                }
-              }
-
-              obj['price'] = advice[i].price
-              obj['type'] = advice[i].type
-              obj['item_name'] = advice[i].item_name
-              obj['item_spec'] = advice[i].item_spec
-              obj['item_id'] = advice[i].item_id
-              obj['name'] = tempPatientsTwo[d].name
-              obj['patient_id'] = tempPatientsTwo[d].patient_id
-              obj['count'] = count
-              tempPatientsTwo[d].new_order_info.push(obj)
-            }
-
-          }
-
-          for (let i = 0; i < tempPatientsTwo.length; i++) {
-            let total = 0
-            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-              let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-              // console.log('3 ' + new_name)
-              if (new_name != undefined){
-                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].patient_id)
-                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].price)
-                // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].count)
-                //
-                // new_name = new_name.replace('（ ', '')
-                // new_name = new_name.replace(' ）', '')
-                if (new_name.length != 0) {
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
-                }
-
-
-
-              }
-
-
-            }
-            tempPatientsTwo[i]['total'] = total
-          }
-          console.log('tempPatientsTwo', tempPatientsTwo)
-          for (let i = 0; i < tempPatientsTwo.length; i++) {
-            // console.log(111,tempPatientsTwo[i].total)
-            if (tempPatientsTwo[i].new_order_info.length > 0) {
-
-              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                // console.log('2 ' + new_name)
-                //
-                // new_name = new_name.replace('（ ', '')
-                // new_name = new_name.replace(' ）', '')
-
-                let obj = {
-                  name: tempPatientsTwo[i].name,
-                  patient_id: tempPatientsTwo[i].patient_id,
-                  price: tempPatientsTwo[i].new_order_info[b].price,
-                  type: tempPatientsTwo[i].new_order_info[b].type,
-                  item_name: tempPatientsTwo[i].new_order_info[b].item_name,
-                  item_id: tempPatientsTwo[i].new_order_info[b].item_id,
-                  count: tempPatientsTwo[i].new_order_info[b].count,
-                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
-                }
-
-
-                // if(b == 0){
-                obj['total'] = tempPatientsTwo[i].total
-                // }else{
-                //   obj['total'] = 0
-                // }
-                this.tableData.push(obj)
-
-
-              }
-            }
-          }
-          this.handleSpanTempArr()
-          // this.tableData = tempPatientsTwo
-
-          // console.log(tempPatientsTwo.length)
-          //
 
-        }
-        //
-        // console.log('去重前')
-        // console.log(advice)
-        // console.log(project)
-        // //
-        // //
 
-        // //
-        // console.log('去重后')
-        //
-        // console.log(advice.length)
-        // console.log(project.length)
-        //
-        // for (let i = 0; i < project.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = project[i].price
-        //     obj['type'] = project[i].type
-        //     obj['item_name'] = project[i].item_name
-        //     obj['item_id'] = project[i].item_id
-        //     obj['name'] = project[i].name
-        //     obj['patient_id'] = project[i].patient_id
-        //     obj['count'] = count
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        //
-        //
-        // for (let i = 0; i < advice.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = advice[i].price
-        //     obj['type'] = advice[i].type
-        //     obj['item_name'] = advice[i].item_name
-        //     obj['item_id'] = advice[i].item_id
-        //     obj['name'] = advice[i].name
-        //     obj['patient_id'] = advice[i].patient_id
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        // console.log(this.tableData.length)
-        // this.tableData = this.sort(this.tableData)
 
-      })
     },
   },
   created() {

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -1,13 +1,156 @@
 <template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+        <el-select size="small" v-model="item_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeItem">
+          <el-option
+              label="全部"
+              value="0">
+          </el-option>
+          <el-option
+              v-for="(item,index) in items"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+          </el-option>
+        </el-select>
 
+        <el-input
+            size="small"
+            style="width: 150px"
+            v-model="keywords"
+            class="filter-item"
+        />
+        <el-button
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="searchAction"
+        >搜索
+        </el-button>
+        <el-date-picker
+            v-model="chargeDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            @change="changeDate"
+            end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
+      <div>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              show-summary
+              max-height="600"
+              v-loading="detail_loading"
+              highlight-current-row>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column align="center" prop="name" label="处方日期">
+        <template slot-scope="scope">{{  }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="费用分类">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="项目名称">
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格型号">
+        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="数量">
+        <template slot-scope="scope">{{scope.row.count}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="单价">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="金额">
+        <template slot-scope="scope">
+          <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="医保类别">
+        <template slot-scope="scope"></template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+
+  <!-- </div> -->
 </template>
 
+
 <script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import {  } from '@/api/his/his'
+const moment = require('moment')
 export default {
-  name: 'gatherStatistics'
-}
-</script>
+  components: {
+    BreadCrumb
+
+  },
+  props: {
+    patient_id: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+
+    return {
+      detail_loading: false,
+      tempArr: [],
+      pos: 0,
+      search_input: '',
+
+      sameRowArr: [],
+      keywords: '',
+      tableData: [],
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      items: [
+        { id: 1, name: '药品' },
+        { id: 3, name: '耗材' },
+        { id: 2, name: '项目' }
 
-<style scoped>
+      ]
 
-</style>
+    }
+  },
+  methods: {
+    searchAction(){
+
+
+    },
+    changeDate() {
+      this.getSummaryDetailList()
+    },
+    changeItem() {
+      this.getSummaryDetailList()
+    },
+    getSummaryDetailList() {
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        patient_id:this.patient_id,
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords
+      }
+
+
+
+    },
+  },
+  created() {
+    this.getSummaryDetailList()
+
+  }
+}
+</script>

src/xt_pages/outpatientTool/statistics.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="main-contain new-main-contain">
     <div class="position">
+<!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
@@ -22,8 +23,8 @@
           <el-tab-pane label="明细" name="明细"></el-tab-pane>
           <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
         </el-tabs>
-        <detail-statistics v-if="titleType == '明细'"></detail-statistics>
-        <gather-statistics v-if="titleType == '汇总'"></gather-statistics>
+        <detail-statistics v-if="titleType == '明细'" :patient_id="patient_id"></detail-statistics>
+        <gather-statistics v-if="titleType == '汇总'" :patient_id="patient_id"></gather-statistics>
       </div>
     </div>
   </div>
@@ -34,12 +35,14 @@ import {
   GetAllPatients,
 } from '@/api/his/his_tools'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
 import DetailStatistics from './components/detailStatistics'
 import GatherStatistics from './components/gatherStatistics'
 export default {
   components: {
     GatherStatistics,
     DetailStatistics,
+    BreadCrumb,
 
 
   },
@@ -47,12 +50,13 @@ export default {
 
     return {
       patientTableData:[],
-      tableHeight: '',
+      tableHeight: 400,
       crumbs: [
         { path: false, name: 'His工具' },
         { path: false, name: '明细汇总统计' }
       ],
-      titleType: '明细'
+      titleType: '明细',
+      patient_id:0
     }
   },
   methods: {
@@ -63,10 +67,12 @@ export default {
           return false
         } else {
           this.patientTableData = response.data.data.list
+          this.patient_id =  this.patientTableData[0].id
         }
       })
     },
-    handleCurrentChange(){
+    handleCurrentChange(row){
+      this.patient_id =  row.id
 
     },