
--- client/resources/css/common.css
+++ client/resources/css/common.css
... | ... | @@ -379,8 +379,8 @@ |
379 | 379 |
input[type='radio']:checked { |
380 | 380 |
background-color: #f25430; |
381 | 381 |
} |
382 |
-input[type='date']{width: 24%;} |
|
383 |
-.senior-insert input[type='date']{width: 39%;} |
|
382 |
+input[type='date']{width: -webkit-fill-available;} |
|
383 |
+.senior-insert input[type='date']{width: -webkit-fill-available;} |
|
384 | 384 |
/* margin */ |
385 | 385 |
.margin-bottom { |
386 | 386 |
margin-bottom: 1rem; |
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
... | ... | @@ -186,7 +186,7 @@ |
186 | 186 |
height: 26vh !important; |
187 | 187 |
} |
188 | 188 |
#chart { |
189 |
- height: 27vh !important; |
|
189 |
+ /* height: 27vh !important; */ |
|
190 | 190 |
} |
191 | 191 |
#Chart2 { |
192 | 192 |
height: 27vh !important; |
... | ... | @@ -674,14 +674,15 @@ |
674 | 674 |
height: 26vh !important; |
675 | 675 |
} |
676 | 676 |
#chartdiv { |
677 |
- height: 26vh !important; |
|
677 |
+ /* height: 26vh !important; */ |
|
678 | 678 |
} |
679 | 679 |
#chart { |
680 |
- height: 27vh !important; |
|
680 |
+ /* height: 27vh !important; */ |
|
681 | 681 |
} |
682 | 682 |
#Chart2 { |
683 | 683 |
height: 27vh !important; |
684 | 684 |
} |
685 |
+ input[type='date']{width: -webkit-fill-available;} |
|
685 | 686 |
.statistics-grid { |
686 | 687 |
display: block; |
687 | 688 |
} |
... | ... | @@ -1112,4 +1113,23 @@ |
1112 | 1113 |
.medicine-grid{display: block;} |
1113 | 1114 |
.medicine-grid > div{height: max-content;} |
1114 | 1115 |
|
1116 |
+ /* 문진표 */ |
|
1117 |
+ .questionnaire-table td{padding: 0 !important;} |
|
1118 |
+ .questionnaire-table input[type="text"]{width: auto;} |
|
1119 |
+ |
|
1120 |
+ .caregiver-user{} |
|
1121 |
+ |
|
1122 |
+ .medicine-detail-table th{display: none;} |
|
1123 |
+ .medicine-detail-table tbody tr{background-color: #f2f0eb; border-radius: 5px; padding: 0.5rem; margin-bottom: 1rem;} |
|
1124 |
+ .medicine-detail-table td{text-align: right; position: relative; padding-left: 50%;} |
|
1125 |
+ .medicine-detail-table td:nth-child(odd){background-color: #ffffff;} |
|
1126 |
+ .medicine-detail-table td::before{ |
|
1127 |
+ content: attr(data-label); |
|
1128 |
+ position: absolute; |
|
1129 |
+ left: 0; |
|
1130 |
+ width: 34%; |
|
1131 |
+ text-align: left; |
|
1132 |
+ border-left: 8px solid #d8d3c7; |
|
1133 |
+ padding-left: 1rem; |
|
1134 |
+ } |
|
1115 | 1135 |
} |
--- client/views/component/Modal_MedicalHistory.jsx
+++ client/views/component/Modal_MedicalHistory.jsx
... | ... | @@ -1,6 +1,7 @@ |
1 | 1 |
import React from "react"; |
2 | 2 |
import Button from "./Button.jsx"; |
3 | 3 |
import Table from "./Table.jsx"; |
4 |
+import AssignmentIcon from '@mui/icons-material/Assignment'; |
|
4 | 5 |
|
5 | 6 |
export default function Modal_MedicalHistory({ open, close, }) { |
6 | 7 |
const thead1 = [ |
... | ... | @@ -13,11 +14,21 @@ |
13 | 14 |
const key1 = ["No", "date", "reason","content", "name"]; |
14 | 15 |
const content1 = [ |
15 | 16 |
{ |
16 |
- No: 1, |
|
17 |
- date: "2023-01-25", |
|
18 |
- reason: "정기 내원", |
|
19 |
- content: "건강검진 진행, 이상 없음", |
|
20 |
- name: "정간호", |
|
17 |
+ No: ( |
|
18 |
+ <p><span><AssignmentIcon sx={{ fontSize: 20 }} />{thead1[0]}</span> 1</p> |
|
19 |
+ ), |
|
20 |
+ date: ( |
|
21 |
+ <p><span>{thead1[1]}</span> 1948.11.15</p> |
|
22 |
+ ), |
|
23 |
+ reason: ( |
|
24 |
+ <p><span>{thead1[2]}</span> 정기 내원</p> |
|
25 |
+ ), |
|
26 |
+ content: ( |
|
27 |
+ <p><span>{thead1[3]}</span> 건강검진 진행, 이상 없음</p> |
|
28 |
+ ), |
|
29 |
+ name: ( |
|
30 |
+ <p><span>{thead1[4]}</span> 정간호</p> |
|
31 |
+ ), |
|
21 | 32 |
}, |
22 | 33 |
]; |
23 | 34 |
return ( |
... | ... | @@ -30,7 +41,7 @@ |
30 | 41 |
</div> |
31 | 42 |
<div className="modal-main"> |
32 | 43 |
<div className="board-wrap"> |
33 |
- <table className="margin-bottom2 senior-insert"> |
|
44 |
+ <table className="margin-bottom2 senior-insert "> |
|
34 | 45 |
<tr> |
35 | 46 |
<th>진료일자</th> |
36 | 47 |
<td> |
... | ... | @@ -61,7 +72,7 @@ |
61 | 72 |
</div> |
62 | 73 |
<div> |
63 | 74 |
<Table |
64 |
- className={"caregiver-user"} |
|
75 |
+ className={"caregiver-user senior-insert senior-table"} |
|
65 | 76 |
head={thead1} |
66 | 77 |
contents={content1} |
67 | 78 |
contentKey={key1} |
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
... | ... | @@ -4,6 +4,7 @@ |
4 | 4 |
import { useNavigate } from "react-router"; |
5 | 5 |
import logo from "../../resources/files/images/logo.png"; |
6 | 6 |
import MenuIcon from "@mui/icons-material/Menu"; |
7 |
+import CloseIcon from '@mui/icons-material/Close'; |
|
7 | 8 |
|
8 | 9 |
export default function Sidebar({items}) { |
9 | 10 |
const [menuToggle, setMenuToggle] = React.useState(false); |
... | ... | @@ -11,7 +12,6 @@ |
11 | 12 |
setMenuToggle(!menuToggle) |
12 | 13 |
} |
13 | 14 |
const navigate = useNavigate(); |
14 |
- |
|
15 | 15 |
//로그아웃 |
16 | 16 |
const logout = () => { |
17 | 17 |
fetch("/user/logout.json", { |
... | ... | @@ -31,13 +31,24 @@ |
31 | 31 |
console.log('logout() /user/logout.json error : ', error); |
32 | 32 |
}); |
33 | 33 |
}; |
34 |
- |
|
34 |
+ const [iconIndex, setIconIndex] = React.useState(0); |
|
35 |
+ const icons = [<MenuIcon sx={{ fontSize: 40, }}/>, <CloseIcon sx={{ fontSize: 40, }}/>]; |
|
36 |
+ const handleClick = () => { |
|
37 |
+ setIconIndex((iconIndex + 1) % icons.length); |
|
38 |
+ }; |
|
35 | 39 |
return ( |
36 | 40 |
<> |
37 | 41 |
<nav |
38 | 42 |
className={menuToggle? "nav on" : "nav"} |
39 | 43 |
> |
40 |
- <div className="menuicon" onClick={onClickshow}><MenuIcon sx={{ width:35, height:35,color:"#7a7f87"}}/></div > |
|
44 |
+ <div className="menuicon" onClick={() => { |
|
45 |
+ onClickshow(); |
|
46 |
+ // count(); |
|
47 |
+ handleClick(); |
|
48 |
+ }}> |
|
49 |
+ {icons[iconIndex]} |
|
50 |
+ {/* <MenuIcon sx={{ width:35, height:35,color:"#7a7f87"}}/> */} |
|
51 |
+ </div > |
|
41 | 52 |
<h1 className="logo"><img src={logo} alt="" /></h1> |
42 | 53 |
<div className="flex-align-column" style={{ marginTop: `3rem` }}> |
43 | 54 |
<ul > |
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
... | ... | @@ -12,6 +12,7 @@ |
12 | 12 |
import Modal_MedicalHistory from "../../component/Modal_MedicalHistory.jsx"; |
13 | 13 |
import Modal_Blood from "../../component/Modal_Blood.jsx"; |
14 | 14 |
import Modal_ECG from "../../component/Modal_ECG.jsx"; |
15 |
+import person from "../../../resources/files/icon/person.png"; |
|
15 | 16 |
|
16 | 17 |
export default function UserAuthoriySelect() { |
17 | 18 |
const navigate = useNavigate(); |
... | ... | @@ -53,26 +54,38 @@ |
53 | 54 |
]; |
54 | 55 |
const content = [ |
55 | 56 |
{ |
56 |
- No: 1, |
|
57 |
- name: "김복남", |
|
58 |
- number: "00000001", |
|
59 |
- birth: "1948.11.15", |
|
60 |
- phone: "010-1234-5678", |
|
61 |
- address: "경상북도 군위군 삼국유사면", |
|
57 |
+ No: ( |
|
58 |
+ <p><span><img src={person} alt="" />{thead[0]}</span> 1</p> |
|
59 |
+ ), |
|
60 |
+ name: ( |
|
61 |
+ <p><span>{thead[1]}</span> 김복남</p> |
|
62 |
+ ), |
|
63 |
+ number: ( |
|
64 |
+ <p><span>{thead[2]}</span> 0000001</p> |
|
65 |
+ ), |
|
66 |
+ birth: ( |
|
67 |
+ <p><span>{thead[3]}</span> 1948.11.15</p> |
|
68 |
+ ), |
|
69 |
+ phone: ( |
|
70 |
+ <p><span>{thead[4]}</span> 010-1234-1234</p> |
|
71 |
+ ), |
|
72 |
+ address: ( |
|
73 |
+ <p><span>{thead[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
74 |
+ ), |
|
62 | 75 |
average: ( |
63 |
- <Button |
|
64 |
- className={"btn-small gray-btn"} |
|
65 |
- btnName={"작성하기"} |
|
66 |
- onClick={openModal} |
|
67 |
- /> |
|
68 |
- ), |
|
76 |
+ <p><span>{thead[6]}</span> <Button |
|
77 |
+ className={"btn-small gray-btn"} |
|
78 |
+ btnName={"작성하기"} |
|
79 |
+ onClick={openModal} |
|
80 |
+ /></p> |
|
81 |
+ ), |
|
69 | 82 |
record: ( |
70 |
- <Button |
|
71 |
- className={"btn-small gray-btn"} |
|
72 |
- btnName={"진료 내역"} |
|
73 |
- onClick={openModal2} |
|
74 |
- /> |
|
75 |
- ), |
|
83 |
+ <p><span>{thead[7]}</span> <Button |
|
84 |
+ className={"btn-small gray-btn"} |
|
85 |
+ btnName={"진료 내역"} |
|
86 |
+ onClick={openModal2} |
|
87 |
+ /></p> |
|
88 |
+ ), |
|
76 | 89 |
}, |
77 | 90 |
|
78 | 91 |
]; |
... | ... | @@ -84,19 +97,31 @@ |
84 | 97 |
]; |
85 | 98 |
const content1 = [ |
86 | 99 |
{ |
87 |
- No: 1, |
|
88 |
- name: "김복남", |
|
89 |
- number: "00000001", |
|
90 |
- birth: "1948.11.15", |
|
91 |
- phone: "010-1234-5678", |
|
92 |
- address: "경상북도 군위군 삼국유사면", |
|
100 |
+ No: ( |
|
101 |
+ <p><span><img src={person} alt="" />{thead1[0]}</span> 1</p> |
|
102 |
+ ), |
|
103 |
+ name: ( |
|
104 |
+ <p><span>{thead1[1]}</span> 김복남</p> |
|
105 |
+ ), |
|
106 |
+ number: ( |
|
107 |
+ <p><span>{thead1[2]}</span> 0000001</p> |
|
108 |
+ ), |
|
109 |
+ birth: ( |
|
110 |
+ <p><span>{thead1[3]}</span> 1948.11.15</p> |
|
111 |
+ ), |
|
112 |
+ phone: ( |
|
113 |
+ <p><span>{thead1[4]}</span> 010-1234-1234</p> |
|
114 |
+ ), |
|
115 |
+ address: ( |
|
116 |
+ <p><span>{thead1[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
117 |
+ ), |
|
93 | 118 |
ECG: ( |
94 |
- <Button |
|
95 |
- className={"btn-small gray-btn"} |
|
96 |
- btnName={"등록"} |
|
97 |
- onClick={openModal3} |
|
98 |
- /> |
|
99 |
- ), |
|
119 |
+ <p><span>{thead1[6]}</span> <Button |
|
120 |
+ className={"btn-small gray-btn"} |
|
121 |
+ btnName={"등록"} |
|
122 |
+ onClick={openModal3} |
|
123 |
+ /></p> |
|
124 |
+ ), |
|
100 | 125 |
} |
101 | 126 |
]; |
102 | 127 |
const thead2 = [ |
... | ... | @@ -107,22 +132,43 @@ |
107 | 132 |
]; |
108 | 133 |
const content2 = [ |
109 | 134 |
{ |
110 |
- No: 1, |
|
111 |
- name: "김복남", |
|
112 |
- number: "00000001", |
|
113 |
- birth: "1948.11.15", |
|
114 |
- phone: "010-1234-5678", |
|
115 |
- address: "경상북도 군위군 삼국유사면", |
|
116 |
- recent: "2020-01-05", |
|
117 |
- high: "130", |
|
118 |
- low: "90", |
|
119 |
- pulse: "60", |
|
120 |
- average: ( |
|
121 |
- <Button |
|
122 |
- className={"btn-small gray-btn"} |
|
123 |
- btnName={"등록"} |
|
124 |
- onClick={openModal4} |
|
125 |
- /> |
|
135 |
+ No: ( |
|
136 |
+ <p><span><img src={person} alt="" />{thead2[0]}</span> 1</p> |
|
137 |
+ ), |
|
138 |
+ name: ( |
|
139 |
+ <p><span>{thead2[1]}</span> 김복남</p> |
|
140 |
+ ), |
|
141 |
+ number: ( |
|
142 |
+ <p><span>{thead2[2]}</span> 0000001</p> |
|
143 |
+ ), |
|
144 |
+ birth: ( |
|
145 |
+ <p><span>{thead2[3]}</span> 1948.11.15</p> |
|
146 |
+ ), |
|
147 |
+ phone: ( |
|
148 |
+ <p><span>{thead2[4]}</span> 010-1234-1234</p> |
|
149 |
+ ), |
|
150 |
+ address: ( |
|
151 |
+ <p><span>{thead2[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
152 |
+ ), |
|
153 |
+ recent: ( |
|
154 |
+ <p><span>{thead2[6]}</span> 1948.11.15</p> |
|
155 |
+ ), |
|
156 |
+ high: ( |
|
157 |
+ <p><span>{thead2[7]}</span> 130</p> |
|
158 |
+ ), |
|
159 |
+ low: ( |
|
160 |
+ <p><span>{thead2[8]}</span> 90</p> |
|
161 |
+ ), |
|
162 |
+ pulse:( |
|
163 |
+ <p><span>{thead2[9]}</span> 60</p> |
|
164 |
+ ), |
|
165 |
+ average:( |
|
166 |
+ <p><span>{thead2[10]}</span> <Button |
|
167 |
+ className={"btn-small gray-btn"} |
|
168 |
+ btnName={"등록"} |
|
169 |
+ onClick={openModal4} |
|
170 |
+ /></p> |
|
171 |
+ |
|
126 | 172 |
), |
127 | 173 |
}, |
128 | 174 |
]; |
... | ... | @@ -132,7 +178,7 @@ |
132 | 178 |
title: "문진표 관리", |
133 | 179 |
description: ( |
134 | 180 |
<Table |
135 |
- className={"protector-user"} |
|
181 |
+ className={"protector-user senior-table"} |
|
136 | 182 |
head={thead} |
137 | 183 |
contents={content} |
138 | 184 |
contentKey={key} |
--- client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
+++ client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
... | ... | @@ -10,6 +10,7 @@ |
10 | 10 |
import SubTitle from "../../../component/SubTitle.jsx"; |
11 | 11 |
import Donut2 from "../../../component/chart/Donut2.jsx"; |
12 | 12 |
import LineColor_medicine from "../../../component/chart/LineColor_medicine.jsx"; |
13 |
+import MedicationIcon from '@mui/icons-material/Medication'; |
|
13 | 14 |
|
14 | 15 |
export default function MedicineCareSelectOne() { |
15 | 16 |
const navigate = useNavigate(); |
... | ... | @@ -121,7 +122,7 @@ |
121 | 122 |
border: "1px solid #eeeeee", |
122 | 123 |
borderRadius: "0.5rem", |
123 | 124 |
padding: "1rem", |
124 |
- height: "17vh", |
|
125 |
+ height: "20vh", |
|
125 | 126 |
}} |
126 | 127 |
> |
127 | 128 |
<Donut2 /> |
... | ... | @@ -137,7 +138,7 @@ |
137 | 138 |
border: "1px solid #eeeeee", |
138 | 139 |
borderRadius: "0.5rem", |
139 | 140 |
padding: "1rem", |
140 |
- height: "17vh", |
|
141 |
+ height: "20vh", |
|
141 | 142 |
}} |
142 | 143 |
> |
143 | 144 |
<Chart3 /> |
... | ... | @@ -153,7 +154,7 @@ |
153 | 154 |
border: "1px solid #eeeeee", |
154 | 155 |
borderRadius: "0.5rem", |
155 | 156 |
padding: "1rem", |
156 |
- height: "17vh", |
|
157 |
+ height: "20vh", |
|
157 | 158 |
}} |
158 | 159 |
> |
159 | 160 |
<Chart /> |
... | ... | @@ -169,7 +170,7 @@ |
169 | 170 |
border: "1px solid #eeeeee", |
170 | 171 |
borderRadius: "0.5rem", |
171 | 172 |
padding: "1rem", |
172 |
- height: "17vh", |
|
173 |
+ height: "20vh", |
|
173 | 174 |
}} |
174 | 175 |
> |
175 | 176 |
<LineColor_medicine /> |
... | ... | @@ -198,39 +199,17 @@ |
198 | 199 |
</thead> |
199 | 200 |
<tbody> |
200 | 201 |
<tr> |
201 |
- <td>2</td> |
|
202 |
- <td>2022.08.10</td> |
|
203 |
- <td>미복약</td> |
|
204 |
- <td>미복약</td> |
|
205 |
- <td>미복약</td> |
|
206 |
- <td>3회</td> |
|
207 |
- <td>0%</td> |
|
208 |
- <td>3일간 미복약으로 확인 되어 전화드림( 아들내 방문 중 )외출</td> |
|
209 |
- <td>김대상</td> |
|
210 |
- <td>2022.12.27</td> |
|
211 |
- <td> |
|
212 |
- <div className="btn-wrap flex-center"> |
|
213 |
- <Button |
|
214 |
- className={"btn-small lightgray-btn"} |
|
215 |
- btnName={"수정"} |
|
216 |
- onClick={openModal} |
|
217 |
- /> |
|
218 |
- <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/> |
|
219 |
- </div> |
|
220 |
- </td> |
|
221 |
- </tr> |
|
222 |
- <tr> |
|
223 |
- <td>1</td> |
|
224 |
- <td>2022.08.09</td> |
|
225 |
- <td>복약</td> |
|
226 |
- <td>미복약</td> |
|
227 |
- <td>복약</td> |
|
228 |
- <td>3회</td> |
|
229 |
- <td>90%</td> |
|
230 |
- <td>-</td> |
|
231 |
- <td>-</td> |
|
232 |
- <td>-</td> |
|
233 |
- <td> |
|
202 |
+ <td data-label="No">1</td> |
|
203 |
+ <td data-label="날짜">2022.08.10</td> |
|
204 |
+ <td data-label="복약상태(아침)">미복약</td> |
|
205 |
+ <td data-label="복약상태(점심)">미복약</td> |
|
206 |
+ <td data-label="복약상태(저녁)">미복약</td> |
|
207 |
+ <td data-label="필요 복용 횟수">3회</td> |
|
208 |
+ <td data-label="복약률">0%</td> |
|
209 |
+ <td data-label="수정 상세 사유">3일간 미복약으로 확인 되어 전화드림( 아들내 방문 중 )외출</td> |
|
210 |
+ <td data-label="수정자">김대상</td> |
|
211 |
+ <td data-label="수정일시">2022.12.27</td> |
|
212 |
+ <td data-label="관리"> |
|
234 | 213 |
<div className="btn-wrap flex-center"> |
235 | 214 |
<Button |
236 | 215 |
className={"btn-small lightgray-btn"} |
--- client/views/pages/healthcare/statistics/MedicineStatistics.jsx
+++ client/views/pages/healthcare/statistics/MedicineStatistics.jsx
... | ... | @@ -29,12 +29,12 @@ |
29 | 29 |
height: "calc(100% - 47px)", |
30 | 30 |
}} |
31 | 31 |
> |
32 |
- <div className="flex-end"> |
|
32 |
+ <div className="flex-end gap"> |
|
33 | 33 |
<div className="flex flex30"> |
34 | 34 |
<input type="date" name="" id="" /> |
35 | 35 |
</div> |
36 |
- <div className="flex10"> |
|
37 |
- <Button className={"green-btn"} btnName={"검색"} /> |
|
36 |
+ <div className=""> |
|
37 |
+ <Button className={"gray-btn"} btnName={"검색"} /> |
|
38 | 38 |
</div> |
39 | 39 |
</div> |
40 | 40 |
<Donut2 /> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?