浏览代码

周排班逻辑优化

Swdz-WangHaiJun 4 年之前
父节点
当前提交
3058ef8023
共有 2 个文件被更改,包括 714 次插入558 次删除
  1. 135 152
      app/Community/Controllers/ApiController.php
  2. 579 406
      app/Http/Controllers/ScheDuleController.php

+ 135 - 152
app/Community/Controllers/ApiController.php

@@ -234,18 +234,11 @@ class ApiController extends Controller
         $docter_id = intval(request('docter_id'));
         $docter_id = intval(request('docter_id'));
         $org_id = intval(request('org_id'));
         $org_id = intval(request('org_id'));
         $type = intval(request('type'));
         $type = intval(request('type'));
+        $role = intval(request('role'));
         if(empty($docter_id) || empty($type)){
         if(empty($docter_id) || empty($type)){
             return apiReturn(604,'缺少必要参数');
             return apiReturn(604,'缺少必要参数');
         }
         }
 
 
-        if($type == 1){
-            $role = 2;
-            $setting = DocterSetting::where(['docter_id'=>$docter_id,'type'=>$type])->first();
-        } else {
-            $role = 1;
-            $setting = OrganizationSettings::where(['org_id'=>$docter_id])->first();
-        }
-
         //周字段映射
         //周字段映射
         $week_arr = [1=>'monday',2=>'tuesday',3=>'wednesday',4=>'thursday',5=>'friday',6=>'saturday',7=>'sunday'];
         $week_arr = [1=>'monday',2=>'tuesday',3=>'wednesday',4=>'thursday',5=>'friday',6=>'saturday',7=>'sunday'];
         $data = [
         $data = [
@@ -280,31 +273,45 @@ class ApiController extends Controller
                 'sunday'=>false,
                 'sunday'=>false,
             ]
             ]
         ];
         ];
-        if($role == 2){
-            for ($i=0;$i<=7;$i++){
-                if($i == 0) continue;
-                for($j=0;$j<=2;$j++){
-                    $is_self_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'organization_id'=>$org_id,'week'=>$i,'type'=>$j+1])->count();
-                    $is_other_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'week'=>$i,'type'=>$j+1])->where('organization_id','!=',$org_id)->count();
-                    if($is_self_have){
-                        $data[$j][$week_arr[$i]] = true;
+
+
+        if($type == 1){
+            if($role == 2){
+                for ($i=0;$i<=7;$i++){
+                    if($i == 0) continue;
+                    for($j=0;$j<=2;$j++){
+                        $is_self_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'organization_id'=>$org_id,'week'=>$i,'type'=>$j+1])->count();
+                        $is_other_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'week'=>$i,'type'=>$j+1])->where('organization_id','!=',$org_id)->count();
+                        if($is_self_have){
+                            $data[$j][$week_arr[$i]] = true;
+                        }
+                        if($is_other_have){
+                            $data[$j][$week_arr[$i]] = 'other';
+                        }
                     }
                     }
-                    if($is_other_have){
-                        $data[$j][$week_arr[$i]] = 'other';
+                }
+            } else {
+                for ($i=0;$i<6;$i++){
+                    for($j=0;$j<=2;$j++){
+                        $is_self_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'organization_id'=>$org_id,'week'=>$i+1])->count();
+                        $is_other_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'week'=>$i+1])->where('docter_id','!=',$docter_id)->count();
+                        if($is_self_have){
+                            $data[$j][$week_arr[$i]] = true;
+                        }
+                        if($is_other_have){
+                            $data[$j][$week_arr[$i]] = 'other';
+                        }
                     }
                     }
                 }
                 }
             }
             }
         } else {
         } else {
+            $docter_id = 0;
             for ($i=0;$i<6;$i++){
             for ($i=0;$i<6;$i++){
                 for($j=0;$j<=2;$j++){
                 for($j=0;$j<=2;$j++){
                     $is_self_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'organization_id'=>$org_id,'week'=>$i+1])->count();
                     $is_self_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'organization_id'=>$org_id,'week'=>$i+1])->count();
-                    $is_other_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'week'=>$i+1])->where('docter_id','!=',$docter_id)->count();
                     if($is_self_have){
                     if($is_self_have){
                         $data[$j][$week_arr[$i]] = true;
                         $data[$j][$week_arr[$i]] = true;
                     }
                     }
