修改

application/admin/controller/PhStatistics.php

@@ -59,7 +59,10 @@ class PhStatistics extends Auth
             if ($delType != ''){
                 $map[] = ['a.mode','=',$delType];
             }
-
+            $cateId = input('cateId','','trim');
+            if($cateId){
+                $map[] = ['b.cate_id','=',$cateId];
+            }
             $map[] = ['a.pay_time','>=',$begin.' 00:00:00'];
             $map[] = ['a.pay_time','<=',$end.' 23:59:59'];
             $map[] = ['b.org_id','=',$this->orgId];
@@ -68,7 +71,7 @@ class PhStatistics extends Auth
                 ->join('ph_orders b','a.order_id = b.id')
                 ->join('dep c','b.dep_id = c.id','left')
                 ->join('ph_todo d',' a.order_id = d.order_id','left')
-                ->field('a.*,c.title as depTitle')
+                ->field('a.*,c.title as depTitle,b.cate_id')
                 ->group('a.sn')
                 ->order('a.pay_time','desc')
                 ->where($map)
@@ -106,6 +109,7 @@ class PhStatistics extends Auth
                     $workerIds[$k2] = $users[$v2];
                 }
                 $lists[$k]['worker'] = implode(',',$workerIds);
+                $lists[$k]['cateTitle'] = Db::name('cate')->where('id',$v['cate_id'])->value('title');
 
             }
             //数据返回
@@ -159,6 +163,8 @@ class PhStatistics extends Auth
             $this->assign('dep',$dep);
             $this->assign('begin',$begin);
             $this->assign('end',$end);
+            $cate =(new \app\common\model\Cate())->getAllByOrg($this->orgId);
+            $this->assign('cate',$cate);
             return $this->fetch();
         }
     }
@@ -205,7 +211,10 @@ class PhStatistics extends Auth
             if ($delType){
                 $map[] = ['a.mode','=',$delType];
             }
-
+            $cateId = input('cateId','','trim');
+            if($cateId){
+                $map[] = ['b.cate_id','=',$cateId];
+            }
             $map[] = ['a.pay_time','>=',$begin.' 00:00:00'];
             $map[] = ['a.pay_time','<=',$end.' 23:59:59'];
             $map[] = ['b.org_id','=',$this->orgId];
@@ -214,8 +223,9 @@ class PhStatistics extends Auth
                 ->join('ph_orders b','a.order_id = b.id')
                 ->join('dep c','b.dep_id = c.id','left')
                 ->join('ph_todo d',' a.order_id = d.order_id','left')
+                ->join('cate e',' b.cate_id = e.id','left')
                 ->order('a.pay_time','desc')
-                ->field('a.*,c.title as depTitle')
+                ->field('a.*,c.title as depTitle,e.title as cateTitle')
                 ->group('a.sn')
                 ->where($map)
                 ->select();
@@ -271,17 +281,18 @@ class PhStatistics extends Auth
                 ->setCellValue('A1', '订单编号')
                 ->setCellValue('B1', '下单科室')
                 ->setCellValue('C1', '护工')
-                ->setCellValue('D1', '患者姓名')
-                ->setCellValue('E1', '联系方式')
-                ->setCellValue('F1', '流水号')
-                ->setCellValue('G1', '交易时间')
-                ->setCellValue('H1', '金额')
-                ->setCellValue('I1', '交易类型')
-                ->setCellValue('J1', '支付方式')
-                ->setCellValue('K1', '操作人')
-                ->setCellValue('L1', '备注');
+                ->setCellValue('D1', '陪护服务')
+                ->setCellValue('E1', '患者姓名')
+                ->setCellValue('F1', '联系方式')
+                ->setCellValue('G1', '流水号')
+                ->setCellValue('H1', '交易时间')
+                ->setCellValue('I1', '金额')
+                ->setCellValue('J1', '交易类型')
+                ->setCellValue('K1', '支付方式')
+                ->setCellValue('L1', '操作人')
+                ->setCellValue('M1', '备注');
 
