From 3d992994b33b5fd9b5456754d5e985975672333a Mon Sep 17 00:00:00 2001 From: yanzai Date: Thu, 3 Oct 2024 23:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=86=E8=8A=82=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug,=20=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/ApiMapController.php | 4 +++ .../API/H5/AnalysisTypeController.php | 31 +++++++++++++++++++ .../Controllers/API/H5/ComboController.php | 5 ++- .../Controllers/API/H5/ReportController.php | 26 ++++++++++++++++ Laravel/routes/web.php | 1 + 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 Laravel/app/Http/Controllers/API/H5/AnalysisTypeController.php diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index 091fa43..1177c7c 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -59,6 +59,10 @@ class ApiMapController extends Controller 'ComboCompare' => $base_url . '/api/H5/ComboCompare',//套餐对比 'GetOrderDetail' => $base_url . '/api/H5/GetOrderDetail',//获取订单详情 'ReportContrast' => $base_url . '/api/H5/ReportContrast',//报告对比 + 'QuestionGetList' => $base_url . '/api/H5/QuestionGetList',//获取问卷 + 'QuestionSubmitAnswer' => $base_url . '/api/H5/QuestionSubmitAnswer',//提交问卷回答 + 'AnalysisTypeGetList' => $base_url . '/api/H5/AnalysisTypeGetList',//趋势分析项目列表 + 'FenzhenAbandon' => $base_url . '/api/H5/Fenzhen/abandon',// 分诊弃检 'FenzhenList' => $base_url . '/api/H5/Fenzhen/list',// 分诊时间线 'FenzhenInfo' => $base_url . '/api/H5/Fenzhen/info',// 分诊项目详情 diff --git a/Laravel/app/Http/Controllers/API/H5/AnalysisTypeController.php b/Laravel/app/Http/Controllers/API/H5/AnalysisTypeController.php new file mode 100644 index 0000000..3b8f079 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/H5/AnalysisTypeController.php @@ -0,0 +1,31 @@ +where('status', 1)->get(); + + $analysis_list = [[ + 'title' => '临床生化', + 'list' => [], + ], [ + 'title' => '临床免疫', + 'list' => [], + ], [ + 'title' => '常规', + 'list' => [], + ]]; + foreach ($analysis_type_list as $item) { + $analysis_list[$item->type - 1]['list'][] = $item; + } + return \Yz::return(true,"查询完成",['list' => $analysis_list]); + } +} diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 651bb0e..d051277 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -53,6 +53,7 @@ class ComboController extends Controller //用户绑定就诊人数量 $personCount = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->count(); $canshu = []; + $canshu[]=$person->sex; $sql = ''; if (isset($combo_price)) { $price_list = [ @@ -62,9 +63,11 @@ class ComboController extends Controller "4" => [1500, 2999], "5" => [3000, 999999], ]; + $sql = " and (a.price>=? and a.price<=?) "; $canshu[] = $price_list[$combo_price][0]; $canshu[] = $price_list[$combo_price][1]; + } if (isset($combo_type)) { $sql = $sql . " and a.type_id=? "; @@ -89,7 +92,7 @@ class ComboController extends Controller } } - $canshu[]=$person->sex; + $combos = DB::select("select * from combos as a LEFT JOIN ( select combo_id as c_id,count(*) as count from orders where status in(2,4) group by combo_id diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index 53b3e95..e1ef8ac 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -366,4 +366,30 @@ class ReportController extends Controller return self::myUsort($res, ['order_time'], [0]); } + + //趋势分析 + public function Analysis(Request $request) + { + $id = $request->post('id'); + $id_number = $request->post('id_number'); + $date = $request->post('date'); + $hospital = $request->post('hospital'); + $analysis_type = DB::table('analysis_types')->where('id', $id)->get(); + $mark = $analysis_type->mark; + $value = 0; + $unit = ''; + $info['title'] = $analysis_type->name; + $info['content'] = $analysis_type->content; + $range_data = json_decode($analysis_type->range, true); + $range = $range_data['r']; + $label = $range_data['l']; + $step = $range_data['s']; + $color = ['#357e24', '#a7ea9b', '#95cde8', '#f0a93f', '#f0a93f', '#ec572c']; + $time = 0; + $range_str = ''; + $data_arr = []; + $res_done_arr = []; + //查询数据库 + $reports=DB::table('') + } } diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index d18f0c2..1f1b1fe 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -65,6 +65,7 @@ Route::group(['prefix' => 'api/H5'], function () { Route::post('/Refund', 'App\Http\Controllers\API\H5\PayController@Refund');//退款 Route::post('/GetOrderDetail', 'App\Http\Controllers\API\H5\OrderController@GetDetail');//获取订单详情 Route::post('/ReportContrast', 'App\Http\Controllers\API\H5\ReportController@contrast');//报告对比 + Route::post('/AnalysisTypeGetList', 'App\Http\Controllers\API\H5\AnalysisTypeController@GetList');//趋势分析项目列表