Merge branch 'dev'

2023-05-22 10:16:08 +08:00
parent 1956efb874 765710b85a
commit fea52fb0c9
7 changed files with 178 additions and 240 deletions
@@ -99,7 +99,7 @@ class ReportRegulatory extends Model
    }

    /**
-     * 列表
+     * 列表-限制数量
     * @param array $params
     * @param array $or_params
     * @param array $fields
@@ -115,4 +115,21 @@ class ReportRegulatory extends Model
            ->limit($limit)
            ->get($fields);
    }
+
+    /**
+     * 列表
+     * @param array $params
+     * @param array $or_params
+     * @param array $fields
+     * @return Collection|array
+     */
+    public static function getNotReportList(array $params = [],array $fields = ["*"]): Collection|array
+    {
+        return self::where($params)
+            ->Where(function ($query) {
+                $query->orWhere('report_inquiry_status','!=',1);
+                $query->orWhere('report_prescription_status','!=',1);
+            })
+            ->get($fields);
+    }
 }