拉取his用户bug,改约 相同日期 给出提示

Laravel/app/Http/Controllers/API/His/UserController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\API\His;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use JWT;
 
 class UserController extends Controller
 {
@@ -26,6 +27,8 @@ class UserController extends Controller
                 }else{
                     if($data_v['levelName']=='护士'){
                         $group=3;
+                    }else{
+                        $group=3;//其余的都给护士权限
                     }
                 }
                 if (!$user) {
@@ -42,7 +45,7 @@ class UserController extends Controller
                 }else{
                     $u= DB::table('users')->where('id', $user->id)->update([
                         'cn_name' => $data_v['emplName'],
-                        'department_id' => $dept->id,
+                        'department_id' => isset($dept->id)?$dept->id:null,
                         'group' => $group,
                     ]);
                 }
@@ -54,4 +57,29 @@ class UserController extends Controller
         }
         return \Yz::JsonError("调用His接口失败");
     }
+
+    //用于his 医生直接跳转过来，查看开单记录
+    public function AutoLogin(){
+        $usercode = request('usercode');
+        $deptcode = request('deptcode');
+        if(empty($usercode) || empty($deptcode)){
+            return \Yz::JsonError("参数不全");
+        }
+        $dept=DB::table('s_department')->where(['department_number' => $deptcode])->first();
+        if(!$dept) return \Yz::JsonError("科室不存在");
+
+        $user=DB::table('users')->where('username', $usercode)->first();
+        if(!$user) return \Yz::JsonError("无效用户");
+        $u_user=DB::table('users')->where(['username' => $usercode])->update([
+            'department_id'=>$dept->id,
+            'updated_at'=>date('Y-m-d H:i:s')
+        ]);
+        $jwt= new JWT();
+        $accessTimeout = $jwt -> GetGetSecretTimeOut();
+        $refreshTimeout = $jwt -> GetRefreshTokenTimeOut();
+        $access_token = $jwt->BuildJWT('yz','access',$user->id,$user->group,$accessTimeout);
+        $refresh_token = $jwt->BuildJWT('yz','refresh',$user->id,'',$refreshTimeout);
+        DB::table('users')->where(['id'=>$user->id,'status'=>1])->update(['token'=>md5($refresh_token)]);
+        return \Yz::JsonReturn(true,'登录成功',['access_token'=>$access_token,'refresh_token'=>$refresh_token]);
+    }
 }

Laravel/app/Services/Admin/YeWu/PlanListService.php

@@ -229,6 +229,8 @@ WHERE
             }
             if ($do_type == 1 && $mainInfo->list_status <> 0) return \Yz::echoError1($mainInfo->entrust . ' ' . $msg_t . ',禁止预约');
             if ($do_type == 2 && $mainInfo->list_status <> 1) return \Yz::echoError1($mainInfo->entrust . ' ' . $msg_t . ',不允许改约操作');
+            if ($do_type == 2 && $mainInfo->roster_id == $planid) return \Yz::echoError1($mainInfo->entrust . ' '  . ',改约时间与之前相同，无需改约');
+
 
             //判断病人类型
             $plan_patient_type=explode(",", $planInfo->patient_type);