Skip to content

Commit 7278369

Browse files
soutaitosoutaito
authored
Merge pull request #487 from kaizumaki/feature/add-symptoms
症状報告の項目を追加（「全身倦怠感」「嘔気・嘔吐」「下痢」「食事困難」「半日排尿がない」）
2 parents 05214f3 + 42781ca commit 7278369

File tree

7 files changed

+133
-14
lines changed

7 files changed

+133
-14
lines changed

‎components/CheckboxField.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default Vue.extend({
8282
.checkboxContainer {
8383
position: relative;
8484
display: block;
85-
padding: 16px;
85+
padding: 16px 12px;
8686
border-radius: 6px;
8787
border: 1px solid $gray-2;
8888
cursor: pointer;
@@ -102,6 +102,7 @@ export default Vue.extend({
102102
display: flex;
103103
align-items: center;
104104
cursor: pointer;
105+
font-size: 14px;
105106
&::before {
106107
display: block;
107108
border: 1px solid $gray-2;

‎components/ModalBase.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default Vue.extend({
9494
transform: translate(-50%, -50%);
9595
9696
&.wide {
97-
max-width: 800px;
97+
max-width: 850px;
9898
}
9999
100100
&Transition {

‎components/PatientOverview.vue‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@
5757
lastStatus.symptom.phlegm ||
5858
lastStatus.symptom.suffocation ||
5959
lastStatus.symptom.headache ||
60-
lastStatus.symptom.sore_throat
60+
lastStatus.symptom.sore_throat ||
61+
lastStatus.symptom.malaise ||
62+
lastStatus.symptom.nausea ||
63+
lastStatus.symptom.diarrhea ||
64+
lastStatus.symptom.difficulty_eating ||
65+
lastStatus.symptom.no_urination
6166
"
6267
class="symptoms"
6368
>
@@ -83,9 +88,34 @@
8388
/>
8489
<SymptomsStatus
8590
class="symptomsItem"
86-
text="のど痛み"
91+
text="のどの痛み"
8792
:is-active="lastStatus.symptom.sore_throat"
8893
/>
94+
<SymptomsStatus
95+
class="symptomsItem"
96+
text="全身倦怠感"
97+
:is-active="lastStatus.symptom.malaise"
98+
/>
99+
<SymptomsStatus
100+
class="symptomsItem"
101+
text="嘔気・嘔吐"
102+
:is-active="lastStatus.symptom.nausea"
103+
/>
104+
<SymptomsStatus
105+
class="symptomsItem"
106+
text="下痢"
107+
:is-active="lastStatus.symptom.diarrhea"
108+
/>
109+
<SymptomsStatus
110+
class="symptomsItem"
111+
text="食事困難"
112+
:is-active="lastStatus.symptom.difficulty_eating"
113+
/>
114+
<SymptomsStatus
115+
class="symptomsItem"
116+
text="半日排尿がない"
117+
:is-active="lastStatus.symptom.no_urination"
118+
/>
89119
</div>
90120
<div><PatientOverviewGraph :patient="patient" /></div>
91121
</td>
@@ -150,6 +180,11 @@ export default class PatientOverview extends Vue {
150180
suffocation: false,
151181
headache: false,
152182
sore_throat: false,
183+
malaise: false,
184+
nausea: false,
185+
diarrhea: false,
186+
difficulty_eating: false,
187+
no_urination: false,
153188
remarks: '',
154189
},
155190
}
@@ -261,6 +296,7 @@ export default class PatientOverview extends Vue {
261296
border-radius: 14px;
262297
font-size: 10px;
263298
padding: 0 8px;
299+
max-width: 70%;
264300
}
265301
.symptomsItem:not(:last-of-type)::after {
266302
content: '・';

‎components/PatientOverviewGraph.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<client-only>
44
<Apexcharts
55
type="line"
6-
height="180px"
6+
height="200px"
77
:options="chartOptions"
88
:series="series"
99
/>

‎components/SymptomsHistory.vue‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,42 @@
4040
<SymptomsStatusText
4141
text="せき"
4242
:is-active="item.symptom.cough"
43-
/>・
43+
/>｜
4444
<SymptomsStatusText
4545
text="たん"
4646
:is-active="item.symptom.phlegm"
47-
/>・
47+
/>｜
4848
<SymptomsStatusText
4949
text="息苦しさ"
5050
:is-active="item.symptom.suffocation"
51-
/>・
51+
/>｜
5252
<SymptomsStatusText
5353
text="頭痛"
5454
:is-active="item.symptom.headache"
55-
/>・
55+
/>｜
5656
<SymptomsStatusText
57-
text="のど痛み"
57+
text="のどの痛み"
5858
:is-active="item.symptom.sore_throat"
59+
/>｜
60+
<SymptomsStatusText
61+
text="全身倦怠感"
62+
:is-active="item.symptom.malaise"
63+
/>｜
64+
<SymptomsStatusText
65+
text="嘔気・嘔吐"
66+
:is-active="item.symptom.nausea"
67+
/>｜
68+
<SymptomsStatusText
69+
text="下痢"
70+
:is-active="item.symptom.diarrhea"
71+
/>｜
72+
<SymptomsStatusText
73+
text="食事困難"
74+
:is-active="item.symptom.difficulty_eating"
75+
/>｜
76+
<SymptomsStatusText
77+
text="半日排尿がない"
78+
:is-active="item.symptom.no_urination"
5979
/>
6080
</div>
6181
</td>

‎pages/center/_centerId/patient/_patientId.vue‎

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,11 @@ export default class PatientId extends Vue {
299299
suffocation: false,
300300
headache: false,
301301
sore_throat: false,
302+
malaise: false,
303+
nausea: false,
304+
diarrhea: false,
305+
difficulty_eating: false,
306+
no_urination: false,
302307
remarks: '',
303308
}
304309
@@ -321,7 +326,27 @@ export default class PatientId extends Vue {
321326
},
322327
{
323328
name: 'sore_throat',
324-
label: 'のど痛み',
329+
label: 'のどの痛み',
330+
},
331+
{
332+
name: 'malaise',
333+
label: '全身倦怠感',
334+
},
335+
{
336+
name: 'nausea',
337+
label: '嘔気・嘔吐',
338+
},
339+
{
340+
name: 'diarrhea',
341+
label: '下痢',
342+
},
343+
{
344+
name: 'difficulty_eating',
345+
label: '食事困難',
346+
},
347+
{
348+
name: 'no_urination',
349+
label: '半日排尿がない',
325350
},
326351
]
327352
@@ -353,6 +378,11 @@ export default class PatientId extends Vue {
353378
suffocation: this.inputSymptom.suffocation,
354379
headache: this.inputSymptom.headache,
355380
sore_throat: this.inputSymptom.sore_throat,
381+
malaise: this.inputSymptom.malaise,
382+
nausea: this.inputSymptom.nausea,
383+
diarrhea: this.inputSymptom.diarrhea,
384+
difficulty_eating: this.inputSymptom.difficulty_eating,
385+
no_urination: this.inputSymptom.no_urination,
356386
remarks: this.inputSymptom.remarks,
357387
},
358388
}
@@ -424,7 +454,17 @@ export default class PatientId extends Vue {
424454
425455
itemSelectControl(checked: boolean, value: string): void {
426456
this.inputSymptom[
427-
value as 'cough' | 'phlegm' | 'suffocation' | 'headache' | 'sore_throat'
457+
value as
458+
| 'cough'
459+
| 'phlegm'
460+
| 'suffocation'
461+
| 'headache'
462+
| 'sore_throat'
463+
| 'malaise'
464+
| 'nausea'
465+
| 'diarrhea'
466+
| 'difficulty_eating'
467+
| 'no_urination'
428468
] = checked
429469
}
430470
@@ -459,6 +499,11 @@ export default class PatientId extends Vue {
459499
suffocation: false,
460500
headache: false,
461501
sore_throat: false,
502+
malaise: false,
503+
nausea: false,
504+
diarrhea: false,
505+
difficulty_eating: false,
506+
no_urination: false,
462507
remarks: '',
463508
}
464509
}
@@ -475,7 +520,12 @@ export default class PatientId extends Vue {
475520
たん: item.symptom?.phlegm ? 1 : 0,
476521
息苦しさ: item.symptom?.suffocation ? 1 : 0,
477522
頭痛: item.symptom?.headache ? 1 : 0,
478-
のど痛み: item.symptom?.sore_throat ? 1 : 0,
523+
のどの痛み: item.symptom?.sore_throat ? 1 : 0,
524+
全身倦怠感: item.symptom?.malaise ? 1 : 0,
525+
'嘔気・嘔吐': item.symptom?.nausea ? 1 : 0,
526+
下痢: item.symptom?.diarrhea ? 1 : 0,
527+
食事困難: item.symptom?.difficulty_eating ? 1 : 0,
528+
半日排尿がない: item.symptom?.no_urination ? 1 : 0,
479529
その他の体調の変化: item.symptom?.remarks,
480530
}
481531
})
@@ -618,10 +668,12 @@ export default class PatientId extends Vue {
618668
}
619669
.symptomsList {
620670
display: flex;
671+
flex-wrap: wrap;
621672
justify-content: space-between;
622673
}
623674
.symptomsItem {
624-
flex: 0 1 18%;
675+
flex: 0 0 19%;
676+
margin-bottom: 12px;
625677
}
626678
.buttonContainer {
627679
margin: 15px 0;

‎types/component-interfaces/status.d.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ export interface Status {
1414
suffocation: boolean
1515
headache: boolean
1616
sore_throat: boolean
17+
malaise: boolean
18+
nausea: boolean
19+
diarrhea: boolean
20+
difficulty_eating: boolean
21+
no_urination: boolean
1722
remarks?: string
1823
}
1924
}
@@ -28,6 +33,11 @@ export interface ConsumeStatus {
2833
suffocation: boolean
2934
headache: boolean
3035
sore_throat: boolean
36+
malaise: boolean
37+
nausea: boolean
38+
diarrhea: boolean
39+
difficulty_eating: boolean
40+
no_urination: boolean
3141
remarks: string
3242
}
3343
}

0 commit comments

Comments
 (0)