diff --git a/Laravel/app/Http/Controllers/API/H5/DoctorController.php b/Laravel/app/Http/Controllers/API/H5/DoctorController.php index c901a9f..0588ff3 100644 --- a/Laravel/app/Http/Controllers/API/H5/DoctorController.php +++ b/Laravel/app/Http/Controllers/API/H5/DoctorController.php @@ -17,6 +17,7 @@ class DoctorController extends Controller $month = request('month'); $doctor_id = request('doctor_id'); $person_id = request('person_id'); + $checkup_type = request('checkup_type'); if(!isset($person_id)) return \Yz::echoError1("用户id缺失"); $personInfo=DB::table('web_user_person')->where('id',$person_id)->first(); @@ -66,6 +67,13 @@ class DoctorController extends Controller 'A0030116'=>'2', 'A0030106'=>'1' ]; + if(isset($checkup_type) and $checkup_type == '4'){ + $keshi_sex_list=[ + 'A0030087'=>'1', + 'A0030089'=>'2' + ]; + } + if ($res['code'] == '200' && count($res['yisheng']) != 0) { foreach ($res['yisheng'] as $key => $value) { $keshiname=''; diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php index 56acc99..c644b99 100644 --- a/Laravel/app/Http/Controllers/TestController.php +++ b/Laravel/app/Http/Controllers/TestController.php @@ -16,8 +16,13 @@ class TestController extends Controller { public function DBtest(){ echo DB::table('users')->count(); - $order= new OrderService(); - dd($order->DepartmentItemCount(355)); + $dnet = new AspNetZhuanController(); + $res = $dnet->GetDoctorDateList([ + "yyid" => 6, + "data" => ["2024-12-07","2024-12-08","2024-12-09","2024-12-10","2024-12-11","2024-12-12","2024-12-13","2024-12-14","2024-12-15","2024-12-16","2024-12-17","2024-12-18","2024-12-19","2024-12-20","2024-12-21","2024-12-22","2024-12-23","2024-12-24","2024-12-25","2024-12-26","2024-12-27","2024-12-28","2024-12-29","2024-12-30","2024-12-31","2025-01-01","2025-01-02","2025-01-03","2025-01-04","2025-01-05","2025-01-06"], + "action" => "1" + ]); + return \Yz::Return(true,"",['data'=>$res]); //退款------------------ // $data = [ // 'orderid' => '20241108112106776eslNJ2', diff --git a/h5/pages/main/selectDoctor/selectDoctor.vue b/h5/pages/main/selectDoctor/selectDoctor.vue index e01e4a5..946961c 100755 --- a/h5/pages/main/selectDoctor/selectDoctor.vue +++ b/h5/pages/main/selectDoctor/selectDoctor.vue @@ -46,12 +46,14 @@ const mountedAction = () => { const doctor_list = ref(false); const getdoctorList = async () => { + let c_type=$store.getCheckupTypeId() // 获取 体检报告列表 let obj = { hospital: $store.save.hospital, date: dqDate.value, month:$props.month, - person_id:user_person.value.person_id + person_id:user_person.value.person_id, + checkup_type:c_type.id }; const response = await $api("DoctorGetList", obj); $response(response, () => { diff --git a/h5/pages/main/ysdate/ysdate_new.vue b/h5/pages/main/ysdate/ysdate_new.vue index 1f989d2..67a7a69 100644 --- a/h5/pages/main/ysdate/ysdate_new.vue +++ b/h5/pages/main/ysdate/ysdate_new.vue @@ -162,12 +162,14 @@ let MonthList=ref([]); let DoctorInfo=ref(false) const getdoctorList = async (month) => { + let c_type=$store.getCheckupTypeId() // 获取 体检报告列表 let obj = { hospital: $store.save.hospital, month:month, doctor_id:yytjInfo.value.doctor_id?yytjInfo.value.doctor_id:null, - person_id:user_person.value.person_id + person_id:user_person.value.person_id, + checkup_type:c_type.id }; uni.showLoading({ title: "加载中",