加入全国的合计

@@ -58,14 +58,26 @@ module.exports = function (dbo) {
             select country, province, today, confirmed_count,  confirmed_count - COALESCE(lag(confirmed_count) over(partition by country, province order by today), 0) increase
             select country, province, today, confirmed_count,  confirmed_count - COALESCE(lag(confirmed_count) over(partition by country, province order by today), 0) increase
             from dat
             from dat
             )
             )
+            , summ as (
+            select country, today, sum(confirmed_count) confirmed_sum, sum(increase) increase
+            from rpt
+            group by 1,2
+            order by country, confirmed_sum desc
+            )
             select country, province, max(confirmed_count) max_count, jsonb_agg(today) days, jsonb_agg(confirmed_count) confirmed_counts,
             select country, province, max(confirmed_count) max_count, jsonb_agg(today) days, jsonb_agg(confirmed_count) confirmed_counts,
             jsonb_agg(increase) increase,
             jsonb_agg(increase) increase,
-            max(confirmed_sum) confirmed_sum,
-            max(increase_sum) increase_sum
-            from ( select *, sum(confirmed_count) over(partition by country, today) confirmed_sum, sum(increase) over(partition by country, today) increase_sum from rpt
+            max(confirmed_sum) confirmed_sum
+            from ( select *, sum(confirmed_count) over(partition by country, today) confirmed_sum from rpt
             ) t
             ) t
             group by 1,2
             group by 1,2
-            order by country, confirmed_counts desc
+            union all
+            select country, '全国' province, max(confirmed_sum) max_count, jsonb_agg(today) days, jsonb_agg(confirmed_sum) confirmed_counts,
+            jsonb_agg(increase) increase,
+            max(confirmed_sum)
+            from summ
+            where country = '中国'
+            group by 1
+            order by country, max_count desc
             `, {replacements: {province}, type: dbo.QueryTypes.SELECT});
             `, {replacements: {province}, type: dbo.QueryTypes.SELECT});
 
 
             return Result.Ok('成功!', result);
             return Result.Ok('成功!', result);