-                    if($is_other_have){
-                        $data[$j][$week_arr[$i]] = 'other';
-                    }
                 }
                 }
             }
             }
         }
         }
@@ -330,13 +337,11 @@ class ApiController extends Controller
         if(empty($docter_id) || empty($org_id) || empty($type) || empty($data)){
         if(empty($docter_id) || empty($org_id) || empty($type) || empty($data)){
             return apiReturn(601,'缺少必要参数');
             return apiReturn(601,'缺少必要参数');
         }
         }
-//        $docter_setting = [];
         if($type == 1){
         if($type == 1){
             $docter_setting = DocterSetting::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->first();
             $docter_setting = DocterSetting::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->first();
         } else {
         } else {
             $docter_setting = OrganizationSettings::where(['org_id'=>$org_id])->first();
             $docter_setting = OrganizationSettings::where(['org_id'=>$org_id])->first();
         }
         }
-//        dd($docter_setting);
 
 
 
 
         $times = [];
         $times = [];
@@ -347,89 +352,38 @@ class ApiController extends Controller
             $times[] = TimePeriod::where(['docter_id'=>$docter_id])->whereBetween('end_time_period',[intval($time_period[3]['nightStartTime']),intval($time_period[3]['nightEndTime'])])->pluck('id')->toArray();
             $times[] = TimePeriod::where(['docter_id'=>$docter_id])->whereBetween('end_time_period',[intval($time_period[3]['nightStartTime']),intval($time_period[3]['nightEndTime'])])->pluck('id')->toArray();
         }
         }
 
 
-        //沒有配置就新建
-//        if(empty($docter_setting) || $times){
-//            $docter_config = SystemConfig::get('docter_config');
-//            $amCount = intval(((strtotime($docter_config['morning_end'])) - (strtotime($docter_config['morning_start']))) / ($docter_config['service_time']*60));
-//            $pmCount = intval(((strtotime($docter_config['afternoon_end'])) - (strtotime($docter_config['afternoon_start']))) / ($docter_config['service_time']*60));
-//            $evCount = intval(((strtotime($docter_config['evening_end'])) - (strtotime($docter_config['evening_start']))) / ($docter_config['service_time']*60));
-//            $c_r = [
-//                1=>['count'=>$amCount,'start_time'=>$docter_config['morning_start'],'end_time'=>$docter_config['morning_end']],
-//                2=>['count'=>$pmCount,'start_time'=>$docter_config['afternoon_start'],'end_time'=>$docter_config['afternoon_end']],
-//                3=>['count'=>$evCount,'start_time'=>$docter_config['evening_start'],'end_time'=>$docter_config['evening_end']]
-//            ];
-//
-//            if($type == 1){
-//                $setingData = [
-//                    'docter_id'=>$docter_id,
-//                    'type'=>$type,
-//                    'status'=>false,
-//                    'show_days'=>7,
-//                    'service_time'=>json_encode($c_r),
-//                    'service_times'=>30,
-//                ];
-//                $isHave = DocterSetting::where($setingData)->count();
-//                if(!$isHave) {
-//                    DocterSetting::insert($setingData);
-//                }
-//            } else {
-//                $setingData = [
-//                    'org_id'=>$docter_id,
-//                    'type'=>$type,
-//                    'status'=>false,
-//                    'show_days'=>7,
-//                    'service_time'=>json_encode($c_r),
-//                    'service_times'=>30,
-//                ];
-//                $isHave = OrganizationSettings::where($setingData)->count();
-//                if(!$isHave) {
-//                    OrganizationSettings::insert($data);
-//                }
-//            }
-//            foreach ($c_r as $key => $val){
-//                self::makeTimePeriod($type,$docter_id,$org_id,$key,$val,$val['count'],$docter_config['service_time']);
-//            }
-//
-//
-//        }
-
-        if($type == 1){
-            $week_data = [
-                'organization_id'=>$org_id,
-                'docter_id'=>$docter_id
-            ];
-        } else {
-            $week_data = [
-                'organization_id'=>$org_id,
-                'docter_id'=>0
-            ];
+        if(count($times) < 3){
+            return apiReturn('603','请配置时间段');
         }
         }
