|
|
@@ -221,7 +221,7 @@ class Reciveremote extends Base
|
|
|
} else {
|
|
|
$where2 = "(`ra`.`report_status` = '4' or `ra`.`report_status` = '6' or `ra`.`report_status` = '7' or `ra`.`report_status` = '8' or `ra`.`report_status` = '9') and (`ra`.`remote_doctor_id`= ? or `ra`.`remote_doctor_id` = '')";
|
|
|
}
|
|
|
- $filed = "`ra`.`id` as `ra_id`, `ra`.`anamnesis`, `ra`.`application_desc`, `ra`.`attachment`, `ra`.`clin_diag`, `ra`.`clin_symp`, `ra`.`createdAt`, `ra`.`exam_id`, `ra`.`family_ill`, `ra`.`illness_desc`, `ra`.`is_urgent`, `ra`.`local_institution_id`, `ra`.`marrital`, `ra`.`phys_sign`, `ra`.`remark`, `ra`.`remote_doctor_id`, `ra`.`remote_institution_id`, `ra`.`report_status`, `ra`.`req_date_time`, `ra`.`req_doctor_id`, `ra`.`status`, `e`.`body_part`, `e`.`exam_class`, `e`.`device`, `e`.`exam_datetime`, `e`.`id` as `exam_id`, `e`.`exam_status`, `e`.`exam_sub_class`, `e`.`id`, `e`.`severe`, `e`.`patient_id`, `r`.`report_datetime` as `rdatetime`, `r`.`report_datetime`, `r`.`report_doctor_id`, `r`.`id` as `report_id`, `r`.`report_result`, `pi`.`age`, `pi`.`name`, `pi`.`sex`, `i`.`name` as `local_institution_name`";
|
|
|
+ $filed = "`d`.`realname` as `report_doctor_id`, `ra`.`id` as `ra_id`, `ra`.`anamnesis`, `ra`.`application_desc`, `ra`.`attachment`, `ra`.`clin_diag`, `ra`.`clin_symp`, `ra`.`createdAt`, `ra`.`exam_id`, `ra`.`family_ill`, `ra`.`illness_desc`, `ra`.`is_urgent`, `ra`.`local_institution_id`, `ra`.`marrital`, `ra`.`phys_sign`, `ra`.`remark`, `ra`.`remote_doctor_id`, `ra`.`remote_institution_id`, `ra`.`report_status`, `ra`.`req_date_time`, `ra`.`req_doctor_id`, `ra`.`status`, `e`.`body_part`, `e`.`exam_class`, `e`.`device`, `e`.`exam_datetime`, `e`.`id` as `exam_id`, `e`.`exam_status`, `e`.`exam_sub_class`, `e`.`id`, `e`.`severe`, `e`.`patient_id`, `r`.`report_datetime` as `rdatetime`, `r`.`report_datetime`, `r`.`report_doctor_id`, `r`.`id` as `report_id`, `r`.`report_result`, `pi`.`age`, `pi`.`name`, `pi`.`sex`, `i`.`name` as `local_institution_name` left join `doctors` `d` on `r`.`report_doctor_id` = `d`.`id`";
|
|
|
$table = "`remote_application` `ra` left join `remote_order` `ro` on `ro`.`id` = (select `id` from `remote_order` `rot` where `rot`.`application_id` = `ra`.`id` order by `timestamp` desc limit 1) left join `exams` `e` on `ra`.`exam_id` = `e`.`id` left join `report` `r` on `ra`.`id` = `r`.`remote_application_id` left join `patient_infos` `pi` on `e`.`patient_id` = `pi`.`id` left join `institution` `i` on `ra`.`local_institution_id` = `i`.`id`";
|
|
|
$where1 = "`ra`.`remote_institution_id` = ?";
|
|
|
$where3 = "(`ro`.`status` is null or `ro`.`status` = 2 or `ro`.`status` = 3)";
|
|
|
@@ -320,6 +320,18 @@ class Reciveremote extends Base
|
|
|
log::record($options);
|
|
|
log::record("----options----");
|
|
|
$list = DB::query($listSql, $options);
|
|
|
+ foreach($list as $v) {
|
|
|
+ if(empty($v['report_id'])) {
|
|
|
+ $data = array();
|
|
|
+ $data['id'] = UUIDs::uuid16();
|
|
|
+ $data['exam_id'] = $v['exam_id'];
|
|
|
+ $data['remote_application_id'] = $v['ra_id'];
|
|
|
+ $data['type'] = 2;
|
|
|
+ $data['createdAt'] = date('Y-m-d H:i:s',time());
|
|
|
+ DB::table('report')->insert($data);
|
|
|
+ $v['report_id'] = $data['id'];
|
|
|
+ }
|
|
|
+ }
|
|
|
// var_dump($res);
|
|
|
return json_encode(['status'=>'ok','code'=>'0000','count'=>$count[0]['count'],'info'=>$list,'sessionid'=>$sessionid]);
|
|
|
} catch(\Exception $e) {
|
fuyu