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

application/common/library/AliyunSms.php

@@ -75,9 +75,6 @@ class AliyunSms
      * @return response {object} 返回
      */
     public static function sendSms($phone, $sign, $templateCode, $parmasObj) {
-        if($phone != "13763459789") {
-            return null;
-        }
         // 初始化SendSmsRequest实例用于设置发送短信的参数
         $request = new SendSmsRequest();
 

application/inter/controller/Reciveremote.php

@@ -130,7 +130,7 @@ class Reciveremote extends Base
                 $sql3 = "SELECT e.exam_status,e.exam_class,e.body_part,e.device,e.exam_sub_class,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id'] . "'and e.exam_status not in (".$dclass['doctor_class'].")";
                 $sql = '('.$sql1.') union ('.$sql2.') union ('.$sql3.')'.$limit;
             }else{*/
-                $sql = "SELECT e.id,e.exam_status,e.exam_class,e.exam_sub_class,e.body_part,e.device,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where (ra.remote_doctor_id='".$doctor['id']."' or ra.remote_doctor_id='') ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where." order by field(e.exam_status,6,7,8,4,9,5),ra.is_urgent desc,ra.req_date_time desc";
+                $sql = "SELECT e.id,e.exam_status,e.exam_class,e.exam_sub_class,e.body_part,e.device,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where (ra.remote_doctor_id='".$doctor['id']."' or ra.remote_doctor_id='') and ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where." order by field(e.exam_status,6,7,8,4,9,5),ra.is_urgent desc,ra.req_date_time desc";
 //            }
             log::record($sql);
             $list = DB::query($sql);

application/inter/controller/Writereport.php

@@ -254,7 +254,7 @@ class Writereport extends Base
             $report_log = DB::table('report_record')->insert($log);
             log::record($report_log);
             log::record('----日志写入成功----');
-            $application = DB::table('exam_id',$id)->find();
+            $application = DB::table('remote_application')->where('exam_id',$id)->find();
             if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
                 // 上级医院
                 $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
@@ -525,10 +525,11 @@ class Writereport extends Base
             // $exam_status = $this->get_exam_status($doctor['id'],8);
             DB::table('exams')->where('id',$id)->update(['exam_status'=>'8','film_type'=>$param['film_type']]);
             //  已审核 发送短信
-            $application = DB::table('exam_id',$id)->find();
+            $application = DB::table('remote_application')->where('exam_id',$id)->find();
             if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
                 $dinfo = DB::table('doctors')->where('id',$application['req_doctor_id'])->find();
                 $d_phone = $dinfo['phone'];
+                log::record('发短信的手机号为'.$d_phone);
                 $d_name = '';
                 $repsone = send_message::sendSms2CompleteReport($d_phone,$d_name);
                 // 上级医院
@@ -536,10 +537,10 @@ class Writereport extends Base
                 //下级医院
                 $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
                 $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
-                $tel = '18910184804';
-                $type = '完成并审核报告';
-                $content  = $s_institution['name'].'医院的'.$doctor['realname'].'医生完成并审核了下级'.$x_institution['name'].'医院的'.$x_name['realname'].'医生发起的申请，单子的申请单id是'.$application['id'];
-                send_message::sendSms2Self($tel,$type,$content);
+//                $tel = '18910184804';
+//                $type = '完成并审核报告';
+//                $content  = $s_institution['name'].'医院的'.$doctor['realname'].'医生完成并审核了下级'.$x_institution['name'].'医院的'.$x_name['realname'].'医生发起的申请，单子的申请单id是'.$application['id'];
+//                send_message::sendSms2Self($tel,$type,$content);
             }
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已审核']);
         }catch(\Exception $e){