-        $week_data  ['schedule_type']=$type;
 
 
-        $k = 0;
+        if($type != 1){
+            $docter_id = 0;
+        }
+        $week_data  ['schedule_type'] = $type;
+        $week_data  ['organization_id'] = $org_id;
+        $week_data  ['docter_id'] = $docter_id;
         DB::beginTransaction();
         DB::beginTransaction();
         $data[0] = array_values(object_array(json_decode($data[0])));
         $data[0] = array_values(object_array(json_decode($data[0])));
         $data[1] = array_values(object_array(json_decode($data[1])));
         $data[1] = array_values(object_array(json_decode($data[1])));
         $data[2] = array_values(object_array(json_decode($data[2])));
         $data[2] = array_values(object_array(json_decode($data[2])));
+        $k = 0;
         try {
         try {
             for($i=1;$i<=3;$i++){
             for($i=1;$i<=3;$i++){
                 $schedule_data = $data[$i-1];
                 $schedule_data = $data[$i-1];
                 foreach ($schedule_data as $key=>$schedule){
                 foreach ($schedule_data as $key=>$schedule){
                     if($key == 0) continue;
                     if($key == 0) continue;
-                    $week_data ['type'] = $i;
-                    $week_data ['week'] = $key;
                     if($schedule == true){
                     if($schedule == true){
+                        $new_week_data = $week_data;
+                        $new_week_data ['type'] = $i;
+                        $new_week_data ['week'] = $key;
+                        $k++;
 //                        echo '时间列类型'.($i+1).'----'.$key.'星期数'.'<br>';
 //                        echo '时间列类型'.($i+1).'----'.$key.'星期数'.'<br>';
                         foreach ($times[$i-1] as $id){
                         foreach ($times[$i-1] as $id){
-                            $week_data['time_period_id'] = $id;
-                            if($type == 1){
-                                $is_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'type'=>$i,'week'=>$key])->where('time_period_id',$id)->value('id');
-                            } else {
-                                $is_have = WeekSchedule::where(['docter_id'=>0,'schedule_type'=>$type,'type'=>$i,'week'=>$key])->where('time_period_id',$id)->value('id');
-                            }
+                            $new_week_data['time_period_id'] = $id;
+                            $is_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$type,'type'=>$i,'week'=>$key,'organization_id'=>$org_id])
+                                ->where('time_period_id',$id)->value('id');
                             if($is_have) continue;
                             if($is_have) continue;
-                            $k++;
-                            WeekSchedule::insert($week_data);
+                            WeekSchedule::insert($new_week_data);
                         }
                         }
                     } else if ($schedule == false) {
                     } else if ($schedule == false) {
                         if($type == 1){
                         if($type == 1){
@@ -440,9 +394,14 @@ class ApiController extends Controller
                             if($is_have) WeekSchedule::where(['docter_id' => 0, 'organization_id' => $org_id, 'schedule_type' => $type,'type'=>$i,'week'=>$key])->whereIn('time_period_id', $times[$i-1])->delete();
                             if($is_have) WeekSchedule::where(['docter_id' => 0, 'organization_id' => $org_id, 'schedule_type' => $type,'type'=>$i,'week'=>$key])->whereIn('time_period_id', $times[$i-1])->delete();
                         }
                         }
                     }
                     }
+                    $k++;
+
                 }
                 }
             }
             }
+
             //todo 修改月视图
             //todo 修改月视图
+
+
             DB::commit();
             DB::commit();
         } catch (\Exception $e){
         } catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();
@@ -551,8 +510,6 @@ class ApiController extends Controller
         $types = [1=>1,2=>2,3=>3];
         $types = [1=>1,2=>2,3=>3];
         $settingConfig =  self::getSetting($type,$docter_id,$org_id);
         $settingConfig =  self::getSetting($type,$docter_id,$org_id);
 
 
-//        dump(date('Y-m-d',$start_time));
-//        dd(date('Y-m-d',$end_time));
         if($type == 1){
         if($type == 1){
             $schedule_data = Schedule::where(['docter_id'=>$docter_id,'organization_id'=>$org_id])
             $schedule_data = Schedule::where(['docter_id'=>$docter_id,'organization_id'=>$org_id])
                 ->whereBetween('schedule_date',[$start_date,$end_date])->pluck('schedule_date','id')->toArray();
                 ->whereBetween('schedule_date',[$start_date,$end_date])->pluck('schedule_date','id')->toArray();
@@ -562,31 +519,32 @@ class ApiController extends Controller
             whereBetween('schedule_date',[$start_date,$end_date])->pluck('schedule_date','id')->toArray();
             whereBetween('schedule_date',[$start_date,$end_date])->pluck('schedule_date','id')->toArray();
             $serviceConfig = object_array(json_decode($settingConfig['service_time']));
             $serviceConfig = object_array(json_decode($settingConfig['service_time']));
         }
         }
