diff --git a/admin/controllers/base/DataController.php b/admin/controllers/base/DataController.php index d9c7008..7a73df8 100644 --- a/admin/controllers/base/DataController.php +++ b/admin/controllers/base/DataController.php @@ -39,7 +39,8 @@ class DataController extends BaseAdminController // 总成交 $totalPrice = Reconciliation::find()->where(['status' => 1]); // 处方订单 - $prescriptionCount = Prescription::find()->where(['status' => 1]); +// $prescriptionCount = Prescription::find()->where(['status' => 1]); + $prescriptionCount = Prescription::find()->where(['in', 'status', [0,1,3,4]]); // 接诊人数 $registerCount = Register::find()->where(['in', 'status', [2, 3]]); $totalPriceArr = 0; @@ -54,8 +55,10 @@ class DataController extends BaseAdminController 'total_price' => round($totalPriceArr, 2), 'prescription' => intval($prescriptionCount->count()), 'register' => intval($registerCount->count()), - 'prescription_china' => intval($prescriptionCount->andWhere(['prescription_type' => 1])->count()), - 'prescription_west' => intval($prescriptionCount->andWhere(['prescription_type' => 2])->count()) + 'prescription_china' => intval(Prescription::find()->where(['in', 'status', [0,1,3,4]])->andWhere(['prescription_type' => 1])->count()), +// 'prescription_west' => intval(Prescription::find()->where(['in', 'status', [0,1,3,4]])->andWhere(['prescription_type' => 2])->count()), + 'prescription_west' => intval(Prescription::find()->where(['in', 'status', [0,1,3,4]])->andWhere(['in', 'prescription_type', [2,4]])->count()), + 'prescription_package_server' => intval(Prescription::find()->where(['in', 'status', [0,1,3,4]])->andWhere(['prescription_type' => 5])->count()) ]; } diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..3e1a60c Binary files /dev/null and b/vendor.tar.gz differ