diff --git a/app/Command/ReportRegulatoryCommand.php b/app/Command/ReportRegulatoryCommand.php index e3c40f3..0c52d28 100644 --- a/app/Command/ReportRegulatoryCommand.php +++ b/app/Command/ReportRegulatoryCommand.php @@ -423,6 +423,7 @@ class ReportRegulatoryCommand extends HyperfCommand $params = array(); $params['user_id'] = $user_doctor['user_id']; $params['type'] = 2; + $params['is_latest'] = 1; $doctor_user_ca_cert = UserCaCert::getOne($params); if (empty($doctor_user_ca_cert)){ $this->line("错误:无医生ca数据"); @@ -433,6 +434,7 @@ class ReportRegulatoryCommand extends HyperfCommand $params = array(); $params['user_id'] = $user_pharmacist['user_id']; $params['type'] = 2; + $params['is_latest'] = 1; $pharmacist_user_ca_cert = UserCaCert::getOne($params); if (empty($pharmacist_user_ca_cert)){ $this->line("错误:无药师ca数据"); diff --git a/app/Model/UserCoupon.php b/app/Model/UserCoupon.php index 216f3a7..1825afe 100644 --- a/app/Model/UserCoupon.php +++ b/app/Model/UserCoupon.php @@ -69,7 +69,7 @@ class UserCoupon extends Model { return self::with(['Coupon']) ->whereHas('Coupon' , function($query){ - $query->where("coupon_client",1)->where("coupon_status",1); + $query->where("coupon_client",1)->whereNotIn("coupon_status",[2,4]); }) ->where($params)->get($fields); }