-        if(!empty($settingConfig)){
-            $baseData =  [
-                ['status'=>false,'type'=>1,'start'=>$serviceConfig[1]['amStartTime'],'end'=>$serviceConfig[1]['amEndTime']],
-                ['status'=>false,'type'=>2,'start'=>$serviceConfig[2]['pmStartTime'],'end'=>$serviceConfig[2]['pmEndTime']],
-                ['status'=>false,'type'=>3,'start'=>$serviceConfig[3]['nightStartTime'],'end'=>$serviceConfig[3]['nightEndTime']],
-            ];
 
 
-        } else{
-            $serviceConfig = '';
+
+        if(!empty($settingConfig)){
             $baseData =  [
             $baseData =  [
                 ['status'=>false,'type'=>1,'start'=>$serviceConfig[1]['amStartTime'],'end'=>$serviceConfig[1]['amEndTime']],
                 ['status'=>false,'type'=>1,'start'=>$serviceConfig[1]['amStartTime'],'end'=>$serviceConfig[1]['amEndTime']],
                 ['status'=>false,'type'=>2,'start'=>$serviceConfig[2]['pmStartTime'],'end'=>$serviceConfig[2]['pmEndTime']],
                 ['status'=>false,'type'=>2,'start'=>$serviceConfig[2]['pmStartTime'],'end'=>$serviceConfig[2]['pmEndTime']],
                 ['status'=>false,'type'=>3,'start'=>$serviceConfig[3]['nightStartTime'],'end'=>$serviceConfig[3]['nightEndTime']],
                 ['status'=>false,'type'=>3,'start'=>$serviceConfig[3]['nightStartTime'],'end'=>$serviceConfig[3]['nightEndTime']],
             ];
             ];
 
 
-            self::baseMonthSchedule($month_day,$baseData);
-            return [];
         }
         }
