Code merge

app/Http/Controllers/Api/V2/DoctorController.php

@@ -44,6 +44,7 @@ use App\Models\DocterServiceTimes;
 use App\Models\CallLog;
 use App\Models\ImMessage;
 use App\Models\DocterLable;
+use App\Models\SchedueFlags as Sflag;
 
 
 /**
@@ -397,6 +398,8 @@ class DoctorController extends AuthController
             // 修改更多信息
             if ($finds['is_chat'] == 0) {
                 if (isset($data['is_chat']) && !empty($data['is_chat'])) {
+                    return out('', 500, '您未开启图文');
+
                     unset($data['is_chat']);
                 }
             } else {
@@ -472,9 +475,12 @@ class DoctorController extends AuthController
         $finds = Docter::select(['is_chat', 'is_phone', 'is_appoint'])->where('id', $doctor_id)->first();
         Db::beginTransaction();
         try {
+
             if ($finds['is_phone'] == 0) {
                 if (isset($data['is_phone']) && !empty($data['is_phone'])) {
+                    return out('', 500, '您未开启电话');
                     unset($data['is_phone']);
+
                 }
             } else {
                 if (isset($data['is_phone']) && !empty($data['is_phone'])) {
@@ -482,6 +488,8 @@ class DoctorController extends AuthController
                     DocterServiceTimes::where(['docter_id'=>$doctor_id,'type'=>1])->delete();
 
                     $save_data = $data['is_phone'];
+
+
                     $newData = [];
                     $serviceData = [];
 
@@ -558,6 +566,8 @@ class DoctorController extends AuthController
         try {
             if ($finds['is_appoint'] == 0) {
                 if (isset($data['is_appoint']) && !empty($data['is_appoint'])) {
+                    return out('', 500, '您未开启门诊');
+
                     unset($data['is_appoint']);
                 }
             } else {
@@ -2027,7 +2037,7 @@ class DoctorController extends AuthController
                             if (!$times) {
                                 return out('', 500, "请先在排班设置中填写本机构的早上时间段");
                             }
-                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['zao'], 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 1], $doctor_id);
+                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['zao'],'me_sure'=>0, 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 1], $doctor_id);
                             if ($maf) {
                                 foreach ($maf as $os) {
                                     $scheduleLists[] = $os;
@@ -2039,7 +2049,7 @@ class DoctorController extends AuthController
                             if (!$times) {
                                 return out('', 500, "请先在排班设置中填写本机构的下午时间段");
                             }
-                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['zhong'], 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 2], $doctor_id);
+                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['zhong'],'me_sure'=>0, 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 2], $doctor_id);
                             if ($maf) {
                                 foreach ($maf as $os) {
                                     $scheduleLists[] = $os;
@@ -2051,7 +2061,7 @@ class DoctorController extends AuthController
                             if (!$times) {
                                 return out('', 500, "请先在排班设置中填写本机构的晚上时间段");
                             }
-                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['wan'], 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 3], $doctor_id);
+                            $maf = $this->getMaf($vv, $times, ['organization_id' => $v['identifi']['wan'],'me_sure'=>0, 'schedule_date' => $schedule[$kk]['schedule_date'], 'type' => 3], $doctor_id);
                             if ($maf) {
                                 foreach ($maf as $os) {
                                     $scheduleLists[] = $os;