Merge branch 'dev'

app/Model/OrderInquiry.php

@@ -156,7 +156,34 @@ class OrderInquiry extends Model
      * @param int|null $per_page
      * @return int|mixed|string
      */
-    public static function getDoctorDateOrderInquiryPage(array $params, array $reception_time, array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed
+    public static function getDoctorFinishDateOrderInquiryPage(array $params, array $reception_time, array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed
+    {
+        $raw = self::where($params)
+            ->whereBetween('finish_time', $reception_time)
+            ->orderBy('finish_time')
+            ->paginate($per_page, $fields, "page", $page);
+
+        $data = array();
+        $data['current_page'] = $raw->currentPage();// 当前页码
+        $data['total'] = $raw->total();//数据总数
+        $data['data'] = $raw->items();//数据
+        $data['per_page'] = $raw->perPage();//每页个数
+        $data['last_page'] = $raw->lastPage();//最后一页
+
+        return $data;
+    }
+
+    /**
+     * 获取医生某一时间段接诊订单分页数据
+     * 已结束
+     * @param array $params
+     * @param array $reception_time 接诊时间区间 ['2023-01-02','2023-01-03']
+     * @param array $fields
+     * @param int|null $page
+     * @param int|null $per_page
+     * @return int|mixed|string
+     */
+    public static function getDoctorCreatedDateOrderInquiryPage(array $params, array $reception_time, array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed
     {
         $raw = self::where($params)
             ->whereBetween('finish_time', $reception_time)