+//        else{
+//            $baseData =  [
+//                ['status'=>false,'type'=>1,'start'=>$serviceConfig[1]['amStartTime'],'end'=>$serviceConfig[1]['amEndTime']],
+//                ['status'=>false,'type'=>2,'start'=>$serviceConfig[2]['pmStartTime'],'end'=>$serviceConfig[2]['pmEndTime']],
+//                ['status'=>false,'type'=>3,'start'=>$serviceConfig[3]['nightStartTime'],'end'=>$serviceConfig[3]['nightEndTime']],
+//            ];
+//
+//            self::baseMonthSchedule($month_day,$baseData);
+//            return [];
+//        }
+
 
 
         for($i=1;$i<=$month_day; $i++){
         for($i=1;$i<=$month_day; $i++){
-            //$startKey = date('d',time());
             $week = date('N',$start_time + ($i-1) * 86400);
             $week = date('N',$start_time + ($i-1) * 86400);
             $scheduleDate = date('Y-m-d',$start_time + ($i-1) * 86400);
             $scheduleDate = date('Y-m-d',$start_time + ($i-1) * 86400);
 
 
-
             if(empty($schedule_data)){
             if(empty($schedule_data)){
                 $scheduleList[] = [
                 $scheduleList[] = [
                     'schedulelingList'=>$baseData,
                     'schedulelingList'=>$baseData,
@@ -600,7 +558,8 @@ class ApiController extends Controller
                 if($type == 1){//门诊
                 if($type == 1){//门诊
                     $today = SchedulePeriod::where(['docter_id'=>$docter_id,'schedule_date'=>$scheduleDate])->where('organization_id','=',$org_id)->distinct('organization_id')
                     $today = SchedulePeriod::where(['docter_id'=>$docter_id,'schedule_date'=>$scheduleDate])->where('organization_id','=',$org_id)->distinct('organization_id')
                         ->distinct('type')->get(['organization_id','type'])->GroupBy('type')->toArray();
                         ->distinct('type')->get(['organization_id','type'])->GroupBy('type')->toArray();
-                    $self = SelfSchedule::where(['schedule_date'=>$scheduleDate,'docter_id'=>$docter_id,])->where('organization_id','!=',0)->pluck('type','organization_id')->toArray();
+                    $self = SelfSchedule::where(['schedule_date'=>$scheduleDate,'docter_id'=>$docter_id,'organization_id'=>$org_id])
+                        ->pluck('type','organization_id')->toArray();
 //                    //检查排班详情
 //                    //检查排班详情
 //                    self::checkDaySchedule($date,$type,$docter_id,$org_id);
 //                    self::checkDaySchedule($date,$type,$docter_id,$org_id);
 //                    //检查自己排班
 //                    //检查自己排班
@@ -616,19 +575,20 @@ class ApiController extends Controller
                         ];
                         ];
                     } else {
                     } else {
 //                        echo '周几'.$week.' 日期 '.$scheduleDate;
 //                        echo '周几'.$week.' 日期 '.$scheduleDate;
-//                        dd($today);
-                        foreach ($today as $type => $orginfo){
-                            $newBase =$baseData;
+                        $newBase =$baseData;
+//                        dump($today);
+                        foreach ($today as $tType => $orginfo){
                             $orgids = array_column($orginfo,'organization_id');
                             $orgids = array_column($orginfo,'organization_id');
                             $idSum = array_sum($orgids);
                             $idSum = array_sum($orgids);
-                            if($org_id == $idSum) $newBase[$type]['status'] = true;
-                            if($org_id != $idSum) $newBase[$type]['status'] = 'other';
-                            if(in_array($type,$self))
+                            if($org_id == $idSum) $newBase[$tType-1]['status'] = true;
+                            if($org_id != $idSum) $newBase[$tType-1]['status'] = 'other';
+                            if(in_array($tType,$self))
                                 foreach($self as $key=>$org){
                                 foreach($self as $key=>$org){
-                                    $newBase[$type]['status'] = true;
-                                    if($org != $org_id) $newBase[$type]['status'] = 'other';
+                                    $newBase[$tType-1]['status'] = true;
+                                    if($org != $org_id) $newBase[$tType-1]['status'] = 'other';
                             }
                             }
                         }
                         }
+//                        dump($newBase);
                         $scheduleList[] = [
                         $scheduleList[] = [
                             'schedulelingList'=>$newBase,
                             'schedulelingList'=>$newBase,
                             'date'=>$i,
                             'date'=>$i,
@@ -731,8 +691,8 @@ class ApiController extends Controller
         $org_id = intval(request('org_id'));
         $org_id = intval(request('org_id'));
         $type = intval(request('type'));
         $type = intval(request('type'));
 
 
-        $setting = DocterSetting::where(['docter_id'=>$docter_id])->first();
-        if($type  == 1){
+        $setting = DocterSetting::where(['docter_id'=>$docter_id,'org_id'=>$org_id])->first();
+        if($type  == 2){
             $setting = OrganizationSettings::where(['org_id'=>$org_id])->first();
             $setting = OrganizationSettings::where(['org_id'=>$org_id])->first();
         }
         }
         $docterConfig = SystemConfig::get('docter_config');
         $docterConfig = SystemConfig::get('docter_config');
@@ -801,6 +761,8 @@ class ApiController extends Controller
         //是否改变了服务时长
         //是否改变了服务时长
         $changeSeviceTime = false;
         $changeSeviceTime = false;
 
 
+        $Today = date('Y-m-d',time());
+
         //同时服务人数
         //同时服务人数
         $serviceNum = intval($configData['serviceNum']);
         $serviceNum = intval($configData['serviceNum']);
 
 
@@ -826,11 +788,16 @@ class ApiController extends Controller
             }
             }
         }
         }
         // ToDO 算时间段个数
         // ToDO 算时间段个数
+        $amCount = self::getTimeCount($configData['amStartTime'],$configData['amEndTime'],$serviceTime);
+        $pmCount = self::getTimeCount($configData['pmStartTime'],$configData['pmEndTime'],$serviceTime);
+        $nightCount = self::getTimeCount($configData['nightStartTime'],$configData['nightEndTime'],$serviceTime);
+
+
         //添加时间段
         //添加时间段
         $countArr = [
         $countArr = [
-            1=>$configData['amNum'],
-            2=>$configData['pmNum'],
-            3=>$configData['nightNum'],
+            1=>$amCount,
+            2=>$pmCount,
+            3=>$nightCount,
         ];
         ];
 
 
         $c_r = [
         $c_r = [
@@ -838,6 +805,7 @@ class ApiController extends Controller
             2=>['count'=>$configData['pmNum'],'start_time'=>$configData['pmStartTime'],'end_time'=>$configData['pmEndTime']],
             2=>['count'=>$configData['pmNum'],'start_time'=>$configData['pmStartTime'],'end_time'=>$configData['pmEndTime']],
             3=>['count'=>$configData['nightNum'],'start_time'=>$configData['nightStartTime'],'end_time'=>$configData['nightEndTime']]
             3=>['count'=>$configData['nightNum'],'start_time'=>$configData['nightStartTime'],'end_time'=>$configData['nightEndTime']]
         ];
         ];
+
         if(!$changeSeviceTime && empty($changeTimer)){
         if(!$changeSeviceTime && empty($changeTimer)){
             return apiReturn(603,'数据为改变');
             return apiReturn(603,'数据为改变');
         }
         }
@@ -847,14 +815,12 @@ class ApiController extends Controller
             DB::beginTransaction();
             DB::beginTransaction();
             try {
             try {
                 //1.删除旧时间段,并删除排班数据
                 //1.删除旧时间段,并删除排班数据
-//                    $type == 1 ? $id = $docter_id : $id = $org_id;
                 if($type !=1 ){
                 if($type !=1 ){
                     $docter_id = 0;
                     $docter_id = 0;
                 }
                 }
                 //todo 暂时未删除周排班
                 //todo 暂时未删除周排班
                 self::deleteScheduleInfo($docter_id,$tType,$org_id);
                 self::deleteScheduleInfo($docter_id,$tType,$org_id);
-                $count = intval($countArr[$tType] / $serviceNum);
-//                    dd($countArr);
+                $count = $countArr[$i];
                 //2.创建新时间段
                 //2.创建新时间段
                 self::makeTimePeriod($docter_id,$org_id,$tType,$c_r[$tType],$count,$serviceTime);
                 self::makeTimePeriod($docter_id,$org_id,$tType,$c_r[$tType],$count,$serviceTime);
 
 
@@ -873,7 +839,7 @@ class ApiController extends Controller
                     $time_periods = TimePeriod::where(['org_id' => $org_id, 'docter_id' => 0, 'type' => $tType])->pluck('id')->toArray();
                     $time_periods = TimePeriod::where(['org_id' => $org_id, 'docter_id' => 0, 'type' => $tType])->pluck('id')->toArray();
                     $schedule = Schedule::where(['docter_id' => 0, 'organization_id'=>$org_id])->pluck('schedule_date', 'id')->toArray();
                     $schedule = Schedule::where(['docter_id' => 0, 'organization_id'=>$org_id])->pluck('schedule_date', 'id')->toArray();
                     $self_schedule = SelfSchedule::where(['docter_id' => 0, 'schedule_type' => $type,'organization_id'=>$org_id,'type' =>$tType])->distinct('type')
                     $self_schedule = SelfSchedule::where(['docter_id' => 0, 'schedule_type' => $type,'organization_id'=>$org_id,'type' =>$tType])->distinct('type')
-                        ->orderBy('schedule_date')->get(['schedule_date', 'type', 'week'])->toArray();
+                        ->orderBy('schedule_date')->where('schedule_date','>',$Today)->get(['schedule_date', 'type', 'week'])->toArray();
                     $week_schedule = WeekSchedule::where(['organization_id' =>$org_id, 'type' => $tType,'schedule_type'=>$type])
                     $week_schedule = WeekSchedule::where(['organization_id' =>$org_id, 'type' => $tType,'schedule_type'=>$type])
                         ->distinct('type')
                         ->distinct('type')
                         ->orderBy('week')
                         ->orderBy('week')
@@ -883,17 +849,17 @@ class ApiController extends Controller
                 }
                 }
 
 
                 if (empty($week_schedule)) {
                 if (empty($week_schedule)) {
-
-//                        Schedule::where(['docter_id' => $docter_id])->delete();
-//                        SelfSchedule::where(['docter_id' => $docter_id])->delete();
+                        // Schedule::where(['docter_id' => $docter_id])->delete();
+                        // SelfSchedule::where(['docter_id' => $docter_id])->delete();
                 } else {
                 } else {
                     //3.以周模板添加2个月的数据
                     //3.以周模板添加2个月的数据
-                    self::makeSchedule($docter_id,$org_id,$tType,$schedule,$time_periods);
+                    self::makeSchedule($docter_id,$org_id,$tType,$schedule,$time_periods,$serviceNum);
 
 
-                    //4.复自己设置的排班
-                    self::makeSelfScheeule($docter_id,$org_id,$type,$time_periods,$self_schedule);
+                    //4.复自己设置的排班
+                    self::makeSelfScheeule($docter_id,$org_id,$type,$tType,$time_periods,$self_schedule);
 
 
                     //TODO 删除周排班,插入新周排班
                     //TODO 删除周排班,插入新周排班
+                    self::changeWeekSchedule($docter_id,$org_id,$type,$tType,$time_periods);
                 }
                 }
                 DB::commit();
                 DB::commit();
             } catch (\Exception $e) {
             } catch (\Exception $e) {
@@ -1037,13 +1003,6 @@ class ApiController extends Controller
                 'start_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + ($i-1)*$serviceTime*60),
                 'start_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + ($i-1)*$serviceTime*60),
                 'end_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + $i*$serviceTime*60),
                 'end_time_period'=> date('H:i',strtotime($timeConfig['start_time']) + $i*$serviceTime*60),
             ];
             ];
-//            if($scheduleType == 1){
-//                $timePreiod['org_id'] = $orgId;
-//                $timePreiod['docter_id'] = $docterId;
-//            }  else {
-//                $timePreiod['docter_id'] = 0;
-//                $timePreiod['org_id'] = $orgId;
-//            }
             $isHave = TimePeriod::where($timePreiod)->count();
             $isHave = TimePeriod::where($timePreiod)->count();
             if($isHave) continue;
             if($isHave) continue;
             TimePeriod::insert($timePreiod);
             TimePeriod::insert($timePreiod);
@@ -1052,7 +1011,7 @@ class ApiController extends Controller
     }
     }
 
 
     //以周模板进行排班
     //以周模板进行排班
