刘桂岩 il y a 5 ans
Parent
commit
5e8fea4ac3

+ 1 - 1
application/inter/controller/Application.php

@@ -665,7 +665,7 @@ class Application extends Base
         return json_encode(['status'=>'fail','code'=>'2109','msg' => '订单取消失败']);
     }
 
-    /**订单状态 创建 支付完成 订单完成 取消 */
+    /**订单状态 创建 支付完成 订单完成 取消 退款 */
     public const ORDER_STATUS = [
         'CREATE' => 1,
         'PAYCOMPLTET' => 2,

+ 3 - 15
application/manage/controller/Counts.php

@@ -111,37 +111,25 @@ class Counts extends Base {
         $params = $request->param();
         $where[] = ' e.film_type=2';
         foreach ($params as $k=>$v) {
+            if(empty($v)){
+                continue ;
+            }
             switch($k){
                 case 'upload_datetime1':
-                    if($params['upload_datetime1'] == null){
-                        continue 2;
-                    }
                     $where[] = ' s.createdAt > \''.$params['upload_datetime1'].'\' ';
                     break;
                 case 'upload_datetime2':
-                    if($params['upload_datetime2'] == null){
-                        continue 2;
-                    }
                     $where[] = ' s.createdAt < \''.$params['upload_datetime2'].'\' ';
                     break;
                 case 'exam_datetime1':
-                    if($params['exam_datetime1'] == null){
-                        continue 2;
-                    }
                     $exam1 = str_replace('-', '', $params['exam_datetime1']);
                     $where[] = ' s.studydate > \''.$exam1.'\' ';
                     break;
                 case 'exam_datetime2':
-                    if($params['exam_datetime2'] == null){
-                        continue 2;
-                    }
                     $exam2 = str_replace('-', '', $params['exam_datetime2']);
                     $where[] = ' s.studydate < \''.$exam2.'\' ';
                     break;
                 case 'exam_class':
-                    if($params['exam_class'] == null){
-                        continue 2;
-                    }
                     $where[] = 's.modality=\''.$params['exam_class'].'\' ';
                     break;
             }

+ 4 - 0
application/manage/controller/Doctors.php

@@ -347,6 +347,10 @@ class Doctors extends Base {
                 if(empty($v[2])){
                     continue;
                 }
+                $doctor_info = DB::table('doctors')->where('username',$v[2])->where('password',md5('123456'))->find();
+                if($doctor_info){
+                    continue;
+                }
                 $data[$k]['id'] = UUIDs::uuid16();
                 $data[$k]['realname'] = $v[0];
                 $data[$k]['doctor_title'] = isset($v[1]) ? $v[1] : '';