Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Commit

Permalink
Merge branch 'development' into feat/px2vw
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdmaster committed Nov 24, 2021
2 parents 2ac7617 + 2058a43 commit 87fc8a0
Show file tree
Hide file tree
Showing 30 changed files with 1,775 additions and 1,533 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ GEM
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
rubyzip (2.3.2)
selenium-webdriver (4.0.3)
selenium-webdriver (4.1.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2)
Expand Down
12 changes: 11 additions & 1 deletion data/consultation_about_fever.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/11\/22 17:30",
"date": "2021\/11\/24 17:30",
"data": [
{
"date": "2020-03-01",
Expand Down Expand Up @@ -3155,6 +3155,16 @@
"date": "2021-11-21",
"count": 71,
"weekly_average_count": 52
},
{
"date": "2021-11-22",
"count": 55,
"weekly_average_count": 53.3
},
{
"date": "2021-11-23",
"count": 73,
"weekly_average_count": 56.3
}
]
}
13 changes: 12 additions & 1 deletion data/daily_positive_detail.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/11\/23 17:15",
"date": "2021\/11\/24 17:30",
"data": [
{
"diagnosed_date": "2020-01-20",
Expand Down Expand Up @@ -7414,6 +7414,17 @@
"weekly_average_count": 17.4,
"weekly_average_untracked_count": 11.1,
"weekly_average_untracked_increse_percent": 81.3
},
{
"diagnosed_date": "2021-11-24",
"count": 5,
"missing_count": 4,
"reported_count": 1,
"weekly_gain_ratio": 0.68,
"untracked_percent": 60.8,
"weekly_average_count": 14.3,
"weekly_average_untracked_count": 8.7,
"weekly_average_untracked_increse_percent": 61.6
}
]
}
96 changes: 64 additions & 32 deletions data/data.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contacts": {
"date": "2021\/11\/22 17:30",
"date": "2021\/11\/24 17:30",
"data": [
{
"日付": "2020-01-29T08:00:00.000Z",
Expand Down Expand Up @@ -6631,6 +6631,26 @@
"date": "2021-11-21",
"w": 0,
"小計": 55
},
{
"日付": "2021-11-22T08:00:00.000Z",
"曜日": "",
"9-13時": 28,
"13-17時": 22,
"17-21時": 15,
"date": "2021-11-22",
"w": 1,
"小計": 65
},
{
"日付": "2021-11-23T08:00:00.000Z",
"曜日": "",
"9-13時": 32,
"13-17時": 23,
"17-21時": 15,
"date": "2021-11-23",
"w": 2,
"小計": 70
}
]
},
Expand Down Expand Up @@ -9310,7 +9330,7 @@
]
},
"patients_summary": {
"date": "2021\/11\/23 17:15",
"date": "2021\/11\/24 17:30",
"data": [
{
"日付": "2020-01-24T08:00:00.000Z",
Expand Down Expand Up @@ -11991,11 +12011,15 @@
{
"日付": "2021-11-23T08:00:00.000Z",
"小計": 17
},
{
"日付": "2021-11-24T08:00:00.000Z",
"小計": 5
}
]
},
"inspections_summary": {
"date": "2021\/11\/22 17:30",
"date": "2021\/11\/24 17:30",
"data": {
"都内": [
0,
Expand Down Expand Up @@ -12665,6 +12689,8 @@
0,
16,
0,
0,
0,
0
],
"その他": [
Expand Down Expand Up @@ -13335,6 +13361,8 @@
0,
0,
0,
0,
0,
0
],
"保険適用分": [
Expand Down Expand Up @@ -13985,27 +14013,29 @@
7136,
4336,
2122,
8920,
8305,
2371,
8896,
8925,
8310,
2373,
8903,
8579,
4876,
2129,
10098,
7682,
7201,
6885,
7514,
4363,
1943,
9224,
6842,
6112,
6008,
5739,
3359,
1324
4869,
2130,
10116,
7691,
7213,
6903,
7549,
4397,
1976,
9327,
6925,
6223,
6158,
6222,
3688,
1639,
7623,
1615
]
},
"labels": [
Expand Down Expand Up @@ -14676,24 +14706,26 @@
"2021-11-18",
"2021-11-19",
"2021-11-20",
"2021-11-21"
"2021-11-21",
"2021-11-22",
"2021-11-23"
]
},
"lastUpdate": "2021\/11\/23 17:15",
"lastUpdate": "2021\/11\/24 17:30",
"main_summary": {
"children": [
{
"attr": "陽性患者数",
"date": "2021\/11\/23 17:15",
"value": 382112,
"date": "2021\/11\/24 17:30",
"value": 382117,
"children": [
{
"attr": "入院中",
"value": 79,
"value": 72,
"children": [
{
"attr": "軽症・中等症",
"value": 71
"value": 64
},
{
"attr": "重症",
Expand All @@ -14703,7 +14735,7 @@
},
{
"attr": "退院",
"value": 378778
"value": 378793
},
{
"attr": "死亡",
Expand All @@ -14715,11 +14747,11 @@
},
{
"attr": "自宅療養",
"value": 39
"value": 48
},
{
"attr": "調査中",
"value": 24
"value": 12
}
]
}
Expand Down
6 changes: 5 additions & 1 deletion data/deaths.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/11\/23 17:15",
"date": "2021\/11\/24 17:30",
"data": [
{
"death_date": "2020-02-26",
Expand Down Expand Up @@ -2548,6 +2548,10 @@
{
"death_date": "2021-11-23",
"count": 0
},
{
"death_date": "2021-11-24",
"count": 0
}
]
}
20 changes: 19 additions & 1 deletion data/fever_consultation_center.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/11\/22 17:30",
"date": "2021\/11\/24 17:30",
"data": [
{
"date": "2020-10-30",
Expand Down Expand Up @@ -3492,6 +3492,24 @@
"total": 397,
"weekly_average_total": 355
}
},
{
"date": "2021-11-22",
"count": {
"fever_consultation_center": 381,
"cocoa_dial": 0,
"total": 381,
"weekly_average_total": 352
}
},
{
"date": "2021-11-23",
"count": {
"fever_consultation_center": 468,
"cocoa_dial": 0,
"total": 468,
"weekly_average_total": 370
}
}
]
}
12 changes: 6 additions & 6 deletions data/infection_medicalcareprovision_status.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"date": "2021\/11\/23 17:15",
"date": "2021\/11\/24 17:30",
"data": {
"新規陽性者": 17,
"検査数": 3479.3,
"検査統計日時": "2021-11-21",
"うち65歳以上の高齢者数": 1,
"新規陽性者": 5,
"検査数": 3625.7,
"検査統計日時": "2021-11-23",
"うち65歳以上の高齢者数": 0,
"死亡者数": 0,
"都外からの持込検体による陽性数": 0,
"入院数": 79,
"入院数": 72,
"確保病床数": 4823,
"うち重症者数": 8,
"うち重症病床数": 356
Expand Down
16 changes: 8 additions & 8 deletions data/monitoring_items.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/11\/23 17:15",
"date": "2021\/11\/24 17:30",
"data": {
"専門家3行コメント": [
{
Expand All @@ -11,14 +11,14 @@
"@en": "The number of people hospitalized continues to decline, making it possible to maintain a balance between COVID and non-COVID medical care. However, due to the need to secure personnel and beds in preparation for a surge in infections, the emergency medical care system remains impacted."
}
],
"(1)新規陽性者数": 17.4,
"(2)#7119(東京消防庁救急相談センター)における発熱等相談件数 ": 52,
"(3)新規陽性者における接触歴等不明者(人数)": 11.1,
"(3)新規陽性者における接触歴等不明者(増加比)": 81.3,
"(1)新規陽性者数": 14.3,
"(2)#7119(東京消防庁救急相談センター)における発熱等相談件数 ": 56.3,
"(3)新規陽性者における接触歴等不明者(人数)": 8.7,
"(3)新規陽性者における接触歴等不明者(増加比)": 61.6,
"(4)PCR・抗原検査(陽性率)": 0.3,
"(4)PCR・抗原検査(検査人数)": 5239.3,
"(5)救急医療の東京ルールの適用件数": 49.4,
"(6)入院患者数": 79,
"(4)PCR・抗原検査(検査人数)": 4583.1,
"(5)救急医療の東京ルールの適用件数": 51.6,
"(6)入院患者数": 72,
"(6)入院患者確保病床数": 4823,
"(7)重症患者数": 8,
"(7)重症患者確保病床数": 356,
Expand Down
8 changes: 4 additions & 4 deletions data/news.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"newsItems": [
{
"date": "2021\/11\/23",
"date": "2021\/11\/24",
"url": "https:\/\/www.fukushihoken.metro.tokyo.lg.jp\/english\/health-crisis\/monitoring.html",
"text": "“About COVID-19 Monitoring” has been posted.\/英語でモニタリングに関する情報を掲載しました。"
},
{
"date": "2021\/11\/23",
"date": "2021\/11\/24",
"url": "https:\/\/www.fukushihoken.metro.tokyo.lg.jp\/iryo\/kansen\/coronavaccine\/for_foreigner.html#cmsD56F5",
"text": "We open walk-in vaccination centers.\/東京都は予約なしのワクチン接種センターを開設しています。"
},
{
"date": "2021\/11\/23",
"date": "2021\/11\/24",
"url": "https:\/\/www.fukushihoken.metro.tokyo.lg.jp\/iryo\/kansen\/kunishihyou.html",
"text": "国のステージ判断のための指標"
},
{
"date": "2021\/11\/23",
"date": "2021\/11\/24",
"url": "https:\/\/www.fukushihoken.metro.tokyo.lg.jp\/iryo\/kansen\/ryoyosha.html",
"text": "療養者の状況について"
}
Expand Down

0 comments on commit 87fc8a0

Please sign in to comment.