diff --git a/Laravel/app/Http/Controllers/API/Third/CSharpController.php b/Laravel/app/Http/Controllers/API/Third/CSharpController.php index 44cc50e..8477460 100644 --- a/Laravel/app/Http/Controllers/API/Third/CSharpController.php +++ b/Laravel/app/Http/Controllers/API/Third/CSharpController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\API\Third; +use App\Http\Controllers\API\His\HisController; use App\Http\Controllers\Controller; use Illuminate\Database\Schema\Blueprint; use Illuminate\Http\Request; @@ -41,6 +42,28 @@ class CSharpController extends Controller } if ($entrust) { + //查询his获取检查申请单 + $patientHisTypeMap = [ + 0 => '03', // I - 住院 + 1 => 'O1', // O - 门诊 + 2 => '02', // E - 急诊 + 3 => '04', // H - 体检 + ]; + $sendHisData = [ + 'visitSqNo' => $entrust->episodeid, + 'requestNo' => $entrust->app_num, + 'visitTypeCode' => $patientHisTypeMap[$entrust->patient_type], + 'moOrder' => $entrust->entrust_id, + ]; + $hisInfo=[]; + $His = new HisController(); + $res = $His::Get("查询检查申请单", $sendHisData); + if ($res['code'] == 200) { + $res_data = $res['data']; + foreach ($res_data as $data_k => $data_v) { + $hisInfo=$data_v; + } + } $patientTypeMap = [ 0 => 'I', // I - 住院 1 => 'O', // O - 门诊 @@ -81,7 +104,8 @@ class CSharpController extends Controller 'checkitemcode' => $entrust->entrust_code, 'checkitemname' => $entrust->entrust, ], - ] + ], + 'hisinfo' => $hisInfo, ] ] ] diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php index 78fc79d..74bca68 100644 --- a/Laravel/app/Http/Controllers/API/Third/PacsController.php +++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php @@ -52,7 +52,7 @@ class PacsController extends Controller "idCardNumber", "reservation_sources as reservation_sources_id", - )->where(['reservation_date'=>date('Y-m-d'),'is_del'=>0,'is_nullify'=>0]); + )->where(['reservation_date'=>date('Y-m-d'),'is_pay'=>1,'is_del'=>0,'is_nullify'=>0]); if(isset($dateRange)){ if(!is_array($dateRange)) return \Yz::JsonError("日期范围必须是数组"); $entrust_list=$entrust_list->whereBetween('entrust_date',[$dateRange[0],$dateRange[1]]);