diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index dae7d44..80a425f 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -34,6 +34,8 @@ class WorkMainController extends Controller foreach ($info as $value){ $ii = DB::table('s_check_item as a') ->leftJoin('s_check_item_device as b','a.id','=','b.item_id') + ->leftJoin('s_department_resources_device as c','b.device_id','=','c.device_id') + ->leftJoin('s_department as d','c.department_id','=','d.id') ->where(['a.item_name' => $value->entrust,'a.status'=>1,"a.is_del"=>0])->get(); $source=null; if(!empty($value->reservation_sources)){ @@ -79,6 +81,17 @@ class WorkMainController extends Controller // } // } + $enable_zhixingkeshi_name=[]; + $enable_zhixingkeshi_code=[]; + foreach ($ii as $ii_value){ + if (!empty($ii_value->department_number) and !in_array($ii_value->department_name, $enable_zhixingkeshi_name)) { + $enable_zhixingkeshi_name[]=$ii_value->department_name; + $enable_zhixingkeshi_code[]=$ii_value->department_number; + } + } + if(count($enable_zhixingkeshi_code)>0 and !in_array($value->RISRAcceptDeptCode, $enable_zhixingkeshi_code)){ + $msg=$msg.' 开医嘱时执行科室选择错误,请选择:'.json_encode($enable_zhixingkeshi_name,JSON_UNESCAPED_UNICODE); + } } $generator = new \Picqer\Barcode\BarcodeGeneratorHTML(); $tiaoma= $generator->getBarcode($value->app_num, $generator::TYPE_CODE_128, 2, 40); @@ -90,11 +103,7 @@ class WorkMainController extends Controller 'msg'=>$msg ]; } -// $itemInfo = DB::table('s_check_item') -// ->whereIn('item_name',) -// ->where(['item_name' => $info->entrust,'status'=>1,"is_del"=>0])->get(); -// if (count($itemInfo) == 0) return \Yz::echoError1('没有找到可用的检查项目信息'); -// $itemInfo=$itemInfo[0]; + return \Yz::Return(true,'查询完成',['today_date'=>date("Y-m-d"),'info'=>$itemInfo]); } public function GetList(Request $request)