diff --git a/app/Http/Controllers/FenZhenController.php b/app/Http/Controllers/FenZhenController.php index 9ad53a1..e38b4e4 100644 --- a/app/Http/Controllers/FenZhenController.php +++ b/app/Http/Controllers/FenZhenController.php @@ -16,6 +16,7 @@ class FenZhenController extends Controller // $order_id=91; $order_info= DB::table('user_orders')->where('id', $order_id)->first(); if(!!$order_info){ + $hospitalInfo=DB::table('hospitals')->where('id', $order_info->hospital)->first(); $appointmentDate=substr($order_info->appointment_time, 0, 10).' 08:00:00'; $item_ids=json_decode($order_info->item_ids, true); $dataList=[]; @@ -52,7 +53,7 @@ class FenZhenController extends Controller "exam_id" => $order_info->exam_number, "data" =>$dataList ); - $url = $this->baseUrl.'/in/push_order.php'; + $url = $hospitalInfo->fenzhen_base_url.'/in/push_order.php'; $res = self::post($url,$array); $res=json_decode($res,true); if($res['code']===200 and isset($res['data']['create_ids'])){ @@ -79,8 +80,6 @@ class FenZhenController extends Controller //查询分诊那边的记录 public function FenZhenChaXun(Request $request){ - - $url = $this->baseUrl.'/in/get_list.php'; Login::user(); $sfz = $request->post('sfz'); $order_info= DB::table('user_orders')->where(['user'=>Login::$info->id,'id_number'=>$sfz]) @@ -89,6 +88,8 @@ class FenZhenController extends Controller ->orderBy('id','desc')->first(); if(!!$order_info){ + $hospitalInfo=DB::table('hospitals')->where('id', $order_info->hospital)->first(); + $url = $hospitalInfo->fenzhen_base_url.'/in/get_list.php'; //用户信息 $buy_info=json_decode($order_info->buy_info, true); $sex=$order_info->sex; @@ -109,7 +110,7 @@ class FenZhenController extends Controller $res=json_decode($res,true); if($res['code']===200){ - $reg_num= isset($res['data']['list'][0]['reg_number'])?$res['data']['list'][0]['reg_number']:''; + $reg_num= isset($res['data']['list'][0]['reg_number'])?$res['data']['list'][0]['reg_number']:'0'; $generator = new \Picqer\Barcode\BarcodeGeneratorHTML(); $a= $generator->getBarcode($reg_num, $generator::TYPE_CODE_128, 3, 50); $user_info=[ diff --git a/北京国康小程序/api/api.js b/北京国康小程序/api/api.js index 6e80537..8f8171e 100644 --- a/北京国康小程序/api/api.js +++ b/北京国康小程序/api/api.js @@ -2,7 +2,7 @@ let url_ = "https://bjgk-api.sixinyun.com"; let report_url_ = "https://bjgk-api.sixinyun.com"; //let report_url_ = "http://192.168.31.106:5173"; let h5_url_ = "https://bjgk-api.sixinyun.com"; -const dev =0; +const dev =1; if (dev === 1) { url_ = "http://beijingguokang"; report_url_ = "http://192.168.31.106:5173"; diff --git a/北京国康小程序/api/index.js b/北京国康小程序/api/index.js index 63d40c3..d95ff82 100644 --- a/北京国康小程序/api/index.js +++ b/北京国康小程序/api/index.js @@ -4,7 +4,7 @@ import { import $api from './api.js' let url_ = "https://bjgk-api.sixinyun.com"; let chat_url = "https://bjgk-api.sixinyun.com" -const dev = 0 +const dev = 1 if (dev === 1) { url_ = "http://beijingguokang" chat_url = "http://192.168.31.106:5173"