-            $arrs = ['A','B','C','D','E','F','G','H','I','J','H','I','J','K','L','M'];
+            $arrs = ['A','B','C','D','E','F','G','H','I','J','H','I','J','K','L','M','N'];
             foreach ($arrs as $arr){
                 // 设置表格头水平居中
                 $objPHPExcel->setActiveSheetIndex(0)->getStyle($arr.'1')->getAlignment()
@@ -298,24 +309,25 @@ class PhStatistics extends Auth
                 $objPHPExcel->getActiveSheet()->setCellValue('A' . ($i + 2), $lists[$i]['order_sn']);
                 $objPHPExcel->getActiveSheet()->setCellValue('B' . ($i + 2), $lists[$i]['depTitle']);
                 $objPHPExcel->getActiveSheet()->setCellValue('C' . ($i + 2), $lists[$i]['worker']);
-                $objPHPExcel->getActiveSheet()->setCellValue('D' . ($i + 2), $lists[$i]['contact']);
-                $objPHPExcel->getActiveSheet()->setCellValue('E' . ($i + 2), $lists[$i]['phone']);
-                $objPHPExcel->getActiveSheet()->setCellValue('F' . ($i + 2), $lists[$i]['sn']);
-                $objPHPExcel->getActiveSheet()->setCellValue('G' . ($i + 2), $lists[$i]['pay_time']);
-                $objPHPExcel->getActiveSheet()->setCellValue('H' . ($i + 2), $lists[$i]['money']);
-                $objPHPExcel->getActiveSheet()->setCellValue('I' . ($i + 2), $lists[$i]['modeName']);
-                $objPHPExcel->getActiveSheet()->setCellValue('J' . ($i + 2), $lists[$i]['pay_text']);
-                $objPHPExcel->getActiveSheet()->setCellValue('K' . ($i + 2), $lists[$i]['name']);
-                $objPHPExcel->getActiveSheet()->setCellValue('L' . ($i + 2), $lists[$i]['remark']);
+                $objPHPExcel->getActiveSheet()->setCellValue('D' . ($i + 2), $lists[$i]['cateTitle']);
+                $objPHPExcel->getActiveSheet()->setCellValue('E' . ($i + 2), $lists[$i]['contact']);
+                $objPHPExcel->getActiveSheet()->setCellValue('F' . ($i + 2), $lists[$i]['phone']);
+                $objPHPExcel->getActiveSheet()->setCellValue('G' . ($i + 2), $lists[$i]['sn']);
+                $objPHPExcel->getActiveSheet()->setCellValue('H' . ($i + 2), $lists[$i]['pay_time']);
+                $objPHPExcel->getActiveSheet()->setCellValue('I' . ($i + 2), $lists[$i]['money']);
+                $objPHPExcel->getActiveSheet()->setCellValue('J' . ($i + 2), $lists[$i]['modeName']);
+                $objPHPExcel->getActiveSheet()->setCellValue('K' . ($i + 2), $lists[$i]['pay_text']);
+                $objPHPExcel->getActiveSheet()->setCellValue('L' . ($i + 2), $lists[$i]['name']);
+                $objPHPExcel->getActiveSheet()->setCellValue('M' . ($i + 2), $lists[$i]['remark']);
             }
-            $objPHPExcel->getActiveSheet()->setCellValue('A' . (count($lists) + 2), '预收金:');
-            $objPHPExcel->getActiveSheet()->setCellValue('B' . (count($lists) + 2), $money1.'元');
-            $objPHPExcel->getActiveSheet()->setCellValue('C' . (count($lists) + 2), '服务费:');
-            $objPHPExcel->getActiveSheet()->setCellValue('D' . (count($lists) + 2), $money2.'元');
-            $objPHPExcel->getActiveSheet()->setCellValue('E' . (count($lists) + 2), '退款:');
-            $objPHPExcel->getActiveSheet()->setCellValue('F' . (count($lists) + 2), $money3.'元');
-            $objPHPExcel->getActiveSheet()->setCellValue('G' . (count($lists) + 2), '总金额:');
-            $objPHPExcel->getActiveSheet()->setCellValue('H' . (count($lists) + 2), $totalMoney.'元');
+            $objPHPExcel->getActiveSheet()->setCellValue('A' . (count($lists) + 3), '预收金:');
+            $objPHPExcel->getActiveSheet()->setCellValue('B' . (count($lists) + 3), $money1.'元');
+            $objPHPExcel->getActiveSheet()->setCellValue('C' . (count($lists) + 3), '服务费:');
+            $objPHPExcel->getActiveSheet()->setCellValue('D' . (count($lists) + 3), $money2.'元');
+            $objPHPExcel->getActiveSheet()->setCellValue('E' . (count($lists) + 3), '退款:');
+            $objPHPExcel->getActiveSheet()->setCellValue('F' . (count($lists) + 3), $money3.'元');
+            $objPHPExcel->getActiveSheet()->setCellValue('G' . (count($lists) + 3), '总金额:');
+            $objPHPExcel->getActiveSheet()->setCellValue('H' . (count($lists) + 3), $totalMoney.'元');
             //设置保存的Excel表格名称
             $filename = '流水列表' . date('YmdHis', time()) . '.xls';
 

application/admin/view/ph_statistics/ls.html

@@ -13,7 +13,7 @@
 </style>
 <div class="ibox">
     <div class="ibox-content">
-        <div class="row" style="margin-left: 40px !important;">
+        <div class="row" style="margin-left: 20px !important;">
             <div class="col-xs-16" style="text-align: left;">
                 <form class="form-inline" id="form-search" action="{:url('ls')}">
                     <div class="input-group">
@@ -22,7 +22,14 @@
                     <div class="input-group">
                         <input type="text"  class="form-control" name="name" placeholder="患者姓名">
                     </div>
-
+                    <div class="input-group">
+                        <select name="cateId" class="form-control">
+                            <option value="">陪护服务</option>
+                            {volist name="cate" id="v"}
+                            <option value="{$v.id}">{$v.title}</option>
+                            {/volist}
+                        </select>
+                    </div>
                     <div class="input-group">
                         <select name="depId" class="form-control">
                             <option value="">下单科室</option>
@@ -121,6 +128,7 @@
                     }},
                 {label:'下单科室',name:'depTitle',index:'depTitle',width:50,editable: false,sortable: false},
                 {label:'护工',name:'worker',index:'worker',width:50,editable: false,sortable: false},
+                {label:'陪护服务',name:'cateTitle',index:'cateTitle',width:50,editable: false,sortable: false},
                 {label:'患者姓名',name:'contact',index:'contact',width:35,editable: false,sortable: false},
                 {label:'联系方式',name:'phone',index:'phone',width:50,editable: false,sortable: false},
                 {label:'流水号',name:'sn',index:'sn',width:75,editable: false,sortable: false},