Merge branch 'hotfix-1201' into develop

app/Api/Controllers/DrugController.php

@@ -115,12 +115,13 @@ public function drugLimit(Request $request)
         $patient_id = $request->input('patient_id');
         $patient_id = $request->input('patient_id');
         $pharmacy_id = $request->input('pharmacy_id');
         $pharmacy_id = $request->input('pharmacy_id');
 
 
-        $sevenDaysAgo = Carbon::now()->subDays(7);
+        # $sevenDaysAgo = Carbon::now()->subDays(7);
+        $oneDayAgo = Carbon::now()->subDay();
         $prescriptions = PrescriptionModel::where('patient_id', $patient_id)
         $prescriptions = PrescriptionModel::where('patient_id', $patient_id)
             ->where('is_voided', PrescriptionModel::IS_VOIDED_FALSE) // 未作废的处方
             ->where('is_voided', PrescriptionModel::IS_VOIDED_FALSE) // 未作废的处方
             ->where('status', PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS)
             ->where('status', PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS)
-            ->where('pharmacy_id', $pharmacy_id)
-            ->where('created_at', '>=', $sevenDaysAgo)
+            # ->where('pharmacy_id', $pharmacy_id)
+            ->where('created_at', '>=', $oneDayAgo)
             ->get();
             ->get();
 
 
         $drugCounts = [];
         $drugCounts = [];