
--- client/views/pages/healthcare/MedicalcareAdmin.jsx
+++ client/views/pages/healthcare/MedicalcareAdmin.jsx
... | ... | @@ -31,7 +31,7 @@ |
31 | 31 |
//검색 |
32 | 32 |
const searching = () => { |
33 | 33 |
if (CommonUtil.isEmpty(state.loginUser) == false |
34 |
- && state.loginUser['authority'] == 'ROLE_AGENCY' && isMySenior) { |
|
34 |
+ && state.loginUser['authority'] == 'ROLE_AGEN CY' && isMySenior) { |
|
35 | 35 |
senior.search['agent_id'] = state.loginUser['user_id']; |
36 | 36 |
} else { |
37 | 37 |
senior.search['agent_id'] = null; |
... | ... | @@ -110,6 +110,10 @@ |
110 | 110 |
const [modalOpen3, setModalOpen3] = React.useState(false); |
111 | 111 |
const openModal3 = (senior) => { |
112 | 112 |
targetSenior['senior_id'] = senior['senior_id']; |
113 |
+ |
|
114 |
+ setEcgInit(); |
|
115 |
+ ecg.commonFileList = []; |
|
116 |
+ |
|
113 | 117 |
setTargetSenior(senior); |
114 | 118 |
ecgSelectList(); |
115 | 119 |
|
... | ... | @@ -123,6 +127,9 @@ |
123 | 127 |
const [modalOpen4, setModalOpen4] = React.useState(false); |
124 | 128 |
const openModal4 = (senior) => { |
125 | 129 |
targetSenior['senior_id'] = senior['senior_id']; |
130 |
+ |
|
131 |
+ setBloodPressureInit(); |
|
132 |
+ |
|
126 | 133 |
setTargetSenior(senior); |
127 | 134 |
bloodPressureSelectList(); |
128 | 135 |
|
... | ... | @@ -542,6 +549,7 @@ |
542 | 549 |
console.log("심전도 등록 결과(건수) : ", data); |
543 | 550 |
if (data > 0) { |
544 | 551 |
setEcgInit(); |
552 |
+ ecg.commonFileList = []; |
|
545 | 553 |
ecgSelectList(); |
546 | 554 |
//closeModal3(); |
547 | 555 |
alert("등록완료"); |
... | ... | @@ -575,7 +583,6 @@ |
575 | 583 |
if (data > 0) { |
576 | 584 |
setEcgInit(); |
577 | 585 |
ecg.commonFileList = []; |
578 |
- setEcg({ ...ecg }); |
|
579 | 586 |
ecgSelectList(); |
580 | 587 |
//closeModal3(); |
581 | 588 |
alert("수정완료"); |
... | ... | @@ -604,7 +611,6 @@ |
604 | 611 |
if (data > 0) { |
605 | 612 |
setEcgInit(); |
606 | 613 |
ecg.commonFileList = []; |
607 |
- setEcg({ ...ecg }); |
|
608 | 614 |
ecgSelectList(); |
609 | 615 |
//closeModal3(); |
610 | 616 |
alert("삭제완료"); |
... | ... | @@ -1712,7 +1718,7 @@ |
1712 | 1718 |
<tbody> |
1713 | 1719 |
{bloodPressureList.bloodPressureList.map((item, idx) => { |
1714 | 1720 |
return ( |
1715 |
- <tr key={idx} onClick={() => { setBloodPressure(item); }}> |
|
1721 |
+ <tr key={idx} onClick={() => {setBloodPressure(item); }}> |
|
1716 | 1722 |
<td data-label="No">{bloodPressureList.bloodPressureListCount - idx - (bloodPressureList.search.currentPage - 1) * bloodPressureList.search.perPage}</td> |
1717 | 1723 |
<td data-label="기록 작성일">{item['blood_pressure_record_date']}</td> |
1718 | 1724 |
<td data-label="최고 혈압">{item['max_blood_pressure']}</td> |
... | ... | @@ -1739,7 +1745,6 @@ |
1739 | 1745 |
</div> |
1740 | 1746 |
</div> |
1741 | 1747 |
</Modal> |
1742 |
- |
|
1743 | 1748 |
</main> |
1744 | 1749 |
); |
1745 | 1750 |
} |
--- client/views/pages/main/Main_government.jsx
+++ client/views/pages/main/Main_government.jsx
... | ... | @@ -372,7 +372,7 @@ |
372 | 372 |
} |
373 | 373 |
</div> |
374 | 374 |
</div> |
375 |
- <div className="content-box combine-left-government2"> |
|
375 |
+ <div className="content-box combine-left-government2" style={{ minHeight: '300px' }}> |
|
376 | 376 |
<div className="flex"> |
377 | 377 |
<Title title={`${cityName} 복약률 평균`} explanation={"해당 지역의 대상자 복약률이 그래프로 보여집니다."} /> |
378 | 378 |
</div> |
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?