增加省的条件

@@ -26,9 +26,9 @@ module.exports = function (dbo) {
         try {
         try {
             // 获取数据
             // 获取数据
             let params = req.query;
             let params = req.query;
-            let {province_name} = params;
+            let {province} = params;
 
 
-            province_name = province_name || '';
+            province = province || '';
 
 
             // 代码逻辑区域
             // 代码逻辑区域
             let result = await dbo.query(`
             let result = await dbo.query(`
@@ -40,7 +40,7 @@ module.exports = function (dbo) {
             from days d
             from days d
             left join tb_mf_timeline_area ta on ta.update_time::date = d.today
             left join tb_mf_timeline_area ta on ta.update_time::date = d.today
             where 1=1
             where 1=1
-            and province_name ~ :province_name
+            and province_name ~ :province
             group by 1,2
             group by 1,2
             order by 2, 1
             order by 2, 1
             )
             )
@@ -58,7 +58,7 @@ module.exports = function (dbo) {
             from dat
             from dat
             group by 1
             group by 1
             order by 2 desc
             order by 2 desc
-            `, {replacements: {province_name}, type: dbo.QueryTypes.SELECT});
+            `, {replacements: {province}, type: dbo.QueryTypes.SELECT});
 
 
             return Result.Ok('成功!', result);
             return Result.Ok('成功!', result);
         } catch (e) {
         } catch (e) {
@@ -76,8 +76,9 @@ module.exports = function (dbo) {
         try {
         try {
             // 获取数据
             // 获取数据
             let params = req.query;
             let params = req.query;
-            let {date} = params;
+            let {date, province} = params;
             date = date || moment().format('YYYY-MM-DD');
             date = date || moment().format('YYYY-MM-DD');
+            province = province || '';
 
 
             // 代码逻辑区域
             // 代码逻辑区域
             let result = await dbo.query(`
             let result = await dbo.query(`
@@ -85,12 +86,13 @@ module.exports = function (dbo) {
             select update_time, province_short_name province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country, row_number() over(partition by province_short_name order by update_time desc) rn
             select update_time, province_short_name province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country, row_number() over(partition by province_short_name order by update_time desc) rn
             from tb_mf_timeline_area
             from tb_mf_timeline_area
             where update_time::date = :date
             where update_time::date = :date
+            and province_name ~ :province
             )
             )
             select update_time, province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country
             select update_time, province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country
             from t
             from t
             where rn = 1
             where rn = 1
             order by confirmed_count desc
             order by confirmed_count desc
-            `, {replacements: {date}, type: dbo.QueryTypes.SELECT});
+            `, {replacements: {date, province}, type: dbo.QueryTypes.SELECT});
 
 
             return Result.Ok('成功!', result);
             return Result.Ok('成功!', result);
         } catch (e) {
         } catch (e) {