diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 1b977ce..2d3757b 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\API\H5; use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\Controller; +use App\Services\ComboItemGroupService; use Illuminate\Database\Schema\Blueprint; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -17,8 +18,18 @@ class FenzhenController extends Controller public function abandon() { // 这里放 弃检逻辑 + $id = request('id'); + $xmid = request('xmid'); + $orderInfo=DB::table('orders')->where('id',$id)->first(); + if(!$orderInfo) return \Yz::echoError1("订单不存在"); + $service = new ComboItemGroupService(); + $q=$service->QiJian($orderInfo->tj_number,$orderInfo->name,[$xmid]); + if($q['status']===true){ + return \Yz::Return(true, "弃检成功",[]); + }else{ + return \Yz::echoError1($q['msg']); + } - return \Yz::Return(true, "弃检成功"); } public function check() @@ -52,7 +63,7 @@ class FenzhenController extends Controller 'clinics' => $clinics ]); $person_ghzid = ''; - $person_info = DB::table('web_user_person')->where('id', $info->person_id)->first(); + $person_info = DB::table('web_user_person')->where('id', $info->web_user_id)->first(); if (!!$person_info) { $person_ghzid = $person_info->ghzid; } @@ -232,7 +243,7 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $res['data']['start_time'] . ':00', 'end_time' => $res['data']['end_time'], - 'qrcode' => '', + 'qrcode' => $person_ghzid, 'tj_number' => $info->tj_number, 'ghzid' => $person_ghzid, 'code' => $info->appointment_number, @@ -249,7 +260,7 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $info->appointment_time, 'end_time' => $end_time, - 'qrcode' => '', + 'qrcode' => $person_ghzid, 'ghzid' => $person_ghzid, 'tj_number' => $info->tj_number, 'code' => $info->appointment_number, @@ -285,7 +296,7 @@ class FenzhenController extends Controller 'check_date' => $info->appointment_date, 'start_time' => $info->appointment_time, 'end_time' => '10:25', - 'qrcode' => '', + 'qrcode' => $person_ghzid, 'ghzid' => $person_ghzid, 'tj_number' => $info->tj_number, 'code' => $info->appointment_number, diff --git a/Laravel/app/Http/Controllers/API/PEISApiController.php b/Laravel/app/Http/Controllers/API/PEISApiController.php index f05f2b7..5adcbf5 100644 --- a/Laravel/app/Http/Controllers/API/PEISApiController.php +++ b/Laravel/app/Http/Controllers/API/PEISApiController.php @@ -38,6 +38,7 @@ class PEISApiController extends Controller $api['修改用户预约时间'] = "{$url}/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo?key=YmMxOGI2MDUxZmFh"; $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; + $api['弃检接口'] = "{$url}/Home/AbandonCheck"; } if($env=='dev') { //如果是测试环境 @@ -57,6 +58,7 @@ class PEISApiController extends Controller $api['预约时段修改'] = "{$url}/PEISCommon/ModifyAppointmentDTRange/{$code}"; $api['修改用户预约时间'] = "http://220.174.210.111:8888/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo/{$code}"; + $api['弃检接口'] = "{$url}/Home/AbandonCheck/{$code}"; } diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php index 673c091..74f11d6 100644 --- a/Laravel/app/Http/Controllers/TestController.php +++ b/Laravel/app/Http/Controllers/TestController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\API\PEISApiController; use App\Http\Controllers\API\XCXApiController; +use App\Services\ComboItemGroupService; use App\Services\OrderService; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -16,20 +17,20 @@ class TestController extends Controller // $order= new OrderService(); // dd($order->DepartmentItemCount(173)); //退款------------------ - $data = [ - 'orderid' => '20241108112106776eslNJ2', - 'refund_order_id' => 'T' . '20241108112106776eslNJ2', - 'refund_amount' => 74900, - 'refund_reason' => "体检H5订单退款", - ]; - $XCX = new XCXApiController(); - $res = $XCX::Post('订单退款', $data); - if ($res['data']['refund_state'] != 'SUCCESS') { - return \Yz::echoError1("退款失败" . $res['data']['refund_state']); - } +// $data = [ +// 'orderid' => '20241108112106776eslNJ2', +// 'refund_order_id' => 'T' . '20241108112106776eslNJ2', +// 'refund_amount' => 74900, +// 'refund_reason' => "体检H5订单退款", +// ]; +// $XCX = new XCXApiController(); +// $res = $XCX::Post('订单退款', $data); +// if ($res['data']['refund_state'] != 'SUCCESS') { +// return \Yz::echoError1("退款失败" . $res['data']['refund_state']); +// } //-------------- - $aspnet=new AspNetZhuanController(); +// $aspnet=new AspNetZhuanController(); //优惠券----------------- // $data=[ // 'action'=>4, @@ -52,8 +53,13 @@ class TestController extends Controller // ]; // } -// $peis = new PEISApiController(); -// dd($peis::Get($peis::Api('报告时间计算',"2403020020"),"111111","报告时间计算")); + //弃检 + $service = new ComboItemGroupService(); + dd($service->QiJian("2411090001","张三",['1812'])); + + + // $peis = new PEISApiController(); + // dd($peis::Get($peis::Api('报告时间计算',"2403020020"),"111111","报告时间计算")); // $data=[ // 'action'=>4, // 'ghzid'=>'5a798c097bc64bd79c22050175e6236a', diff --git a/Laravel/app/Services/ComboItemGroupService.php b/Laravel/app/Services/ComboItemGroupService.php index 453bfc9..a7b0aa5 100644 --- a/Laravel/app/Services/ComboItemGroupService.php +++ b/Laravel/app/Services/ComboItemGroupService.php @@ -1,6 +1,7 @@ $tj_num, + "操作医生姓名"=>$username, + "取消弃检"=>false, + "收费项目Id列表"=>$ids + ]; + $url=$peis::Api("弃检接口","460107000001"); + $res_str=$peis::Post2("弃检接口",$url,1,$data); + $res = json_decode($res_str, true); + if($res['Success']===true){ + return ['status'=>true,'msg'=>$res['Message']]; + }else{ + return ['status'=>false,'msg'=>$res['Message']]; + } + + } } diff --git a/h5/pages/user/fenzhen/qijian.vue b/h5/pages/user/fenzhen/qijian.vue index 569b09f..8390a4a 100644 --- a/h5/pages/user/fenzhen/qijian.vue +++ b/h5/pages/user/fenzhen/qijian.vue @@ -22,13 +22,22 @@ // var x = 20; // var y = 20; import { $api, $response } from "@/api"; +import {onLoad} from "@dcloudio/uni-app"; export default { data() { return { ctx: "", //绘图图像 points: [], //路径点集合 + id:"", + xmid:"", + tj_number:"" }; }, + onLoad(e){ + this.id=e.id, + this.xmid=e.xmid, + this.tj_number=e.tj_number + }, mounted() { var canvas = document.getElementById("myCanvas"); console.log(canvas.offsetWidth); @@ -101,6 +110,7 @@ export default { //完成绘画并保存到本地 finish: function () { + var that=this uni.showLoading({ title: "加载中...", }); @@ -108,9 +118,12 @@ export default { canvasId: "mycanvas", success: async function (res) { let path = res.tempFilePath; - console.log(path); + console.log(that.id); let obj = { - path, + path:path, + id:that.id, + xmid:that.xmid, + tj_number:that.tj_number }; const response = await $api("FenzhenAbandon", obj); $response(response, () => { diff --git a/h5/pages/user/fenzhen/xindiantu.vue b/h5/pages/user/fenzhen/xindiantu.vue index fcfbd36..671452e 100644 --- a/h5/pages/user/fenzhen/xindiantu.vue +++ b/h5/pages/user/fenzhen/xindiantu.vue @@ -81,7 +81,7 @@ const qijian = (item) => { uni.navigateTo({ - url: `/pages/user/fenzhen/qijian?id=${$props.id}&xmid=${item.id}`, + url: `/pages/user/fenzhen/qijian?id=${$props.id}&xmid=${item.id}&tj_number=${fenzhen_time.value.info.tj_number}`, }); };