-    public static function makeSchedule ($docterId,$orgId,$tType,$schedule,$timePeriods){
+    public static function makeSchedule ($docterId,$orgId,$tType,$schedule,$timePeriods,$serviceNum){
 
 
         if(empty($schedule) || count($schedule) < 58){
         if(empty($schedule) || count($schedule) < 58){
             $start = strtotime(date('Y-m-1',time()));
             $start = strtotime(date('Y-m-1',time()));
@@ -1100,18 +1059,17 @@ class ApiController extends Controller
         foreach ($schedule as $id => $date) {
         foreach ($schedule as $id => $date) {
             $week = intval(date('N', strtotime($date)));
             $week = intval(date('N', strtotime($date)));
 //            echo '医生id '.$docterId.' 机构id '.$orgId.' 周几 '.$week;
 //            echo '医生id '.$docterId.' 机构id '.$orgId.' 周几 '.$week;
-            $real_id = WeekSchedule::where(['docter_id'=>$docterId,'organization_id'=>$orgId,'week'=>$week])->first();
+            $real_id = WeekSchedule::where(['docter_id'=>$docterId,'organization_id'=>$orgId,'week'=>$week,'type'=>$tType])->first();
                 if (!empty($real_id)) {
                 if (!empty($real_id)) {
 //                    dump($schedule);
 //                    dump($schedule);
-
                     foreach ($timePeriods as $idt) {
                     foreach ($timePeriods as $idt) {
-
                         if($docterId != 0){//门诊
                         if($docterId != 0){//门诊
                             $s_t = [
                             $s_t = [
                                 'docter_id' => $docterId,
                                 'docter_id' => $docterId,
                                 'organization_id' => $orgId,
                                 'organization_id' => $orgId,
                                 'type' => $tType,
                                 'type' => $tType,
                                 'schedule_date' => $date,
                                 'schedule_date' => $date,
+                                'order_num' => $serviceNum,
                                 'schedule_id' => $id,
                                 'schedule_id' => $id,
                                 'time_period_id' => $idt
                                 'time_period_id' => $idt
                             ];
                             ];
@@ -1123,15 +1081,15 @@ class ApiController extends Controller
                                 'organization_id' => $orgId,
                                 'organization_id' => $orgId,
                                 'type' => $tType,
                                 'type' => $tType,
                                 'schedule_date' => $date,
                                 'schedule_date' => $date,
+                                'order_num' => $serviceNum,
                                 'schedule_id' => $id,
                                 'schedule_id' => $id,
                                 'time_period_id' => $idt
                                 'time_period_id' => $idt
                             ];
                             ];
                             $scheduleIsHave = SchedulePeriod::where($s_t)->where('docter_id','=',0)->count();
                             $scheduleIsHave = SchedulePeriod::where($s_t)->where('docter_id','=',0)->count();
                             if ($scheduleIsHave) continue;
                             if ($scheduleIsHave) continue;
                         }
                         }
-
                         $res = SchedulePeriod::insert($s_t);
                         $res = SchedulePeriod::insert($s_t);
-//                        dd($res);
+
                     }
                     }
                 }
                 }
         }
         }
@@ -1139,19 +1097,17 @@ class ApiController extends Controller
     }
     }
 
 
     //自己排班
     //自己排班
