gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除了ca打印，修改了上报处方订单的数组格式。

Browse Source
This commit is contained in:
wucongxing8150 2024-12-10 11:49:52 +08:00
parent 8443af52ee
commit b961436de3
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Controller/TestController.php
View File

@ -327,7 +327,7 @@ class TestController extends AbstractController
// } // }
// dump(111); // dump(111);
// // 测试药师 // 测试药师
// $data = array(); // $data = array();
// $data['user_id'] = "534534546"; // $data['user_id'] = "534534546";
// $data['mobile'] = "18812345678"; // $data['mobile'] = "18812345678";
@ -351,25 +351,27 @@ class TestController extends AbstractController
// } // }
// 测试医院 // 测试医院
$data = array(); // $data = array();
$data['user_id'] = "5345345461"; // $data['user_id'] = "5345345461";
$data['mobile'] = "18221234167"; // $data['mobile'] = "18221234167";
$data['org_name'] = "成都金牛欣欣相照互联网医院有限公司"; // $data['card_name'] = "吴从兴";
$data['org_number'] = "91510106MABTJY4K9R"; // $data['card_num'] = "372929199610075412";
// $data['org_name'] = "成都金牛欣欣相照互联网医院有限公司";
$result = $CaOnline->getCloudCert($data,'Organizational'); // $data['org_number'] = "91510106MABTJY4K9R";
//
$data = array(); // $result = $CaOnline->getCloudCert($data,'Organizational');
$data['is_system'] = 1; //
$data['type'] = 2; // $data = array();
$data['cert_base64'] = $result['certBase64']; // $data['is_system'] = 1;
$data['cert_chain_p7'] = $result['certP7']; // $data['type'] = 2;
$data['cert_serial_number'] = $result['certSerialnumber']; // $data['cert_base64'] = $result['certBase64'];
$data['ca_pin'] = "5345345461"; // $data['cert_chain_p7'] = $result['certP7'];
$doctor_pharmacist_cert = UserCaCert::addUserCaCert($data); // $data['cert_serial_number'] = $result['certSerialnumber'];
if (empty($doctor_pharmacist_cert)){ // $data['ca_pin'] = "5345345461";
return fail(); // $doctor_pharmacist_cert = UserCaCert::addUserCaCert($data);
} // if (empty($doctor_pharmacist_cert)){
// return fail();
// }
return 111; return 111;
} }

10
app/Services/OrderPrescriptionService.php
View File

@ -332,7 +332,7 @@ class OrderPrescriptionService extends BaseService
$params['coupon_id'] = $user_coupon['coupon_id']; $params['coupon_id'] = $user_coupon['coupon_id'];
$coupon = Coupon::getOne($params); $coupon = Coupon::getOne($params);
if (!empty($coupon)){ if (!empty($coupon)){
$product_coupons = array_push($product_coupons,$coupon->toArray()); $product_coupons[] = $coupon->toArray();
} }
} }
} }
@ -467,7 +467,7 @@ class OrderPrescriptionService extends BaseService
$arg['presList'][0]['orderDrugList'][$key]['price'] = $product['product_price']; // 药品单价 $arg['presList'][0]['orderDrugList'][$key]['price'] = $product['product_price']; // 药品单价
$arg['presList'][0]['orderDrugList'][$key]['drugCount'] = $item['amount']; // 药品数量 $arg['presList'][0]['orderDrugList'][$key]['drugCount'] = $item['amount']; // 药品数量
$arg['presList'][0]['orderDrugList'][$key]['packingUnit'] = $product['packaging_unit']; // 药品单位 $arg['presList'][0]['orderDrugList'][$key]['packingUnit'] = $product['packaging_unit']; // 药品单位
$arg['presList'][0]['orderDrugList'][$key]['actualSellingPrice'] = $product['actual_product_price']; // 药品实际销售单价 $arg['presList'][0]['orderDrugList'][$key]['actualSellingPrice'] = $item['actual_product_price']; // 药品实际销售单价
} }
// 处理上报处方平台药品优惠券相关数据 // 处理上报处方平台药品优惠券相关数据
@ -526,11 +526,11 @@ class OrderPrescriptionService extends BaseService
/** /**
* 处理上报处方平台药品优惠券相关数据 * 处理上报处方平台药品优惠券相关数据
* @param array $product_coupons 药品订单优惠券，为coupon数据 * @param array $product_coupons 药品订单优惠券，为coupon数据
* @param array $order_product_item 药品订单明细 * @param array|object $order_product_item 药品订单明细
* @param string $orderNo 药品订单编号 * @param string $orderNo 药品订单编号
* @return array * @return array
*/ */
public function handleReportPrescriptionProductCouponData(array $product_coupons,array $order_product_item,string $orderNo): array public function handleReportPrescriptionProductCouponData(array $product_coupons,array|object $order_product_item,string $orderNo): array
{ {
$promotion = array(); $promotion = array();
@ -547,7 +547,7 @@ class OrderPrescriptionService extends BaseService
$result["amount"] = $product_coupon["coupon_price"]; // 优惠金额 $result["amount"] = $product_coupon["coupon_price"]; // 优惠金额
$result["count"] = 1; $result["count"] = 1;
$promotion = array_push($promotion,$result); $promotion[] = $result;
} }
if ($product_coupon["application_scope"] == 5){ if ($product_coupon["application_scope"] == 5){

1
extend/Ca/Ca.php
View File

@ -366,7 +366,6 @@ abstract class Ca
throw new BusinessException($response->getBody()->getContents()); throw new BusinessException($response->getBody()->getContents());
} }
$body = json_decode($response->getBody(), true); $body = json_decode($response->getBody(), true);
dump($body);
if (empty($body)) { if (empty($body)) {
// 返回值为空 // 返回值为空
throw new BusinessException(HttpEnumCode::getMessage(HttpEnumCode::SERVER_ERROR)); throw new BusinessException(HttpEnumCode::getMessage(HttpEnumCode::SERVER_ERROR));