diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index e91efd0..aa3b246 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -161,12 +161,10 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group ['name' => '3000以上', 'id' => 5], ]; $item_label = [ - ["id" => 1, 'name' => '一般检查'], - ["id" => 2, 'name' => '血常规'], - ["id" => 3, 'name' => '尿常规'], - ["id" => 4, 'name' => '肝功能'], - ["id" => 5, 'name' => '肾功能'], - ["id" => 6, 'name' => '血糖'] + ["id" => 3468454, 'name' => '内科检查'], + ["id" => 1812, 'name' => '尿常规'], + ["id" => 1955, 'name' => '肝功能'], + ["id" => 1958, 'name' => '肾功能'], ]; return \Yz::Return(true, "查询成功", ['sort_list' => $sort_list, 'combo_type' => $type, 'combo_crowd' => $crowd, 'combo_price' => $price_list, 'combo_item' => $item_label]); } @@ -403,7 +401,6 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) // 用于存储每个数组及其与目标数组的相似度 $similarities = []; foreach ($combo_temp as $index => $array) { - $similarity = $this->jaccard_similarity($item_ids, $array); $similarities[$index] = $similarity; } @@ -422,6 +419,7 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group ) as b on a.combo_id=b.c_id where a.status=1 and a.combo_id in (".$ids.")"); foreach ($combos as $key => $combo) { + $tags = json_decode($combo->tags, true); $combo->tags2 = json_decode($combo->tags2, true); foreach ($tags as $k => $tag) { @@ -442,8 +440,14 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group 'money' => number_format($combo->price - $item_all_price,2) ]; } + $list=[]; + foreach ($combos as $key => $combo) { + if($combo->recommend['xiangsidu']<>'0%'){ + $list[]=$combo; + } + } - return \Yz::Return(true, "查询完成", ['combos' => $combos]); + return \Yz::Return(true, "查询完成", ['combos' => $list]); } function jaccard_similarity($set1, $set2) { // 计算交集 diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index d35134a..2ce8ec9 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -11,6 +11,7 @@ class FenzhenController extends Controller public function abandon() { // 这里放 弃检逻辑 + return \Yz::Return(true, "弃检成功"); } diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index d992408..b5ad1d2 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -87,7 +87,8 @@ class HomeController extends Controller ], [ 'message' => '', 'name' => '满意度调查', - 'jump' => '/pages/main/questionnaire/index', + // 'jump' => '/pages/main/questionnaire/index', + 'jump' => 'https://www.wjx.cn/vm/Q9A0NRI.aspx', 'icon' => '/assets/h5/a_manyidudiaocha.png' ]], [[ 'message' => '', diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 9b3e469..c83615d 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -28,6 +28,9 @@ class OrderController extends Controller $datetime = new DateTime($list->created_at); $timestamp = $datetime->getTimestamp(); $list->end_time = $timestamp + (60 * $WaitingPaymentTime); + if(time() > $list->end_time){ + $list->status=3; + } } } diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index ca43b1b..e226c7e 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -41,6 +41,7 @@ class ReportController extends Controller foreach ($report_list as $key => $report) { $report_list[$key]['is_read']=0; + $report_list[$key]['登记时间']= explode('T', $report_list[$key]['登记时间'])[0]; if($report['体检状态']=='报告已出' || $report['体检状态']=='总检完成'){ $cha=DB::table('report_l1_records')->where(['体检号' => $report['体检号']])->first(); if(!!$cha and $cha->is_read==1){ @@ -152,7 +153,7 @@ class ReportController extends Controller ]; $info['content'] = $report->总检建议; - + DB::table('report_l1_records')->where(['id' => $report->id])->update(['is_read' => 1]); return \Yz::Return(true, "查询完成", ['info' => $info]); } } @@ -261,6 +262,7 @@ class ReportController extends Controller { $ids = $request->post('tj_numbers'); if(count($ids)<>2) return \Yz::echoError1("请选择两份报告"); + if($ids[0]==$ids[1]) return \Yz::echoError1('不能选择相同的报告'); sort($ids); $report1=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[0])->whereIn('体检状态',['报告已出','总检完成'])->get(); $report2=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[1])->whereIn('体检状态',['报告已出','总检完成'])->get(); diff --git a/Laravel/app/Http/Controllers/API/Web/ComboController.php b/Laravel/app/Http/Controllers/API/Web/ComboController.php index d8d18bb..4d99e1c 100644 --- a/Laravel/app/Http/Controllers/API/Web/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Web/ComboController.php @@ -175,7 +175,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) if (!isset($groupedData[$keshiName])) { $groupedData[$keshiName] = []; } - $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price]; + $groupedData[$keshiName][] = ['id'=>$item->item_id,'desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price]; } $items_info['price'] = $price; $items_info['original_price'] = $items_original_price; diff --git a/h5/package.json b/h5/package.json index a13bd53..f8e8219 100644 --- a/h5/package.json +++ b/h5/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "@uni-ui/code-ui": "^1.5.3", "echarts": "^5.4.2", "weixin-js-sdk": "^1.6.5" }, diff --git a/h5/pages.json b/h5/pages.json index 3fd5bc5..1616f2e 100644 --- a/h5/pages.json +++ b/h5/pages.json @@ -189,6 +189,18 @@ "navigationBarTitleText": "体检引导" } }, + { + "path": "pages/user/fenzhen/xindiantu", + "style": { + "navigationBarTitleText": "体检引导" + } + }, + { + "path": "pages/user/fenzhen/qijian", + "style": { + "navigationBarTitleText": "线上弃检" + } + }, { "path": "pages/buy/contrast/contrast", "style": { @@ -202,6 +214,9 @@ } } ], + "easycom": { + "^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/w-$1.vue" + }, "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "海南现代妇女儿童医院", diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue index 73f7242..e15e990 100644 --- a/h5/pages/buy/choose/choose.vue +++ b/h5/pages/buy/choose/choose.vue @@ -1,4 +1,5 @@