-    public static function makeSelfScheeule($docterId,$orgId,$type,$timesPeriods,$selfSchedule){
-        if($type == 1){
-            SelfSchedule::where(['type'=>1,'docter_id'=>$docterId,'organization_id'=>$orgId,'schedule_type'=>$type])->whereIn('time_period_id',$timesPeriods)->delete();
-        } else {
-            SelfSchedule::where(['type'=>1,'docter_id'=>0,'organization_id'=>$orgId,'schedule_type'=>$type])->whereIn('time_period_id',$timesPeriods)->delete();
-            $docterId = 0;
-        }
+    public static function makeSelfScheeule($docterId,$orgId,$scheduleType,$timeType,$timesPeriods,$selfSchedule){
+
+        $date = date('Y-m-d',time());
+        //删除自己排班数据
+        SelfSchedule::where(['type'=>$timeType,'docter_id'=>$docterId,'organization_id'=>$orgId,'schedule_type'=>$scheduleType])->where('schedule_date','>',$date)->delete();
         foreach ($selfSchedule as $val) {
         foreach ($selfSchedule as $val) {
             $self_data = $val;
             $self_data = $val;
             $self_data['organization_id'] = $orgId;
             $self_data['organization_id'] = $orgId;
             $self_data['docter_id'] = $docterId;
             $self_data['docter_id'] = $docterId;
-            foreach ($timesPeriods as $idt) {
-                $self_data['time_period_id'] = $idt;
+            foreach ($timesPeriods as $id) {
+                $self_data['time_period_id'] = $id;
                 $is_self_have = SelfSchedule::where($self_data)->count();
                 $is_self_have = SelfSchedule::where($self_data)->count();
                 if ($is_self_have) continue;
                 if ($is_self_have) continue;
                 SelfSchedule::insert($self_data);
                 SelfSchedule::insert($self_data);
@@ -1379,4 +1335,31 @@ class ApiController extends Controller
         return $timeperiods;
         return $timeperiods;
     }
     }
 
 
+    //更新周排班时间段
+    public static function changeWeekSchedule($docterId,$orgId,$scheduleType,$timeType,$timePeriod)
+    {
+        //获取旧的周排班
+        $oldWeekSchedule = WeekSchedule::where(['docter_id'=>$docterId,'organization_id'=>$orgId,'schedule_type'=>$scheduleType])->orderBy('week')->distinct('type')->get(['organization_id','docter_id','schedule_type','week','type'])->toArray();
+
+        //删除老周排班
+        WeekSchedule::where(['docter_id'=>$docterId,'organization_id'=>$orgId,'schedule_type'=>$scheduleType,'type'=>$timeType])->delete();
+
+
+//        //更新时间段
+        foreach ($oldWeekSchedule as $daySchedule){
+            foreach ($timePeriod as $id){
+                $daySchedule['time_period_id'] = $id;
+                WeekSchedule::insert($daySchedule);
+            }
+        }
+        return true;
+    }
+
+    //计算时间段
+    public  static  function  getTimeCount($startTime,$endTime,$serviceTime)
+    {
+        if(empty($startTime) || empty($endTime) || empty($serviceTime) ) return 0;
+        return intval(( strtotime($endTime) - strtotime($startTime) ) / ($serviceTime * 60) );
+    }
+
 }
 }

文件差异内容过多而无法显示
+ 579 - 406
app/Http/Controllers/ScheDuleController.php


部分文件因为文件数量过多而无法显示