Merge branch 'pro' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

application/inter/controller/Inspectregister.php

@@ -93,7 +93,7 @@ class Inspectregister extends Base
         try{
             $sessionid = $_REQUEST['sessionid'];
             $examid = $_REQUEST['param']['id'];
-            $examinfo = DB::table('exams')->where('id',$examid)->field(['id','exam_status','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id','application_department','application_doctor'])->find();
+            $examinfo = DB::table('exams')->where('id',$examid)->field(['id','exam_status','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id','application_department','application_doctor','patient_area'])->find();
             $examinfo['family_ill'] = explode(',',$examinfo['family_ill']);
             $examinfo['anamnesis'] = explode(',',$examinfo['anamnesis']);
             $exam_class = DB::table('constant')->where('id',$examinfo['exam_class'])->field('constant_value as name')->cache(300)->find();
@@ -412,6 +412,9 @@ class Inspectregister extends Base
             $exam_info['exam_sub_class']     = isset($param['checkchild']) ? $param['checkchild'] : '';
             $exam_info['body_part']          = isset($param['body']) ? $param['body'] : '';
             $exam_info['device']             = isset($param['device']) ? $param['device'] : '';
+            $exam_info['patient_area']       = isset($param['patient_area']) ? $param['patient_area'] : '';
+            $exam_info['hopitalized_no']     = isset($param['hopitalized_no']) ? $param['hopitalized_no'] : '';
+            $exam_info['bed_no']             = isset($param['bed_no']) ? $param['bed_no'] : '';
             if(isset($param['checktime']) && !empty($param['checktime'])){
                 $exam_info['exam_datetime']      = str_replace('-', '', $param['checktime']);
             }

application/inter/controller/Login.php

@@ -99,20 +99,20 @@ class Login extends Controller
 
             $check = '';
 
-            if($info['is_send_message'] == "1") {
-                $check = $this->check_phone($info['phone']);
-                if(!$check){
-                    return json_encode(['status'=>'fail','code'=>'0912','msg'=>'手机号为空或手机号格式错误']);
+                if($info['is_send_message'] == "1") {
+                    $check = $this->check_phone($info['phone']);
+                    if(!$check){
+                        return json_encode(['status'=>'fail','code'=>'0912','msg'=>'手机号为空或手机号格式错误']);
+                    }
+                    $phone = $info['phone'];
+                    $code = rand('1000','9999');
+                    $handle_id = $phone.rand('10000000','99999999');
+                    Cache::set('sendcode_'.$phone,$code,600);
+                    Cache::set('sendcode_handle_id'.$handle_id, $phone, 600);
+                    $info = send_message::sendSms2UpDate($phone,$code);
+                    log::record("login() set code => {handle_id: $handle_id \t code: $code \t phone: $phone \t}");
+                    return json_encode(['status'=>'ok','code'=>'0000','need_code'=> true, 'phone' => $check, 'handle_id' => $handle_id]);
                 }
-                $phone = $info['phone'];
-                $code = rand('1000','9999');
-                $handle_id = $phone.rand('10000000','99999999');
-                Cache::set('sendcode_'.$phone,$code,600);
-                Cache::set('sendcode_handle_id'.$handle_id, $phone, 600);
-                $info = send_message::sendSms2UpDate($phone,$code);
-                log::record("login() set code => {handle_id: $handle_id \t code: $code \t phone: $phone \t}");
-                return json_encode(['status'=>'ok','code'=>'0000','need_code'=> true, 'phone' => $check, 'handle_id' => $handle_id]);
-            }
 
             //医生类
             $class_info = DB::table('doctor_class')->where('doctor_id',$info['id'])->cache(300)->find();