Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

app/Community/Controllers/ApiController.php

@@ -380,7 +380,12 @@ class ApiController extends Controller
 //                        echo '时间列类型'.($i).'----'.$key.'星期数'.'<br>';
 //                        foreach ($times[$i-1] as $id){
 //                            $new_week_data['time_period_id'] = $id;
-                            $is_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$sType,'type'=>$i,'week'=>$key])->value('id');
+                            $is_have=0;
+                            if($sType == 1){
+                                $is_have = WeekSchedule::where(['docter_id'=>$docter_id,'schedule_type'=>$sType,'type'=>$i,'week'=>$key])->count();
+                            }else{
+                                $is_have = WeekSchedule::where(['organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_type'=>$sType,'type'=>$i,'week'=>$key])->count();
+                            }
                             if(!$is_have)  WeekSchedule::insert($new_week_data);
 //                            dump($new_week_data);
                             $k++;