调整对省的查询条件位置

+"use strict";
+/**
+ * SARS统计数据
+ */
+module.exports = function (sequelize, DataTypes) {
+  const
+    AbstractPO = require('kml-po-abstract'),
+    _ = require('lodash');
+
+  let option = AbstractPO.RawOption({
+    tableName: 'tb_mf_sars'
+  });
+
+  let entity = _.merge({
+    "report_date": {
+      "type": DataTypes.STRING(40),
+      "comment": "report_date",
+      "field": "report_date",
+      "allowNull": false,
+      "primaryKey": true
+    },
+    "confirmed": {
+      "type": DataTypes.BIGINT,
+      "comment": "确认人数",
+      "field": "confirmed"
+    },
+    "suspected": {
+      "type": DataTypes.BIGINT,
+      "comment": "疑似人数",
+      "field": "suspected"
+    },
+    "dead": {
+      "type": DataTypes.BIGINT,
+      "comment": "死亡人数",
+      "field": "dead"
+    },
+    "comment": {
+      "type": DataTypes.STRING(200),
+      "comment": "注释",
+      "field": "comment"
+    },
+    "country": {
+      "type": DataTypes.STRING(40),
+      "comment": "国家",
+      "field": "country"
+    }
+  });
+
+  return sequelize.define('sars', entity, option);
+};

@@ -48,7 +48,6 @@ module.exports = function (dbo) {
             from days d
             from days d
             left join ta on ta.update_time = d.today
             left join ta on ta.update_time = d.today
             where country notnull
             where country notnull
-            and province ~ :province
             order by 1,2,3
             order by 1,2,3
             )
             )
             , pr as (
             , pr as (
@@ -76,6 +75,7 @@ module.exports = function (dbo) {
             jsonb_agg(increase order by today) increase,
             jsonb_agg(increase order by today) increase,
             max(confirmed_sum) confirmed_sum
             max(confirmed_sum) confirmed_sum
             from ( select *, sum(confirmed_count) over(partition by country, today) confirmed_sum from rpt
             from ( select *, sum(confirmed_count) over(partition by country, today) confirmed_sum from rpt
+            where province ~ :province
             ) t
             ) t
             group by 1,2
             group by 1,2
             union all
             union all