From c125d965185aad4dc1a34a8e59514be49d6d0275 Mon Sep 17 00:00:00 2001 From: yanzai Date: Sat, 16 Nov 2024 22:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8C=BB=E7=94=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=A5=97=E9=A4=90=E3=80=81=E5=9B=A2=E6=A3=80=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E4=B8=80bug=E3=80=81=E5=89=A9=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E5=BA=A6=E6=8F=90=E9=86=92=E6=94=B9=E4=B8=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=8F=90=E7=A4=BA=E3=80=81=E6=8B=89=E5=8F=96=E6=8A=A5?= =?UTF-8?q?=E5=91=8Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/H5/ComboController.php | 14 +++++++++++++- .../Http/Controllers/API/H5/DoctorController.php | 10 ++++++++++ .../Http/Controllers/API/H5/ReportController.php | 5 ++++- h5/pages/main/combo/combo.vue | 7 ++++++- h5/pages/main/tj/selectType.vue | 1 + h5/pages/main/tj/tjzx.vue | 4 ++-- h5/pages/main/ysdate/ysdate_new.vue | 2 +- 7 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 071adba..0bd027e 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -47,6 +47,7 @@ class ComboController extends Controller $combo_price = $request->post('combo_price'); $combo_item = $request->post('combo_item'); $checkup_type_id = $request->post('checkup_type_id'); + $keshi_name=$request->post('keshi_name'); $hospital = DB::table('hospitals')->select('id', 'name', 'address', 'latitude', 'longitude')->where(['id' => $hospital])->first(); $user = DB::table('web_users')->where(['openid' => $openid, 'status' => 1, 'is_del' => 0])->first(); @@ -105,7 +106,18 @@ class ComboController extends Controller } } - + if(isset($keshi_name)){ + $combo_ids=DB::table('combo_items')->where(['status'=>1,'keshi_name'=>$keshi_name]) ->pluck('combo_id')->toArray(); + $count = count($combo_ids); + $placeholders = implode(', ', array_fill(0, $count, '?')); + if(count($combo_ids)>0){ + $sql = $sql . " and a.combo_id in ($placeholders) "; + $canshu =array_merge($canshu, $combo_ids); + }else{ + $sql = $sql . " and a.combo_id in (?) "; + $canshu =array_merge($canshu, [0]); + } + } if(isset($combo_item)){ $combo_ids=DB::table('combo_items')->whereIn('item_id',$combo_item)->where(['status'=>1]) ->groupBy('combo_id') diff --git a/Laravel/app/Http/Controllers/API/H5/DoctorController.php b/Laravel/app/Http/Controllers/API/H5/DoctorController.php index 5e53289..a50b17b 100644 --- a/Laravel/app/Http/Controllers/API/H5/DoctorController.php +++ b/Laravel/app/Http/Controllers/API/H5/DoctorController.php @@ -53,8 +53,17 @@ class DoctorController extends Controller ]); // return \Yz::Return(true,"",$res); $list = []; + $keshi=[ + 'A0030090'=>'内科', + 'A0030091'=>'妇科', + 'A0030102'=>'外科' + ]; if ($res['code'] == '200' && count($res['yisheng']) != 0) { foreach ($res['yisheng'] as $key => $value) { + $keshiname=''; + if(isset($keshi[$value['KSID']])){ + $keshiname=$keshi[$value['KSID']]; + } $list[] = [ 'head_img' => 'data:image/jpeg;base64,' . $value['U_IMG'], 'name' => $value['U_NAME'], @@ -63,6 +72,7 @@ class DoctorController extends Controller 'hospital' => '', 'time' => $value['U_GDPB'], 'desc' => $value['U_JIANJIE'], + 'keshiname'=>$keshiname ]; } } diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index dd5c803..200f0f5 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -114,7 +114,8 @@ class ReportController extends Controller $res = $res['data'][0]; $report_res = new ReportService(); $save= $report_res->Save($res); - if($save['status']){ + + if($save->status){ $report = DB::table('report_l1_records as a')->where(['a.体检号' => $tijian_num])->first(); }else{ return $save; @@ -401,8 +402,10 @@ class ReportController extends Controller $date_list = []; $datetime = ''; foreach ($reports as $item) { + $datetime=explode('T', $item->登记时间)[0]; $jc_item=DB::table('report_l2_items as a')->leftJoin('report_l3_base_items as b','a.id','=','b.report_l2_id')->where(['a.reprort_l1_id'=>$item->id])->get(); + foreach ($jc_item as $i) { if ($i->基础项目代码 == $mark) { if ($i->结果类型 == '数值' && !!$i->结果值范围) { diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue index 24dc91b..4da933f 100644 --- a/h5/pages/main/combo/combo.vue +++ b/h5/pages/main/combo/combo.vue @@ -7,7 +7,7 @@ import DraggableButton from "@/pages/components/goHome.vue"; */ import { ref, computed } from "vue"; import { $image, $api, $response } from "@/api"; -import { onShow } from "@dcloudio/uni-app"; +import { onShow,onLoad } from "@dcloudio/uni-app"; import { useStore } from "@/store"; const $store = useStore(); @@ -166,6 +166,7 @@ const getComboList = async (e) => { doctor: $store.save.doctor, hospital: hospital_active.value, search: e?.value, + keshi_name:keshi_name.value }; if ($store.getCheckupTypeId()) { let b = $store.getCheckupTypeId(); @@ -270,6 +271,10 @@ onShow(() => { checkHospital(); } }); +let keshi_name=ref(null); +onLoad((e)=>{ + keshi_name.value=e.keshi_name +}) const buyClick = async (item) => { let checkup_type_id=$store.getCheckupTypeId(); diff --git a/h5/pages/main/tj/selectType.vue b/h5/pages/main/tj/selectType.vue index 252af75..a6b9690 100644 --- a/h5/pages/main/tj/selectType.vue +++ b/h5/pages/main/tj/selectType.vue @@ -27,6 +27,7 @@ const configRef = (e) => { }; onShow(() => { + $store.setDuoXuanYi([]); if (!!config_ref.value) { mountedAction(); } diff --git a/h5/pages/main/tj/tjzx.vue b/h5/pages/main/tj/tjzx.vue index 217efe1..18dd3b5 100644 --- a/h5/pages/main/tj/tjzx.vue +++ b/h5/pages/main/tj/tjzx.vue @@ -185,8 +185,8 @@ const confirm = async () => { const toDetails = (state) => { // 去详情页 if (losePrice.value > 0 && !state) { - popupTip.value.open("center"); // 弹剩余额度提醒 - return; + // popupTip.value.open("center"); // 弹剩余额度提醒 + //return; } const itemIds = selectIds.value.length > 0 ? selectIds.value.join(",") : ""; let query = "?comboId=" + comboId.value + "&itemIds=" + itemIds; diff --git a/h5/pages/main/ysdate/ysdate_new.vue b/h5/pages/main/ysdate/ysdate_new.vue index 62a9c7a..04c6053 100644 --- a/h5/pages/main/ysdate/ysdate_new.vue +++ b/h5/pages/main/ysdate/ysdate_new.vue @@ -123,7 +123,7 @@ yytjInfo.value.doctor_date = e.fulldate; $store.setYytjInfo(yytjInfo.value); uni.navigateTo({ - url: '/pages/main/combo/combo' + url: '/pages/main/combo/combo?keshi_name='+DoctorInfo.value.keshiname }) } const changerl = (e) => {