최정임 최정임 2023-02-24
230224 최정임 건강관리 진료관리 페이지 수정
@92072bd77e60cdb4ee4476fd7d72238566249333
client/resources/css/common.css
--- client/resources/css/common.css
+++ client/resources/css/common.css
@@ -1,5 +1,6 @@
 
 /* layout 공통 */
+textarea{border: 1px solid #d8d3c7; border-radius: 5px;}
 /* grid */
 
 .main-grid-admin {
@@ -292,6 +293,7 @@
   padding: 0.5rem 1.5rem;
   padding: 1rem;
   margin-right: 1rem;
+  border-radius: 0.5rem;
 }
 
 .btn-small {
@@ -300,7 +302,26 @@
   font-size: 1.5rem;
   font-weight: 800;
   border-radius: 0.5rem;
-  padding: 0.5rem 1.5rem;
+  padding: 0.7rem 2.1rem;
+  margin-right: 1rem;
+}
+.btn-short {
+  width: 90px;
+  border: 0;
+  color: #fff;
+  font-size: 1.5rem;
+  font-weight: 800;
+  border-radius: 0.5rem;
+  padding: 0.7rem 2.1rem;
+  margin-right: 1rem;
+}
+.btn-more-small {
+  border: 0;
+  color: #fff;
+  font-size: 1.5rem;
+  font-weight: 800;
+  border-radius: 0.5rem;
+  padding: 0.3rem 1.3rem;
   margin-right: 1rem;
 }
 
@@ -314,18 +335,39 @@
   background: #7D9D9C;
 }
 
-.beige-btn {
-  background: #e4dccf;
+.brown-btn {
+  background: #733c1d;
+  color: #ffffff;
 }
 
 .gray-btn {
-  background: #cccccc;
+  background: #d8d3c7;
+  color: #733c1d;
+}
+.lightgray-btn {
+  background: #f2f0eb;
+  color: #733c1d;
 }
 
 .red-btn {
-  background: #ff0202;
+  background: #f25430;
+  color: #ffffff;
+}
+input[type='radio'],
+input[type='radio']:checked {
+  width: 0.9rem;
+  height: 0.9rem;
+  border-radius: 100%;
+  margin-right: 1rem;
 }
 
+input[type='radio'] {
+  background-color: #ffffff;
+  border: 2px solid #f25430;
+}
+input[type='radio']:checked {
+  background-color: #f25430;
+}
 
 /* margin */
 .margin-bottom {
@@ -343,6 +385,9 @@
 .margin-bottom10 {
   margin-bottom: 10rem;
 }
+.margin-left{
+  margin-left: 1rem;
+}
 
 hr {
   border-top: 1px solid #d1e4e3;
client/resources/css/layout.css
--- client/resources/css/layout.css
+++ client/resources/css/layout.css
@@ -40,8 +40,7 @@
 .nav{
   position: relative;
   box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);}
-.nav > div > ul{margin-top: 7rem;}
-.logo {
+.logo {  
   padding: 2rem 1rem;
   font-size: large;
   text-align: center;
@@ -53,9 +52,10 @@
 
 
 .sidebar-item>a {
-  font-size: 1.6rem;
-  color: #ffffff;
+  color: #333333;
+  font-weight: bold;
   margin: 0 3rem;
+  padding: 1rem 6.2rem;
   
 }
 
@@ -66,12 +66,14 @@
 .sidebar-title {
   margin: 0 auto;
   width: 150px;
+  padding: 1rem;
 }
 
 .sidebar-title span {
-  font-size: 2rem;
   font-weight: bold;
   color: #333333;
+  
+  font-family:"KoPubDotumLight";
   
 }
 
@@ -83,28 +85,23 @@
   
 }
 nav li{cursor: pointer;}
-nav .sidebar-item{padding: 1.4rem 0 ;}
-.sidebar-item:hover{background: #f25430;}
+.sidebar-item{font-size: 1.8rem;}
+.sidebar-item:hover{background: #f25430; color: #ffffff;}
+.sidebar-item:hover a{color: #ffffff;}
 .sidebar-item:hover span, .sidebar-item:hover .toggle{color: #ffffff;}
-.sidebar-content{background: #7D9D9C;}
-.sidebar-content .sidebar-item:hover{
-  background: #d1e4e3;
-}
-
 .sidebar-content {
   display: none;
   color: #ffffff;
 }
-
+.sidebar-content a{padding: 1rem 0 1rem 6rem;}
 .sidebar-item.open>.sidebar-content {
   height: auto;
   display: block;
 }
 
-.sidebar-content .sidebar-item a {
-  margin-left: 6rem;
+.sidebar-content .sidebar-item:hover  {
+  background: #f1bdb1;
   color: #ffffff;
-  font-size: 1.6rem;
 }
 
 .sidebar-content .sidebar-item:hover a {
@@ -123,6 +120,7 @@
   display: flex;
   align-items: center;
   margin-right: 2rem;
+  cursor: pointer;
 }
 .logout{background: #f26e50;}
 #pages {
@@ -136,14 +134,18 @@
 
 main {
   max-width: 100%;
-  height: 100%;
 }
 
 .content-wrap {
   max-width: 100%;
-  height: 100%;
   padding: 4rem 5rem;
   background-color: #ffffff;
+}
+.userlist{
+  box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);
+  width: 100%;
+  height: 51rem;
+  padding: 4.5rem 2rem;
 }
 
 /* hierarchy menu */
@@ -151,9 +153,9 @@
   box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);
   color: #733c1d;
   overflow-y: auto;
-  max-height: 57rem;
-  width: 46rem;
-  border-radius: 30px;
+  height: 55rem;
+  width: 100%;
+  padding: 1rem 0 0 3rem;
 }
 .hierarchy-menu a { 
   color: #333333;
@@ -178,9 +180,6 @@
   bottom: 27px;
   left: 6px;
   border-left: 1px dashed #373E4B;
-}
-.hierarchy-menu > ul {
-  padding: 15px 0 10px 25px;
 }
 .hierarchy-menu > ul ul {
   padding-left: 16px;
@@ -222,18 +221,16 @@
 /* Links */
 .hierarchy-menu ul .max-agency{
   margin-left: 0px;
-  width: 37%;
 }
 .hierarchy-menu ul .top-agency{
   margin-left: 49px;
-  width: 39%;
 }
 .hierarchy-menu .low-agency{
   margin-left: 50px;
 }
 .hierarchy-menu ul a {
   display: block;
-  padding: 6px 0;
+  padding: 6px 5rem;
   height: 44px;
   position: relative;
   color: #333333;
@@ -250,10 +247,10 @@
 .hierarchy-menu li.sub-nav > a:before {
   position: absolute;
   left: 4px;
-  top: 14px;
+  top: 19px;
   content: '';
-  width: 5px;
-  height: 5px;
+  width: 7px;
+  height: 7px;
   border-bottom: 1px solid #333333;
   border-right: 1px solid #333333;
   -ms-transform: rotate(-45deg);
client/resources/css/main.css
--- client/resources/css/main.css
+++ client/resources/css/main.css
@@ -16,6 +16,8 @@
   font-weight: 900;
   background-color: #18924e;
 }
+
+
 /* Q&A */
 .title{text-decoration: underline; cursor: pointer;}
 .question-select input{width: 3%;}
@@ -48,130 +50,7 @@
   border-left: 20px solid #7D9D9C;
   margin: 0 1rem 0 3rem;
 }
-/* hierarchy menu */
-.hierarchy-menu a { 
-  color: #333333;
-  text-decoration: none;
-}
 
-.category a span{
-  font-size: 1.6rem;
-  padding-left: 20px;
-}
-
-/* List */
-.hierarchy-menu ul {
-  list-style: none;
-  margin: 0;
-  padding: 10px 0 0 0;
-  position: relative;
-}
-.hierarchy-menu ul ul:before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 27px;
-  left: 6px;
-  border-left: 1px dashed #373E4B;
-}
-.hierarchy-menu > ul {
-  padding: 15px 0 10px 25px;
-}
-.hierarchy-menu > ul ul {
-  padding-left: 16px;
-}
-
-/* List items */
-.hierarchy-menu ul li {
-  display: block;
-  position: relative;
-}
-.hierarchy-menu > ul ul li:before {
-  content: '';
-  display: block;
-  height: 0px;
-  width: 50px;
-  border-bottom: 1px solid #7A7F87;
-  position: absolute;
-  left: -10px;
-  top: 16px;
-}
-.hierarchy-menu > ul ul li:after {
-  content: '';
-  display: block;
-  height: 43px;
-  width: 0;
-  border-left: 1px solid #7A7F87;
-  position: absolute;
-  left: -10px;
-  top: -27px;
-}
-.hierarchy-menu > ul ul li.group-lvl:before {
-  width: 50px;
-}
-.hierarchy-menu > ul ul li:first-child:after { 
-  height: 28px;
-  top: -12px;
-}
-
-/* Links */
-.category ul .max-agency{
-  margin-left: 0px;
-  width: 50%;
-}
-.category ul .top-agency{
-  margin-left: 49px;
-  width: 50%;
-}
-.category .low-agency{
-  margin-left: 87px;
-}
-.category .low-agency span{
-  padding-left: 49px;
-}
-.hierarchy-menu ul a {
-  display: block;
-  padding: 6px 0;
-  height: 44px;
-  position: relative;
-  color: #333333;
-  transition: 100ms;
-}
-.hierarchy-menu ul a:hover {
-  color: #7e9d9c;
-}
-.hierarchy-menu ul a.active {
-  color: #333333;
-  font-weight: bold;
-}
-
-.category li.sub-nav > a:before {
-  position: absolute;
-  left: 0px;
-  top: 14px;
-  content: '';
-  width: 5px;
-  height: 5px;
-  border-bottom: 1px solid #333333;
-  border-right: 1px solid #333333;
-  -ms-transform: rotate(-45deg);
-  -webkit-transform: rotate(-45deg);
-  transform: rotate(-45deg);
-}
-.hierarchy-menu li.sub-nav.open > a:before {
-  -ms-transform: rotate(45deg);
-  -webkit-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-.hierarchy-menu li.sub-nav.open > a {
-  color: #333333;
-}
-.hierarchy-menu li.sub-nav > ul {
-  display: block;
-}
-.hierarchy-menu li.sub-nav.open > ul {
-  display: block;
-}
 
 
 /* -----------------------------------------------지자체 */
@@ -639,7 +518,7 @@
   padding: 1rem;
   line-height: 2rem;
 }
-
+.join-inner select{padding: 1rem;}
 .join-inner #id {
   max-width: 65%;
   margin-right: 1rem;
@@ -653,16 +532,15 @@
 }
 
 /* 검색창 */
-.searchselect{width: 30%;}
-.searchselect input{width: 20%;}
-.searchselect label{width: 100%;}
+.searchselect{width: 25%;}
+.searchselect label{width: 100%; margin-right: 3rem;}
 .mobile-area-wrap {
   display: none;
 }
 
 .search-group {
+  width: 100%;
   margin-bottom: 2rem;
-  box-shadow: 1px 1px 5px 1px rgba(209, 228, 227);
 }
 
 .search-group .btn-box {
@@ -713,7 +591,7 @@
 .select-area {
   width: 100%;
   padding: 1rem;
-  background-color: #d1e4e3;
+  background-color: #f1bdb2;
 }
 
 .search-area {
@@ -814,7 +692,7 @@
   padding: 0 4rem 0 1rem;
 
 }
-
+.senior-insert select{padding: 1rem;}
 .senior-insert tr:nth-child(2) .gender {
   padding: 2rem 1rem;
 }
@@ -971,7 +849,7 @@
 }
 
 /* 장비등록 */
-
+.select-agency{width: 59%; margin: 0 auto;}
 .user-list{
   background-color: #eeeeee;
   height: 57.8vh;
@@ -987,6 +865,7 @@
   left: 0;
   z-index: 99;
   background-color: rgba(0, 0, 0, 0.6);
+  color: #733c1d;
 }
 
 .modal .modal-inner {
@@ -1000,8 +879,8 @@
 }
 
 .modal .modal-inner .modal-header {
-  background-color: #f1f1f1;
-  font-size: 1.8rem;
+  background-color: #d8d3c7;
+  font-size: 2.5rem;
   font-weight: bold;
   padding: 2rem;
 }
@@ -1009,10 +888,11 @@
 .modal-main {
   padding: 2rem;
 }
-
+.modal-main table{border: 1px solid #d8d3c7;}
 .modal-main table th,
 .modal-main table td {
   text-align: center;
+  font-size: 1.8rem;
 }
 
 .modal.openModal {
@@ -1029,38 +909,31 @@
 
 .tab-menu li {
   padding: 1rem 2rem;
-  background-color: #f8f8f8;
+  margin-right: 0.2rem;
+  background-color: #f2f0eb;
+  color: #733c1d;  
   border-radius: 0.5rem 0.5rem 0 0;
   font-size: 1.6rem;
+  font-weight: bold;
   text-align: center;
-  border: 1px solid #eeeeee;
+  box-shadow: 3px -2px 5px -2px rgb(0 0 0 / 20%);
 }
 
 .tab-menu li.active {
-  font-weight: bold;
-  background-color: #242d2e;
+  background-color: #f25430;
   color: #ffffff;
 }
 
 .search-management select {
   width: 15%;
+  height: 3rem;
 }
 
 .search-management input {
   width: 20%;
+  height: 3rem;
   margin-right: 1rem;
 }
-
-.tab-content table th {
-  background-color: #ffffff;
-}
-
-.tab-content table button {
-  background-color: #ffffff;
-  border: 1px solid #7D9D9C;
-  color: #7D9D9C;
-}
-
 .tab-container>div>div:nth-child(2) {
   margin: 1rem 0;
 }
client/resources/css/reset.css
--- client/resources/css/reset.css
+++ client/resources/css/reset.css
@@ -1,11 +1,15 @@
+@font-face {
+  font-family: "KoPubDotumLight";
+  src: url(../files/font/KoPubDotumLight_0.ttf);
+}
 
-
-
+:root{
+  --font-KoPubDotumLight:"KoPubDotumLight"
+}
 * {
   margin: 0;
   padding: 0;
   box-sizing: border-box;
-  font-family:"AuctionGothic_Medium";
 }
 
 html {
@@ -40,16 +44,16 @@
 table {
   width: 100%;
   border-collapse: collapse;
-  border: 1px solid #e4dccf;
   font-family:"AuctionGothic_Medium";
 }
-th{
-  padding: 0.5rem;
+thead{
   font-weight: bold;
-  background: #f0ebe3;
+  background: #d8d3c7;
   font-size: 1.5rem;
   text-align: center;
 }
+thead tr{border-radius: 10px;}
+th{background-color: #d8d3c7; padding: 0.5rem;}
 
 td {
   padding: 0.5rem;
@@ -76,7 +80,7 @@
   width: 100%;
   border-radius: 0.5rem;
   padding: 1rem;
-  border: 1px solid #eeeeee;
+  border: 1px solid #d8d3c7;
 }
 
 input[type="button"]{
@@ -88,10 +92,9 @@
 
 select{
   width: 32%;
-  padding: 1rem;
   border-radius: 0.5rem;
-  margin-right: 1.1rem;
-  border: 1px solid #eeeeee;
+  margin-right: 1rem;
+  border: 1px solid #d8d3c7;
 }
 
 select:last-child{
client/views/component/Category.jsx
--- client/views/component/Category.jsx
+++ client/views/component/Category.jsx
@@ -1,10 +1,12 @@
 import React, { useState } from "react";
+import Button from "./Button.jsx";
 
 function Menu({ className, children, href, title }) {
   if (!children) {
     return <li className="venue-lvl">
       <a href={href ?? '#'}>
-        <span>{title}</span>
+        <span>{title}</span>      
+        <Button className={"btn-more-small gray-btn margin-left"} btnName={"삭제"} />  
       </a>
     </li>
   }
@@ -16,6 +18,7 @@
   return <li className={className}>
     <a href={href ?? '#'} onClick={() => setOpend(open ? '' : 'open')} className="max-agency">
       <span>{title}</span>
+      <Button className={"btn-more-small red-btn margin-left"} btnName={"추가"} />
     </a>
     {open && <ul id="venue-scope-options">
       {children}
@@ -33,6 +36,7 @@
             <li className="group-lvl sub-nav open">
               <a className="top-agency" href="#">
                 <span>지자체</span>
+                <Button className={"btn-more-small brown-btn margin-left"} btnName={"추가"} />
               </a>
               <ul id="venue-scope-options" className="low-agency">
                 <Menu href="#" title="보호기관1" />
@@ -43,6 +47,7 @@
             <li class="group-lvl sub-nav open">
               <a href="#" className="active top-agency">
                 <span>관리 병원</span>
+                <Button className={"btn-more-small brown-btn margin-left"} btnName={"추가"} />
               </a>
               <ul className="low-agency">
                 <Menu href="#" title="병원1" />
 
client/views/component/Checkbox.jsx (added)
+++ client/views/component/Checkbox.jsx
@@ -0,0 +1,45 @@
+import React from 'react'
+import styled from 'styled-components'
+
+export default function ContentTitle({contentTitle, explanation}) {
+  return (
+    <div className='flex-start'>
+      <ContentTitleStyled>{contentTitle}</ContentTitleStyled>
+      <Explanation>{explanation}</Explanation>
+    </div>
+  )
+}
+
+const ContentTitleStyled = styled.p`
+  font-size: 4rem;
+  font-weight: bold;
+  margin: 0 3rem 2rem 0;
+  color: #733c1d;
+  /* &::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: -11px;
+    height: 1px;
+    width: 100%;
+    max-width: 100%;
+    background-color: #d1e4e3;
+  }  
+  &::before {
+    content: "";
+    position: absolute;
+    z-index: 10;
+    left: 0;
+    bottom: -15px;
+    height: 8px;
+    width: 1rem;
+    margin-right: 1rem;
+    background-color: #7D9D9C;
+  } */
+  
+`
+
+const Explanation = styled.p`
+  font-size: 2.6rem;
+  color: #733c1d;
+`;(No newline at end of file)
client/views/component/DetailSearch.jsx
--- client/views/component/DetailSearch.jsx
+++ client/views/component/DetailSearch.jsx
@@ -195,9 +195,9 @@
           <table>
             <tbody>
               <tr>
-                <th>검색</th>
+                <th>조회 구분</th>
                 <td colSpan={3}>
-                  <div className="flex">
+                  <div className="flex-start">
                     <select name="" id="">
                       <option value="">사용자관리번호</option>
                       <option value="">사용자 이름</option>
@@ -208,7 +208,7 @@
                 </td>
               </tr>
               <tr>
-                <th>지역</th>
+                <th>조회 지역</th>
                 <td>
                   <div className="flex-start">
                     <select name="" id="">
@@ -473,8 +473,8 @@
               );
             })}
             <div className="btn-box flex-center">
-              <Button className={"btn-large gray-btn"} btnName={"초기화"} />
-              <Button className={"btn-large green-btn"} btnName={"조회"} />
+              <Button className={"btn-large lightgray-btn"} btnName={"초기화"} />
+              <Button className={"btn-large red-btn"} btnName={"조회"} />
             </div>
           </ul>
         </div>
 
client/views/component/DetailTitle.jsx (added)
+++ client/views/component/DetailTitle.jsx
@@ -0,0 +1,40 @@
+import React from 'react'
+import styled from 'styled-components'
+
+export default function DetailTitle({contentTitle, }) {
+  return (
+    <div className='flex-start'>
+      <ContentTitleStyled>{contentTitle}</ContentTitleStyled>
+    </div>
+  )
+}
+
+const ContentTitleStyled = styled.p`
+  position: relative;
+  width: 100%;
+  font-size: 1.6rem;
+  font-weight: bold;
+  color: #733c1d;
+  &::after {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: -11.5px;
+    height: 1px;
+    width: 100%;
+    max-width: 100%;
+    background-color: #f25430;
+  }  
+  &::before {
+    content: "";
+    position: absolute;
+    z-index: 10;
+    left: 0;
+    bottom: -15px;
+    height: 8px;
+    width: 8px;
+    margin-right: 1rem;
+    background-color: #f25430;
+  }
+  
+`
 
client/views/component/Modal_Blood.jsx (added)
+++ client/views/component/Modal_Blood.jsx
@@ -0,0 +1,83 @@
+import React from "react";
+import Button from "./Button.jsx";
+import Table from "./Table.jsx";
+
+export default function Modal({open, close, }) {
+  const thead1 = [
+    "No",
+    "측정 일자",
+    "최고 혈압",
+    "최저 혈압",
+    "맥박수",
+    "작성자",
+  ];
+  const key1 = ["No", "date", "high","low", "pulse", "writer"];
+  const content1 = [
+    {
+      No: 1,
+      date: "2023-01-25",
+      high: "130",
+      low: "90",
+      pulse: "60",
+      writer: "정간호",
+    },
+  ];
+  return (
+    <div class={open ? "openModal modal" : "modal"}>
+      {open ? (
+        <div className="modal-inner">
+          <div className="modal-header flex">
+            혈압측정
+            <Button className={"close"} onClick={close} btnName={"X"} />
+          </div>
+          <div className="modal-main"><div className="board-wrap">        
+          <div>
+          <table className="margin-bottom2">
+            <tr>
+              <th>대상자명</th>
+              <td className="flex-start">
+                <input type="text" placeholder="자동입력"/>
+              </td>              
+            </tr>
+            <tr>
+              <th>측정일자</th>
+              <td className="flex-start">
+                <input type="text" placeholder="자동입력"/>
+              </td>              
+            </tr>
+            <tr>
+              <th>최고혈압</th>
+              <td className="flex-start">
+                <input type="text" />
+              </td>              
+            </tr>
+            <tr>
+              <th>최저혈압</th>
+              <td className="flex-start">
+                <input type="text" />
+              </td>              
+            </tr>
+            <tr>
+              <th>맥박수</th>
+              <td className="flex-start">
+                <input type="text" />
+              </td>              
+            </tr>
+            
+          </table>
+          <div className="btn-wrap flex-center margin-bottom5">
+          <Button className={"btn-small red-btn"} btnName={"저장"} />
+            </div>
+          </div>
+          <Table
+              className={"caregiver-user "}
+              head={thead1}
+              contents={content1}
+              contentKey={key1}
+            />
+        </div></div>
+        </div>
+      ) : null}
+    </div>
+  );
+}
 
client/views/component/Modal_ECG.jsx (added)
+++ client/views/component/Modal_ECG.jsx
@@ -0,0 +1,74 @@
+import React from "react";
+import Button from "./Button.jsx";
+import Table from "./Table.jsx";
+
+export default function Modal({ open, close, }) {
+  const thead1 = [
+    "No",
+    "측정일자",
+    "측정파일",
+    "등록자",
+  ];
+  const key1 = ["No", "date", "file","writer",];
+  const content1 = [
+    {
+      No: 1,
+      date: "2023-01-25",
+      file: ( <a href="" download="테스트">다운로드</a>),
+      writer: "정간호",
+    },
+  ];
+  return (
+    <div class={open ? "openModal modal" : "modal"}>
+      {open ? (
+        <div className="modal-inner">
+          <div className="modal-header flex">
+            심전도 등록
+            <Button className={"close"} onClick={close} btnName={"X"} />
+          </div>
+          <div className="modal-main"><div className="board-wrap">        
+          <div>
+          <table className="margin-bottom2">
+            <tr>
+              <th>대상자명</th>
+              <td className="flex-start">
+                <input type="text" placeholder="자동입력"/>
+              </td>              
+            </tr>
+            <tr>
+              <th>측정일자</th>
+              <td className="flex-start">
+                <input type="text" placeholder="자동입력"/>
+              </td>              
+            </tr>
+            <tr>
+              <th>측정파일</th>
+              <td className="flex-start">
+              <input type="file"></input>
+              </td>              
+            </tr>
+            <tr>
+              <th>등록자</th>
+              <td className="flex-start">
+              <input type="text" placeholder="자동입력"/>
+              </td>              
+            </tr>
+            
+            
+          </table>
+          <div className="btn-wrap flex-center margin-bottom5">
+          <Button className={"btn-small red-btn"} btnName={"저장"} />
+            </div>
+          </div>
+          <Table
+              className={"caregiver-user "}
+              head={thead1}
+              contents={content1}
+              contentKey={key1}
+            />
+        </div></div>
+        </div>
+      ) : null}
+    </div>
+  );
+}
 
client/views/component/Modal_Questionnaire.jsx (added)
+++ client/views/component/Modal_Questionnaire.jsx
@@ -0,0 +1,82 @@
+import React from "react";
+import Button from "./Button.jsx";
+
+export default function Modal_Questionnaire({ open, close, }) {
+
+  return (
+    <div class={open ? "openModal modal" : "modal"}>
+      {open ? (
+        <div className="modal-inner">
+          <div className="modal-header flex">
+            문진표 작성
+            <Button className={"close"} onClick={close} btnName={"X"} />
+          </div>
+          <div className="modal-main"><div className="board-wrap">        
+          <div>
+          <table className="margin-bottom2  questionnaire-table">
+            <tr>
+              <th>흡연을 하십니까?</th>
+              <td className="flex-start">
+              <input type="radio" />
+                  <label for="gender">예</label>
+              <input type="radio" />
+                  <label for="gender">아니요</label>
+              </td>              
+            </tr>
+            <tr>
+            <th>음주를 하십니까?</th>
+              <td className="flex-start">
+              <input type="radio" />
+                  <label for="gender">예</label>
+              <input type="radio" />
+                  <label for="gender">아니요</label>
+              </td>              
+            </tr>
+            <tr>
+            <th>일주일에 운동을 몇회 하십니까?</th>
+              <td className="flex-start">
+              <input type="radio" />
+                  <label for="gender">안함</label>
+              <input type="radio" />
+                  <label for="gender">3회 미만</label>
+              <input type="radio" />
+                  <label for="gender">3회 이상</label>
+              <input type="radio" />
+                  <label for="gender">매일</label>
+              </td>
+            </tr>
+            <tr>
+            <th>최근 3개월 동안 갑작스런 체중 변화가 있었습니까?</th>
+              <td className="flex-start">
+              <input type="radio" />
+                  <label for="gender">예 - 증가</label>
+              <input type="radio" />
+                  <label for="gender">예 - 감소</label>
+              <input type="radio" />
+                  <label for="gender">아니요</label>
+              </td>   
+            </tr>
+            <tr>
+            <th>현재 복용중인 약이 있으면 체크를 해주세요.</th>
+              <td className="flex-start">
+              <input type="checkbox" />
+                  <label for="gender">없음</label>
+              <input type="checkbox" />
+                  <label for="gender">아스피린(항혈소판제)</label>
+              <input type="checkbox" />
+                  <label for="gender">당뇨약</label>
+              <input type="checkbox" />
+                  <label for="gender">고혈압약</label>
+              <input type="checkbox" />
+                  <label for="gender">기타</label><input type="text" />
+              </td>              
+            </tr>
+          </table>
+          </div>
+          <div className="flex-center"><Button className={"btn-small red-btn"} btnName={"저장"} /></div >
+        </div></div>
+        </div>
+      ) : null}
+    </div>
+  );
+}
client/views/component/SubTitle.jsx
--- client/views/component/SubTitle.jsx
+++ client/views/component/SubTitle.jsx
@@ -18,7 +18,7 @@
   color: #733c1d;
 `;
 const Explanation = styled.p`
-  font-size: 1.8rem;
+  font-size: 1.5rem;
   padding: 0.5rem;
   color: ${(color) => color ? color : "#733c1d"};
   &::before {
client/views/layout/Header.jsx
--- client/views/layout/Header.jsx
+++ client/views/layout/Header.jsx
@@ -2,9 +2,10 @@
 import MenuIcon from "@mui/icons-material/Menu";
 import Weather from "../pages/main/Weather.jsx";
 import PersonIcon from "@mui/icons-material/Person";
+import { useNavigate } from "react-router";
 
 function Header({ title }) {
-
+  const navigate = useNavigate();
   const [headerData, setHeaderData] = React.useState(0);
 
   return (
@@ -16,9 +17,9 @@
             <div className="usericon"><PersonIcon sx={{ width:48, height:48,}} /></div>
             <p className="header-info-id">admin1</p>
             <div className="bottom-section flex">
-              <div className="info-id" onClick={() => {
+              <div className="info-id" ><span onClick={() => {
                 navigate("/Join");
-              }}><span>계정추가</span></div>
+              }}>계정추가</span></div>
               <div className="logout"><span>로그아웃</span></div>
             </div>
           </div>
client/views/layout/Menu.jsx
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
@@ -14,7 +14,7 @@
       onClick={() => (menuToggle ? setMenuToggle(false) : setMenuToggle(true))}
     >
       <h1 className="logo"><img src={logo} alt="" /></h1>
-      <div className="flex-align-column" style={{ height: `calc(100% - 72px)` }}>
+      <div className="flex-align-column" style={{ marginTop: `3rem` }}>
         <ul>
           {items.map((item, index) => (
             <SidebarItem key={index} item={item} />
client/views/pages/App.jsx
--- client/views/pages/App.jsx
+++ client/views/pages/App.jsx
@@ -26,8 +26,8 @@
   };
 
 
-  const menuItems = AllApp.menuItems;  //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp 
-  const AppRoute = AllApp.AppRoute;
+  const menuItems = GovernmentApp.menuItems;  //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp 
+  const AppRoute = GovernmentApp.AppRoute;
 
 
   const { title } = menuItems.find(
client/views/pages/AppRoute.jsx
--- client/views/pages/AppRoute.jsx
+++ client/views/pages/AppRoute.jsx
@@ -24,14 +24,10 @@
 import Main from "./main/Main.jsx";
 import SeniorInsert from "./senior_management/SeniorInsert.jsx";
 import SeniorSelectOne from "./senior_management/SeniorSelectOne.jsx";
-import MedicineCareSelect from "./healthcare/medicinecare/MedicineCareSelect.jsx";
 import MedicineCareSelectOne from "./healthcare/medicinecare/MedicineCareSelectOne.jsx";
-import TemperatureManagementSelect from "./healthcare/temperature/TemperatureManagementSelect.jsx";
 import TemperatureManagementSelectOne from "./healthcare/temperature/TemperatureManagementSelectOne.jsx";
-import Questionnaire from "./healthcare/Questionnaire.jsx";
 import MedicineStatistics from "./healthcare/statistics/MedicineStatistics.jsx";
 import GuardianStatistics from "./healthcare/statistics/GuardianStatistics.jsx";
-import VisitSelect from "./visit/visit/VisitSelect.jsx";
 import VisitInsert from "./visit/visit/VisitInsert.jsx";
 import VisitSelectOne from "./visit/visit/VisitSelectOne.jsx";
 import EquipmentRentalInsert from "./equipment/EquipmentRentalInsert.jsx";
@@ -52,10 +48,10 @@
 import AgencyInsert from "./user_management/AgencyInsert.jsx";
 import AgencySelect from "./user_management/AgencySelect.jsx";
 import ProtectorSelect from "./user_management/ProtectorSelect.jsx";
-import BloodSelect from "./healthcare/BloodSelect.jsx";
-import ECGSelect from "./healthcare/ECGSelect.jsx";
 import QuestionSelect from "./callcenter/QuestionSelect.jsx";
 import Join from "./join/Join.jsx";
+import Healthcare from "./healthcare/Healthcare.jsx"
+import Medicalcare from "./healthcare/Medicalcare.jsx"
 
 const AllAppMenuItems = [
   {
@@ -63,63 +59,36 @@
     path: "/Main",
     childrens: [
       {
-        title: "Home(올잇메디)",
+        title: "Home",
         path: "/Main",
-        icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+        icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
       },
       {
         title: "사용자 관리",
         path: "/UserAuthoriySelect",
         icon: (
-          <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <PersonIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
       },
       {
         title: "건강관리",
-        path: "/QandASelect",
+        path: "/Healthcare",
         icon: (
-          <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <Diversity1Icon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "복약 관리",
-            path: "/MedicineCareSelect",
-          },
-          {
-            title: "댁내 온도 관리",
-            path: "/TemperatureManagementSelect",
-          },
-          {
-            title: "방문 관리",
-            path: "/VisitSelect",
-          },
-        ],
       },
       {
         title: "진료 관리",
+        path:"/Medicalcare",
         icon: (
-          <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <LocalHospitalIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "문진표 관리",
-            path: "/Questionnaire",
-          },
-          {
-            title: "심전도 관리",
-            path: "/ECGSelect",
-          },
-          {
-            title: "혈압 관리",
-            path: "/BloodSelect",
-          },
-        ]
       },
       {
         title: "장비 관리",
         icon: (
           <ConstructionIcon
-            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+            sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
           />
         ),
         childrens: [
@@ -142,12 +111,12 @@
       {
         title: "Home",
         path: "/Main_government",
-        icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+        icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
       },
       {
         title: "기관 관리",
         icon: (
-          <ApartmentIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <ApartmentIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
         childrens: [
           {
@@ -162,58 +131,31 @@
       },
       {
         title: "건강 관리",
-        prefix: "/Medicine",
+        path: "/Healthcare",
         icon: (
-          <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <Diversity1Icon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "복약 관리",
-            path: "/MedicineCareSelect",
-          },
-          {
-            title: "댁내 온도 관리",
-            path: "/TemperatureManagementSelect",
-          },
-          {
-            title: "방문 관리",
-            path: "/VisitSelect",
-          },
-        ]
       },
       {
         title: "진료 관리",
+        path:"/Medicalcare",
         icon: (
-          <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <LocalHospitalIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "문진표 관리",
-            path: "/Questionnaire",
-          },
-          {
-            title: "심전도 관리",
-            path: "/ECGSelect",
-          },
-          {
-            title: "혈압 관리",
-            path: "/BloodSelect",
-          },
-        ]
       },
       {
         title: "문의 현황 관리",
         path: "/QandASelect",
         icon: (
           <SpeakerPhoneIcon
-            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+            sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
           />
         ),
       },
       {
         title: "설정 관리",
         icon: (
-          <SettingsIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <SettingsIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
         childrens: [
           {
@@ -235,59 +177,33 @@
       {
         title: "Home",
         path: "/Main_agency",
-        icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+        icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
       },
       {
         title: "대상자 관리",
         path: "/UserAuthoriySelect_agency",
         icon: (
-          <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <PersonIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
       },
       {
         title: "건강 관리",
+        path:"/Healthcare",
         icon: (
-          <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <Diversity1Icon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "복약 관리",
-            path: "/MedicineCareSelect",
-          },
-          {
-            title: "댁내 온도 관리",
-            path: "/TemperatureManagementSelect",
-          },
-          {
-            title: "방문 관리",
-            path: "/VisitSelect",
-          },
-        ]
       },
       {
         title: "진료 관리",
+        path:"/Medicalcare",
         icon: (
-          <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <LocalHospitalIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
-        childrens: [
-          {
-            title: "문진표 관리",
-            path: "/Questionnaire",
-          },
-          {
-            title: "심전도 관리",
-            path: "/ECGSelect",
-          },
-          {
-            title: "혈압 관리",
-            path: "/BloodSelect",
-          },
-        ]
       },
       {
         title: "장비 관리",
         icon: (
-          <ConstructionIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+          <ConstructionIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
         ),
         childrens: [
           {
@@ -305,7 +221,7 @@
         path: "/QuestionSelect",
         icon: (
           <SpeakerPhoneIcon
-            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+            sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
           />
         ),
       },
@@ -317,19 +233,19 @@
       {
         title: "Home",
         path: "/Main_guardian",
-        icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+        icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
       },
       {
         title: "그래프로 보기",
         path: "/GuardianStatistics",
-        icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+        icon: <EqualizerIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
       },
       {
         title: "Q&A",
         path: "/QuestionSelect",
         icon: (
           <SpeakerPhoneIcon
-            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+            sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
           />
         ),
       },
@@ -340,6 +256,8 @@
 function AllAppRoute() {
   return (
     <Routes>
+      <Route path="/Medicalcare" element={<Medicalcare />}></Route>
+      <Route path="/Healthcare" element={<Healthcare />}></Route>
       <Route path="/QuestionConfirm" element={<QuestionConfirm />}></Route>
       <Route path="/QuestionInsert" element={<QuestionInsert />}></Route>
       <Route path="/GuardianStatistics" element={<GuardianStatistics />}></Route>
@@ -347,32 +265,20 @@
       <Route path="/QuestionSelect" element={<QuestionSelect />}></Route>
       <Route path="/Join" element={<Join />}></Route>
       <Route path="/QuestionSelect" element={<QuestionSelect />}></Route>
-      <Route path="/ECGSelect" element={<ECGSelect />}></Route>
-      <Route path="/BloodSelect" element={<BloodSelect />}></Route>
       <Route path="/Main_agency" element={<Main_agency />}></Route>
       <Route path="/UserAuthoriySelect_agency" element={<UserAuthoriySelect_agency />}></Route>
       <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
-      <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>
-      <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
+      <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>      
       <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
       ></Route>
       <Route
         path="/TemperatureManagementSelectOne"
         element={<TemperatureManagementSelectOne />}
       ></Route>
       <Route path="/VisitInsert" element={<VisitInsert />}></Route>
-      <Route path="/VisitSelect" element={<VisitSelect />}></Route>
       <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>
-      <Route path="/Questionnaire" element={<Questionnaire />}></Route>
       <Route
         path="/EquipmentRentalInsert"
         element={<EquipmentRentalInsert />}
@@ -397,22 +303,12 @@
         path="/QandAConfirm"
         element={<QandAConfirm />}
       ></Route>
-      <Route path="/ECGSelect" element={<ECGSelect />}></Route>
-      <Route path="/BloodSelect" element={<BloodSelect />}></Route>
       <Route path="/Main_government" element={<Main_government />}></Route>
       <Route path="/AgencySelect" element={<AgencySelect />}></Route>
       <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>
       <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
-      <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
       ></Route>
       <Route
         path="/TemperatureManagementSelectOne"
@@ -423,7 +319,6 @@
         element={<MedicineStatistics />}
       ></Route>
       <Route path="/VisitInsert" element={<VisitInsert />}></Route>
-      <Route path="/VisitSelect" element={<VisitSelect />}></Route>
       <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>
       <Route
         path="/UserAuthoriySelect"
@@ -434,7 +329,6 @@
       <Route path="/QandASelect" element={<QandASelect />}></Route>
       <Route path="/QandAConfirm" element={<QandAConfirm />}></Route>
       <Route path="/QandAInsert" element={<QandAInsert />}></Route>
-      <Route path="/Questionnaire" element={<Questionnaire />}></Route>
       <Route path="/ProtectorSelect" element={<ProtectorSelect />}></Route>
       <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
       <Route path="/AgencyInsert" element={<AgencyInsert />}></Route>
@@ -458,32 +352,16 @@
         element={<EquipmentManagementSelectOne />}
       ></Route>
       <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
-      <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
       ></Route>
       <Route
         path="/TemperatureManagementSelectOne"
         element={<TemperatureManagementSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
-      ></Route>
-      <Route
-        path="/VisitSelect"
-        element={<VisitSelect />}
-      ></Route>
+      ></Route>      
       <Route
         path="/VisitSelectOne"
         element={<VisitSelectOne />}
-      ></Route>
-      <Route
-        path="/Questionnaire"
-        element={<Questionnaire />}
       ></Route>
       <Route path="/QandAInsert" element={<QandAInsert />}></Route>
       <Route path="/QandASelect" element={<QandASelect />}></Route>
@@ -498,63 +376,36 @@
 
 const AdminAppMenuItems = [
   {
-    title: "Home(올잇메디)",
+    title: "Home",
     path: "/Main",
-    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+    icon: <HouseIcon sx={{ fontSize: 20, marginRight: 1 }} />,
   },
   {
     title: "사용자 관리",
     path: "/UserAuthoriySelect",
     icon: (
-      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <PersonIcon sx={{ fontSize: 20, marginRight: 1 }} />
     ),
   },
   {
-    title: "건강관리",
-    path: "/QandASelect",
+    title: "건강 관리",
+    path:"/Healthcare",
     icon: (
-      <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <Diversity1Icon sx={{ fontSize: 20, marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "복약 관리",
-        path: "/MedicineCareSelect",
-      },
-      {
-        title: "댁내 온도 관리",
-        path: "/TemperatureManagementSelect",
-      },
-      {
-        title: "방문 관리",
-        path: "/VisitSelect",
-      },
-    ],
   },
   {
     title: "진료 관리",
+    path:"/Medicalcare",
     icon: (
-      <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <LocalHospitalIcon sx={{ fontSize: 20, marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "문진표 관리",
-        path: "/Questionnaire",
-      },
-      {
-        title: "심전도 관리",
-        path: "/ECGSelect",
-      },
-      {
-        title: "혈압 관리",
-        path: "/BloodSelect",
-      },
-    ]
   },
   {
     title: "장비 관리",
     icon: (
       <ConstructionIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+        sx={{ fontSize: 20, marginRight: 1 }}
       />
     ),
     childrens: [
@@ -573,6 +424,8 @@
 function AdminAppRoute() {
   return (
     <Routes>
+      <Route path="/Medicalcare" element={<Medicalcare />}></Route>
+      <Route path="/Healthcare" element={<Healthcare />}></Route>
       <Route path="/Test" element={<Test />}></Route>
       <Route path="/Main" element={<Main />}></Route>
       <Route
@@ -592,32 +445,16 @@
         element={<EquipmentManagementSelectOne />}
       ></Route>
       <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
-      <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
       ></Route>
       <Route
         path="/TemperatureManagementSelectOne"
         element={<TemperatureManagementSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
-      ></Route>
-      <Route
-        path="/VisitSelect"
-        element={<VisitSelect />}
-      ></Route>
+      ></Route>      
       <Route
         path="/VisitSelectOne"
         element={<VisitSelectOne />}
-      ></Route>
-      <Route
-        path="/Questionnaire"
-        element={<Questionnaire />}
       ></Route>
       <Route path="/QandAInsert" element={<QandAInsert />}></Route>
       <Route path="/QandASelect" element={<QandASelect />}></Route>
@@ -633,12 +470,12 @@
   {
     title: "Home",
     path: "/Main_government",
-    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+    icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
   },
   {
     title: "기관 관리",
     icon: (
-      <ApartmentIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <ApartmentIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
     childrens: [
       {
@@ -653,58 +490,31 @@
   },
   {
     title: "건강 관리",
-    prefix: "/Medicine",
+    path:"/Healthcare",
     icon: (
-      <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <Diversity1Icon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "복약 관리",
-        path: "/MedicineCareSelect",
-      },
-      {
-        title: "댁내 온도 관리",
-        path: "/TemperatureManagementSelect",
-      },
-      {
-        title: "방문 관리",
-        path: "/VisitSelect",
-      },
-    ]
   },
   {
     title: "진료 관리",
+    path:"/Medicalcare",
     icon: (
-      <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <LocalHospitalIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "문진표 관리",
-        path: "/Questionnaire",
-      },
-      {
-        title: "심전도 관리",
-        path: "/ECGSelect",
-      },
-      {
-        title: "혈압 관리",
-        path: "/BloodSelect",
-      },
-    ]
   },
   {
     title: "문의 현황 관리",
     path: "/QandASelect",
     icon: (
       <SpeakerPhoneIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+        sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
       />
     ),
   },
   {
     title: "설정 관리",
     icon: (
-      <SettingsIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <SettingsIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
     childrens: [
       {
@@ -721,23 +531,15 @@
 function GovernmentAppRoute() {
   return (
     <Routes>
-      <Route path="/ECGSelect" element={<ECGSelect />}></Route>
-      <Route path="/BloodSelect" element={<BloodSelect />}></Route>
+      <Route path="/Medicalcare" element={<Medicalcare />}></Route>
+      <Route path="/Healthcare" element={<Healthcare />}></Route>
       <Route path="/Main_government" element={<Main_government />}></Route>
       <Route path="/AgencySelect" element={<AgencySelect />}></Route>
-      <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>
-      <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
+      <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>      
       <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
-      ></Route>
+      ></Route>      
       <Route
         path="/TemperatureManagementSelectOne"
         element={<TemperatureManagementSelectOne />}
@@ -747,7 +549,6 @@
         element={<MedicineStatistics />}
       ></Route>
       <Route path="/VisitInsert" element={<VisitInsert />}></Route>
-      <Route path="/VisitSelect" element={<VisitSelect />}></Route>
       <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>
       <Route
         path="/UserAuthoriySelect"
@@ -758,7 +559,6 @@
       <Route path="/QandASelect" element={<QandASelect />}></Route>
       <Route path="/QandAConfirm" element={<QandAConfirm />}></Route>
       <Route path="/QandAInsert" element={<QandAInsert />}></Route>
-      <Route path="/Questionnaire" element={<Questionnaire />}></Route>
       <Route path="/ProtectorSelect" element={<ProtectorSelect />}></Route>
       <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
       <Route path="/AgencyInsert" element={<AgencyInsert />}></Route>
@@ -770,59 +570,33 @@
   {
     title: "Home",
     path: "/Main_agency",
-    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+    icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
   },
   {
     title: "대상자 관리",
     path: "/UserAuthoriySelect_agency",
     icon: (
-      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <PersonIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
   },
   {
     title: "건강 관리",
+    path:"/Healthcare",
     icon: (
-      <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <Diversity1Icon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "복약 관리",
-        path: "/MedicineCareSelect",
-      },
-      {
-        title: "댁내 온도 관리",
-        path: "/TemperatureManagementSelect",
-      },
-      {
-        title: "방문 관리",
-        path: "/VisitSelect",
-      },
-    ]
   },
   {
     title: "진료 관리",
+    path:"/Medicalcare",
     icon: (
-      <LocalHospitalIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <LocalHospitalIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
-    childrens: [
-      {
-        title: "문진표 관리",
-        path: "/Questionnaire",
-      },
-      {
-        title: "심전도 관리",
-        path: "/ECGSelect",
-      },
-      {
-        title: "혈압 관리",
-        path: "/BloodSelect",
-      },
-    ]
   },
   {
     title: "장비 관리",
     icon: (
-      <ConstructionIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <ConstructionIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />
     ),
     childrens: [
       {
@@ -840,7 +614,7 @@
     path: "/QuestionSelect",
     icon: (
       <SpeakerPhoneIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+        sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
       />
     ),
   },
@@ -850,32 +624,20 @@
     <Routes>
       <Route path="/Join" element={<Join />}></Route>
       <Route path="/QuestionSelect" element={<QuestionSelect />}></Route>
-      <Route path="/ECGSelect" element={<ECGSelect />}></Route>
-      <Route path="/BloodSelect" element={<BloodSelect />}></Route>
       <Route path="/Main_agency" element={<Main_agency />}></Route>
       <Route path="/UserAuthoriySelect_agency" element={<UserAuthoriySelect_agency />}></Route>
       <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
       <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>
       <Route
-        path="/MedicineCareSelect"
-        element={<MedicineCareSelect />}
-      ></Route>
-      <Route
         path="/MedicineCareSelectOne"
         element={<MedicineCareSelectOne />}
-      ></Route>
-      <Route
-        path="/TemperatureManagementSelect"
-        element={<TemperatureManagementSelect />}
-      ></Route>
+      ></Route>      
       <Route
         path="/TemperatureManagementSelectOne"
         element={<TemperatureManagementSelectOne />}
       ></Route>
       <Route path="/VisitInsert" element={<VisitInsert />}></Route>
-      <Route path="/VisitSelect" element={<VisitSelect />}></Route>
       <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>
-      <Route path="/Questionnaire" element={<Questionnaire />}></Route>
       <Route
         path="/EquipmentRentalInsert"
         element={<EquipmentRentalInsert />}
@@ -907,19 +669,19 @@
   {
     title: "Home",
     path: "/Main_guardian",
-    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+    icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
   },
   {
     title: "그래프로 보기",
     path: "/GuardianStatistics",
-    icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+    icon: <EqualizerIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
   },
   {
     title: "Q&A",
     path: "/QuestionSelect",
     icon: (
       <SpeakerPhoneIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+        sx={{ fontSize: 20, color: "#333333", marginRight: 1 }}
       />
     ),
   },
client/views/pages/callcenter/QandASelect.jsx
--- client/views/pages/callcenter/QandASelect.jsx
+++ client/views/pages/callcenter/QandASelect.jsx
@@ -46,7 +46,7 @@
       finish:"처리중", 
       show:  (
         <Button
-          className={"btn-small gray-btn"}
+          className={"btn-small lightgray-btn"}
           btnName={"상세보기"}
           onClick={() => {
             navigate("/QandAConfirm");
@@ -67,7 +67,7 @@
           <div className="btn-wrap flex-end margin-bottom">
             
             <Button
-              className={"btn-small green-btn"}
+              className={"btn-small gray-btn"}
               btnName={"등록"}
               onClick={() => {
                 navigate("/QandAInsert");
client/views/pages/equipment/EquipmentManagementSelect.jsx
--- client/views/pages/equipment/EquipmentManagementSelect.jsx
+++ client/views/pages/equipment/EquipmentManagementSelect.jsx
@@ -99,14 +99,14 @@
 			date: "2022.12.02",
 			agency: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					onClick={openModal}
 				/>
 			),
 			senior: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					// onClick={openModal2}
 				/>
@@ -118,13 +118,13 @@
 			serialNumber: "ABCD-1",
 			date: "2022.12.02",
 			agency: (<Button
-				className={"btn-small gray-btn"}
+				className={"btn-small lightgray-btn"}
 				btnName={"선택"}
 				onClick={openModal}
 			/>),
 			senior: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					// onClick={openModal2}
 				/>
@@ -405,14 +405,14 @@
 			date: "2022.12.02",
 			agency: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					onClick={openModal}
 				/>
 			),
 			senior: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					// onClick={openModal2}
 				/>
@@ -424,13 +424,13 @@
 			serialNumber: "ABCD-1",
 			date: "2022.12.02",
 			agency: (<Button
-				className={"btn-small gray-btn"}
+				className={"btn-small lightgray-btn"}
 				btnName={"선택"}
 				onClick={openModal}
 			/>),
 			senior: (
 				<Button
-					className={"btn-small gray-btn"}
+					className={"btn-small lightgray-btn"}
 					btnName={"선택"}
 					// onClick={openModal2}
 				/>
@@ -476,7 +476,7 @@
 		{
 			No: 1,
 			agency: (
-				<div>
+				<div className="select-agency">
 					<Category />
 				</div>
 			)
@@ -533,7 +533,7 @@
 						<SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
 						<div className="btn-wrap flex-end margin-bottom ">
 							<Button
-								className={"btn-small green-btn"}
+								className={"btn-small gray-btn"}
 								btnName={"등록"}
 								onClick={openModal3}
 							/>
@@ -623,12 +623,12 @@
 						<SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
 						<div className="btn-wrap flex-end margin-bottom ">
 							<Button
-								className={"btn-small green-btn"}
+								className={"btn-small gray-btn"}
 								btnName={"LOG"}
 								onClick={logCheck}
 							/>
 							<Button
-								className={"btn-small green-btn"}
+								className={"btn-small gray-btn"}
 								btnName={"등록"}
 								onClick={openModal3}
 							/>
@@ -765,13 +765,6 @@
 							contentKey={key4}
 						/>
 					</div>
-					<div>
-						<Button
-							className={"btn-100 green-btn"}
-							btnName={"닫기"}
-							onClick={closeModal}
-						/>
-					</div>
 				</div>
 			</Modal>
 			<Modal open={seniorMatchModal} close={seniorMatchModalClose} header="대상자 장비 등록">
@@ -849,9 +842,9 @@
 							</tbody>
 						</table>
 					</div>
-					<div>
+					<div className="flex-center">
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-small red-btn"}
 							btnName={"저장"}
 							onClick={closeModal3}
 						/>
 
client/views/pages/healthcare/BloodSelect.jsx (deleted)
--- client/views/pages/healthcare/BloodSelect.jsx
@@ -1,139 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router";
-import DetailSearch from "../../component/DetailSearch.jsx";
-import Table from "../../component/Table.jsx";
-import ContentTitle from "../../component/ContentTitle.jsx";
-import SubTitle from "../../component/SubTitle.jsx";
-import Button from "../../component/Button.jsx";
-import Modal from "../../component/Modal.jsx";
-
-export default function Questionnaire() {
-  const navigate = useNavigate();
-  const [modalOpen, setModalOpen] = React.useState(false);
-  const openModal = () => {
-    setModalOpen(true);
-  };
-  const closeModal = () => {
-    setModalOpen(false);
-  };
-
-  const [modalOpen2, setModalOpen2] = React.useState(false);
-  const openModal2 = () => {
-    setModalOpen2(true);
-  };
-  const closeModal2 = () => {
-    setModalOpen2(false);
-  };
-  //게시판
-  const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근등록일", "최고혈압",  "최저혈압", "맥박수","혈압측정",];
-  const key = ["No", "name","number", "birth", "phone", "address","recent", "high","low","pulse", "average", ];
-  const content = [
-    {
-      No: 1,
-      name: "김복남",
-      number: "00000001",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      recent:"2020-01-05",
-      high:"130",
-      low:"90",
-      pulse:"60",
-      average: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"등록"}
-          onClick={openModal}
-        />
-      ),
-    },
-  ];
-
-  const thead1 = [
-    "No",
-    "측정 일자",
-    "최고 혈압",
-    "최저 혈압",
-    "맥박수",
-    "작성자",
-  ];
-  const key1 = ["No", "date", "high","low", "pulse", "writer"];
-  const content1 = [
-    {
-      No: 1,
-      date: "2023-01-25",
-      high: "130",
-      low: "90",
-      pulse: "60",
-      writer: "정간호",
-    },
-  ];
-
-  return (
-    <main>
-      <Modal open={modalOpen} close={closeModal} header="혈압측정 등록">
-        <div className="board-wrap">        
-          <div>
-          <table className="margin-bottom2">
-            <tr>
-              <th>대상자명</th>
-              <td className="flex-start">
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>측정일자</th>
-              <td className="flex-start">
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>최고혈압</th>
-              <td className="flex-start">
-                <input type="text" />
-              </td>              
-            </tr>
-            <tr>
-              <th>최저혈압</th>
-              <td className="flex-start">
-                <input type="text" />
-              </td>              
-            </tr>
-            <tr>
-              <th>맥박수</th>
-              <td className="flex-start">
-                <input type="text" />
-              </td>              
-            </tr>
-            
-          </table>
-          <div className="btn-wrap flex-center margin-bottom5">
-          <Button className={"btn-small green-btn"} btnName={"저장"} />
-            </div>
-          </div>
-          <Table
-              className={"caregiver-user "}
-              head={thead1}
-              contents={content1}
-              contentKey={key1}
-            />
-        </div>
-      </Modal>
-
-      <div className="content-wrap">
-      <ContentTitle contentTitle={"혈압 관리"} />
-        <div>
-          <DetailSearch />
-          <div className="board-wrap">
-            <Table
-            className={"medicine-table"}
-              head={thead}
-              contents={content}
-              contentKey={key}
-            />
-          </div>
-        </div>
-      </div>
-    </main>
-  );
-}
 
client/views/pages/healthcare/ECGSelect.jsx (deleted)
--- client/views/pages/healthcare/ECGSelect.jsx
@@ -1,174 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router";
-import DetailSearch from "../../component/DetailSearch.jsx";
-import Table from "../../component/Table.jsx";
-import ContentTitle from "../../component/ContentTitle.jsx";
-import SubTitle from "../../component/SubTitle.jsx";
-import Button from "../../component/Button.jsx";
-import Modal from "../../component/Modal.jsx";
-
-export default function ECGSelect() {
-  const navigate = useNavigate();
-  const [modalOpen, setModalOpen] = React.useState(false);
-  const openModal = () => {
-    setModalOpen(true);
-  };
-  const closeModal = () => {
-    setModalOpen(false);
-  };
-
-  const [modalOpen2, setModalOpen2] = React.useState(false);
-  const openModal2 = () => {
-    setModalOpen2(true);
-  };
-  const closeModal2 = () => {
-    setModalOpen2(false);
-  };
-  //게시판
-  const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "심전도"];
-  const key = ["No", "name","number", "birth", "phone", "address", "ECG"];
-  const content = [
-    {
-      No: 1,
-      name: "김복남",
-      number: "00000001",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      ECG: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"등록"}
-          onClick={openModal}
-        />
-      ),
-    },
-  ];
-
-  const thead1 = [
-    "No",
-    "측정일자",
-    "측정파일",
-    "등록자",
-  ];
-  const key1 = ["No", "date", "file","writer",];
-  const content1 = [
-    {
-      No: 1,
-      date: "2023-01-25",
-      file: ( <a href="" download="테스트">다운로드</a>),
-      writer: "정간호",
-    },
-  ];
-
-  return (
-    <main>
-      <Modal open={modalOpen} close={closeModal} header="혈압측정 등록">
-        <div className="board-wrap">        
-          <div>
-          <table className="margin-bottom2">
-            <tr>
-              <th>대상자명</th>
-              <td className="flex-start">
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>측정일자</th>
-              <td className="flex-start">
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>측정파일</th>
-              <td className="flex-start">
-              <input type="file"></input>
-              </td>              
-            </tr>
-            <tr>
-              <th>등록자</th>
-              <td className="flex-start">
-              <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            
-            
-          </table>
-          <div className="btn-wrap flex-center margin-bottom5">
-          <Button className={"btn-small green-btn"} btnName={"저장"} />
-            </div>
-          </div>
-          <Table
-              className={"caregiver-user "}
-              head={thead1}
-              contents={content1}
-              contentKey={key1}
-            />
-        </div>
-      </Modal>
-
-      <Modal open={modalOpen2} close={closeModal2} header="진료 기록">
-        <div className="board-wrap">
-        <table className="margin-bottom2 senior-insert">
-            <tr>
-              <th>진료일자</th>
-              <td>
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>진료 사유</th>
-              <td className="flex-start gender">
-                <input type="text" />
-              </td>              
-            </tr>
-            <tr>
-              <th>진료 내용</th>
-              <td colSpan={3}>
-                <input type="text" />
-              </td>
-            </tr>
-            <tr>
-              <th>작성자</th>
-              <td colSpan={3}>
-              <input type="text" placeholder="자동입력"/>
-              </td>
-            </tr>           
-          </table>
-        <div className="btn-wrap flex-center margin-bottom5">
-              <Button
-                  className={"btn-small green-btn"}
-                  btnName={"추가하기"}
-                  onClick={() => {
-                  // navigate("/SeniorInsert");
-                  }}
-              />
-            </div>
-          <div>
-            <Table
-              className={"caregiver-user"}
-              head={thead1}
-              contents={content1}
-              contentKey={key1}
-            />
-          </div>
-        </div>
-      </Modal>
-
-      <div className="content-wrap">
-      <ContentTitle contentTitle={"심전도 관리"} />
-        <div>
-          <DetailSearch />
-          <div className="board-wrap">
-            <Table
-            className={"medicine-table"}
-              head={thead}
-              contents={content}
-              contentKey={key}
-            />
-          </div>
-        </div>
-      </div>
-    </main>
-  );
-}
 
client/views/pages/healthcare/Healthcare.jsx (added)
+++ client/views/pages/healthcare/Healthcare.jsx
@@ -0,0 +1,190 @@
+import React, { useState } from "react";
+import ContentTitle from "../../component/ContentTitle.jsx";
+import SubTitle from "../../component/SubTitle.jsx";
+import Modal from "../../component/Modal.jsx";
+import Table from "../../component/Table.jsx";
+import Button from "../../component/Button.jsx";
+import { useNavigate } from "react-router";
+import { width } from "@mui/system";
+import DetailSearch from "../../component/DetailSearch.jsx";
+import DetailTitle from "../../component/DetailTitle.jsx";
+
+export default function UserAuthoriySelect() {
+    const navigate = useNavigate();
+    const [tapName, setTapName] = useState("복약관리")
+    const thead = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",
+    ];
+    const key = [
+        "No", "name", "number", "birth", "phone", "address", "average"
+    ];
+    const content = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            agency: "A복지관",
+            protect: "홍길동",
+            average: "0%",
+        },
+
+    ];
+
+    const thead1 = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도",
+    ];
+    const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high"
+    ];
+    const content1 = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            agency: "A복지관",
+            protect: "홍길동",
+            high: "18°C",
+            low: "18°C",
+        }
+    ];
+    const thead2 = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유",
+    ];
+    const key2 = [
+        "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail"
+    ];
+    const content2 = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            visit: "2023.02.08",
+            reason: "정기방문",
+            reason_detail: "정기방문일",
+        },
+    ];
+    const data = [
+        {
+            id: 1,
+            title: "복약관리",
+            description: (
+                <Table
+                    className={"protector-user"}
+                    head={thead}
+                    contents={content}
+                    contentKey={key}
+                    onClick={() => {
+                        navigate("/MedicineCareSelectOne");
+                    }}
+                />
+            ),
+        },
+        {
+            id: 2,
+            title: "댁내온도관리",
+            description: (
+                <Table
+                    className={"senior-table"}
+                    head={thead1}
+                    contents={content1}
+                    contentKey={key1}
+                    onClick={() => {
+                        navigate("/TemperatureManagementSelectOne");
+                    }}
+                />
+            ),
+        },
+        {
+            id: 3,
+            title: "방문관리",
+            description: (
+                <Table
+                    className={"senior-table"}
+                    head={thead2}
+                    contents={content2}
+                    contentKey={key2}
+                    onClick={() => {
+                        navigate("/VisitSelectOne");
+                    }}
+                />
+            ),
+        },
+    ]
+    const [index, setIndex] = React.useState(1);
+
+    return (
+        <main>
+            <ContentTitle contentTitle={"건강 관리"} explanation={"대상자의 복약/댁내온도/방문 관리를 할 수 있습니다."} />
+            <div className="content-wrap">
+
+                <div
+                    style={{ height: "calc(100% - 61px)" }}
+                >
+                    <div className="right" style={{ height: "100%", }}>
+                        <div style={{ height: "100%" }}>
+                            <div className="tab-container">
+                                <ul className="tab-menu-mobile">
+                                    <div>
+                                        <SubTitle
+                                            className="margin-bottom"
+                                            subtitle={"사용자 선택"}
+                                            explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
+                                        />
+                                    </div>
+                                    <select name="" id="" style={{ width: "100%" }}>
+                                        <option value="사용자선택">보호자</option>
+                                        <option value="사용자선택">보호사</option>
+                                        <option value="사용자선택">병원</option>
+                                        <option value="사용자선택">지자체</option>
+                                        <option value="사용자선택">관리자</option>
+                                    </select>
+                                </ul>
+                                <ul className="tab-menu flex-end">
+                                    {data.map((item) => (
+                                        <li
+                                            key={item.id}
+                                            className={index === item.id ? "active" : null}
+                                            onClick={() => setIndex(item.id)}
+                                        >
+                                            {item.title}
+                                        </li>
+                                    ))}
+                                </ul>
+                                <div className="content-wrap userlist">
+                                    <DetailTitle contentTitle={`${tapName}`} />
+                                    <div className="search-management flex-start margin-bottom2">
+                                        <DetailSearch />
+                                    </div>
+                                    <div className="flex">
+                                        <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
+                                        <div className="flex searchselect">
+                                            <input type="radio"/>
+                                            <label htmlFor="">나의 대상자 보기</label>
+                                            <input type="radio" />
+                                            <label htmlFor="">전체 대상자 보기</label>
+                                        </div>
+                                    </div>
+                                    <ul className="tab-content">
+                                        {data
+                                            .filter((item) => index === item.id)
+                                            .map((item) => (
+                                                <li>{item.description}</li>
+                                            ))}
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </main>
+    );
+}
 
client/views/pages/healthcare/Medicalcare.jsx (added)
+++ client/views/pages/healthcare/Medicalcare.jsx
@@ -0,0 +1,223 @@
+import React, { useState } from "react";
+import ContentTitle from "../../component/ContentTitle.jsx";
+import SubTitle from "../../component/SubTitle.jsx";
+import Modal from "../../component/Modal.jsx";
+import Table from "../../component/Table.jsx";
+import Button from "../../component/Button.jsx";
+import { useNavigate } from "react-router";
+import { width } from "@mui/system";
+import DetailSearch from "../../component/DetailSearch.jsx";
+import DetailTitle from "../../component/DetailTitle.jsx";
+import Modal_Questionnaire from "../../component/Modal_Questionnaire.jsx";
+import Modal_MedicalHistory from "../../component/Modal_MedicalHistory.jsx";
+import Modal_Blood from "../../component/Modal_Blood.jsx";
+import Modal_ECG from "../../component/Modal_ECG.jsx";
+
+export default function UserAuthoriySelect() {
+    const navigate = useNavigate();
+    const [modalOpen, setModalOpen] = React.useState(false);
+    const openModal = () => {
+        setModalOpen(true);
+    };
+    const closeModal = () => {
+        setModalOpen(false);
+    };
+
+    const [modalOpen2, setModalOpen2] = React.useState(false);
+    const openModal2 = () => {
+        setModalOpen2(true);
+    };
+    const closeModal2 = () => {
+        setModalOpen2(false);
+    };
+    const [modalOpen3, setModalOpen3] = React.useState(false);
+    const openModal3 = () => {
+        setModalOpen3(true);
+    };
+    const closeModal3 = () => {
+        setModalOpen3(false);
+    };
+    const [modalOpen4, setModalOpen4] = React.useState(false);
+    const openModal4 = () => {
+        setModalOpen4(true);
+    };
+    const closeModal4 = () => {
+        setModalOpen4(false);
+    };
+    const [tapName, setTapName] = useState("문진표 관리")
+    const thead = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "문진표", "내원기록"
+    ];
+    const key = [
+        "No", "name", "number", "birth", "phone", "address", "average", "record"
+    ];
+    const content = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            average: (
+                <Button
+                    className={"btn-small gray-btn"}
+                    btnName={"작성하기"}
+                    onClick={openModal}
+                />
+            ),
+            record: (
+                <Button
+                    className={"btn-small gray-btn"}
+                    btnName={"진료 내역"}
+                    onClick={openModal2}
+                />
+            ),
+        },
+
+    ];
+
+    const thead1 = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "심전도"
+    ];
+    const key1 = ["No", "name", "number", "birth", "phone", "address", "ECG"
+    ];
+    const content1 = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            ECG: (
+                <Button
+                    className={"btn-small gray-btn"}
+                    btnName={"등록"}
+                    onClick={openModal3}
+                />
+            ),
+        }
+    ];
+    const thead2 = [
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근등록일", "최고혈압", "최저혈압", "맥박수", "혈압측정",
+    ];
+    const key2 = [
+        "No", "name", "number", "birth", "phone", "address", "recent", "high", "low", "pulse", "average",
+    ];
+    const content2 = [
+        {
+            No: 1,
+            name: "김복남",
+            number: "00000001",
+            birth: "1948.11.15",
+            phone: "010-1234-5678",
+            address: "경상북도 군위군 삼국유사면",
+            recent: "2020-01-05",
+            high: "130",
+            low: "90",
+            pulse: "60",
+            average: (
+                <Button
+                    className={"btn-small gray-btn"}
+                    btnName={"등록"}
+                    onClick={openModal4}
+                />
+            ),
+        },
+    ];
+    const data = [
+        {
+            id: 1,
+            title: "문진표 관리",
+            description: (
+                <Table
+                    className={"protector-user"}
+                    head={thead}
+                    contents={content}
+                    contentKey={key}
+                />
+            ),
+        },
+        {
+            id: 2,
+            title: "심전도 관리",
+            description: (
+                <Table
+                    className={"senior-table"}
+                    head={thead1}
+                    contents={content1}
+                    contentKey={key1}
+                />
+            ),
+        },
+        {
+            id: 3,
+            title: "혈압 관리",
+            description: (
+                <Table
+                    className={"senior-table"}
+                    head={thead2}
+                    contents={content2}
+                    contentKey={key2}
+                />
+            ),
+        },
+    ]
+    const [index, setIndex] = React.useState(1);
+
+    return (
+        <main>
+
+            <ContentTitle contentTitle={"진료 관리"} explanation={"대상자의 문진표/심전도/혈압 관리를 할 수 있습니다."} />
+            <div className="content-wrap">
+                <Modal_Questionnaire open={modalOpen} close={closeModal} />
+                <Modal_MedicalHistory open={modalOpen2} close={closeModal2} />
+                <Modal_ECG open={modalOpen3} close={closeModal3} />
+                <Modal_Blood open={modalOpen4} close={closeModal4} />
+                <div
+                    style={{ height: "calc(100% - 61px)" }}
+                >
+                    <div className="right" style={{ height: "100%", }}>
+                        <div style={{ height: "100%" }}>
+                            <div className="tab-container">
+                                <ul className="tab-menu flex-end">
+                                    {data.map((item) => (
+                                        <li
+                                            key={item.id}
+                                            className={index === item.id ? "active" : null}
+                                            onClick={() => setIndex(item.id)}
+                                        >
+                                            {item.title}
+                                        </li>
+                                    ))}
+                                </ul>
+                                <div className="content-wrap userlist">
+                                    <DetailTitle contentTitle={`${tapName}`} />
+                                    <div className="search-management flex-start margin-bottom2">
+                                        <DetailSearch />
+                                    </div>
+                                    <div className="flex-end margin-bottom">
+                                        <div className="flex searchselect">
+                                            <input type="radio" />
+                                            <label htmlFor="">나의 대상자 보기</label>
+                                            <input type="radio" />
+                                            <label htmlFor="">전체 대상자 보기</label>
+                                        </div>
+                                    </div>
+                                    <ul className="tab-content">
+                                        {data
+                                            .filter((item) => index === item.id)
+                                            .map((item) => (
+                                                <li>{item.description}</li>
+                                            ))}
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </main>
+    );
+}
 
client/views/pages/healthcare/Questionnaire.jsx (deleted)
--- client/views/pages/healthcare/Questionnaire.jsx
@@ -1,231 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router";
-import DetailSearch from "../../component/DetailSearch.jsx";
-import Table from "../../component/Table.jsx";
-import ContentTitle from "../../component/ContentTitle.jsx";
-import SubTitle from "../../component/SubTitle.jsx";
-import Button from "../../component/Button.jsx";
-import Modal from "../../component/Modal.jsx";
-
-export default function Questionnaire() {
-  const navigate = useNavigate();
-  const [modalOpen, setModalOpen] = React.useState(false);
-  const openModal = () => {
-    setModalOpen(true);
-  };
-  const closeModal = () => {
-    setModalOpen(false);
-  };
-
-  const [modalOpen2, setModalOpen2] = React.useState(false);
-  const openModal2 = () => {
-    setModalOpen2(true);
-  };
-  const closeModal2 = () => {
-    setModalOpen2(false);
-  };
-  //게시판
-  const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "문진표", "내원기록"];
-  const key = ["No", "name","number", "birth", "phone", "address", "average", "record"];
-  const content = [
-    {
-      No: 1,
-      name: "김복남",
-      number: "00000001",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      average: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"작성하기"}
-          onClick={openModal}
-        />
-      ),
-      record: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"진료 내역"}
-          onClick={openModal2}
-        />
-      ),
-    },
-    {
-      No: 2,
-      name: "홍길동",
-      number: "00000001",
-      birth: "1948.08.02",
-      phone: "010-1234-3333",
-      address: "경상북도 군위군 군위읍",
-      average: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"보기"}
-          onClick={openModal}
-        />
-      ),
-      record: (
-        <Button
-          className={"btn-small gray-btn"}
-          btnName={"진료 내역"}
-          onClick={openModal2}
-        />
-      ),
-    },
-  ];
-
-  const thead1 = [
-    "No",
-    "진료 일자",
-    "진료 사유",
-    "진료 내용",
-    "기록 작성자 명",
-  ];
-  const key1 = ["No", "date", "reason","content", "name"];
-  const content1 = [
-    {
-      No: 1,
-      date: "2023-01-25",
-      reason: "정기 내원",
-      content: "건강검진 진행, 이상 없음",
-      name: "정간호",
-    },
-  ];
-
-  return (
-    <main>
-      <Modal open={modalOpen} close={closeModal} header="문진표 작성">
-        <div className="board-wrap">        
-          <div>
-          <table className="margin-bottom2  questionnaire-table">
-            <tr>
-              <th>흡연을 하십니까?</th>
-              <td className="flex-start">
-              <input type="radio" />
-                  <label for="gender">예</label>
-              <input type="radio" />
-                  <label for="gender">아니요</label>
-              </td>              
-            </tr>
-            <tr>
-            <th>음주를 하십니까?</th>
-              <td className="flex-start">
-              <input type="radio" />
-                  <label for="gender">예</label>
-              <input type="radio" />
-                  <label for="gender">아니요</label>
-              </td>              
-            </tr>
-            <tr>
-            <th>일주일에 운동을 몇회 하십니까?</th>
-              <td className="flex-start">
-              <input type="radio" />
-                  <label for="gender">안함</label>
-              <input type="radio" />
-                  <label for="gender">3회 미만</label>
-              <input type="radio" />
-                  <label for="gender">3회 이상</label>
-              <input type="radio" />
-                  <label for="gender">매일</label>
-              </td>
-            </tr>
-            <tr>
-            <th>최근 3개월 동안 갑작스런 체중 변화가 있었습니까?</th>
-              <td className="flex-start">
-              <input type="radio" />
-                  <label for="gender">예 - 증가</label>
-              <input type="radio" />
-                  <label for="gender">예 - 감소</label>
-              <input type="radio" />
-                  <label for="gender">아니요</label>
-              </td>   
-            </tr>
-            <tr>
-            <th>현재 복용중인 약이 있으면 체크를 해주세요.</th>
-              <td className="flex-start">
-              <input type="checkbox" />
-                  <label for="gender">없음</label>
-              <input type="checkbox" />
-                  <label for="gender">아스피린(항혈소판제)</label>
-              <input type="checkbox" />
-                  <label for="gender">당뇨약</label>
-              <input type="checkbox" />
-                  <label for="gender">고혈압약</label>
-              <input type="checkbox" />
-                  <label for="gender">기타</label><input type="text" />
-              </td>              
-            </tr>
-          </table>
-          </div>
-          <div className="flex-center"><Button className={"btn-small green-btn"} btnName={"저장"} /></div >
-        </div>
-      </Modal>
-
-      <Modal open={modalOpen2} close={closeModal2} header="진료 기록">
-        <div className="board-wrap">
-        <table className="margin-bottom2 senior-insert">
-            <tr>
-              <th>진료일자</th>
-              <td>
-                <input type="text" placeholder="자동입력"/>
-              </td>              
-            </tr>
-            <tr>
-              <th>진료 사유</th>
-              <td className="flex-start gender">
-                <input type="text" />
-              </td>              
-            </tr>
-            <tr>
-              <th>진료 내용</th>
-              <td colSpan={3}>
-                <input type="text" />
-              </td>
-            </tr>
-            <tr>
-              <th>작성자</th>
-              <td colSpan={3}>
-              <input type="text" placeholder="자동입력"/>
-              </td>
-            </tr>           
-          </table>
-        <div className="btn-wrap flex-center margin-bottom5">
-          <Button className={"btn-small green-btn"} btnName={"저장"} />
-            </div>
-          <div>
-            <Table
-              className={"caregiver-user"}
-              head={thead1}
-              contents={content1}
-              contentKey={key1}
-            />
-          </div>
-        </div>
-      </Modal>
-
-      <div className="content-wrap">
-      <ContentTitle contentTitle={"문진표 조회"} />
-        <div>
-          <DetailSearch />
-          <div className="board-wrap">
-          <div className="flex">
-              <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
-              <div className="flex searchselect">
-                <input type="radio" />
-                <label htmlFor="">나의 대상자 보기</label>
-                <input type="radio" />
-                <label htmlFor="">전체 대상자 보기</label>
-              </div>
-            </div>
-            <Table
-            className={"medicine-table"}
-              head={thead}
-              contents={content}
-              contentKey={key}
-            />
-          </div>
-        </div>
-      </div>
-    </main>
-  );
-}
 
client/views/pages/healthcare/medicinecare/MedicineCareSelect.jsx (deleted)
--- client/views/pages/healthcare/medicinecare/MedicineCareSelect.jsx
@@ -1,69 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router";
-import DetailSearch from "../../../component/DetailSearch.jsx";
-import Table from "../../../component/Table.jsx";
-import ContentTitle from "../../../component/ContentTitle.jsx";
-import SubTitle from "../../../component/SubTitle.jsx";
-
-export default function MedicineCareSelect() {
-  const navigate = useNavigate();
-
-  //게시판
-  const thead = ["No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",];
-  const key = ["No", "name", "number", "birth", "phone", "address", "average"];
-  const content = [
-    {
-      No: 1,
-      name: "김복남",
-      number: "00000001",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      agency: "A복지관",
-      protect: "홍길동",
-      average: "0%",
-    },
-    {
-      No: 2,
-      name: "홍길동",
-      number: "00000001",
-      birth: "1948.08.02",
-      phone: "010-1234-3333",
-      address: "경상북도 군위군 군위읍",
-      agency: "A복지관",
-      protect: "홍길동",
-      average: "80%",
-    },
-  ];
-
-  return (
-    <main>
-      <div className="content-wrap">
-        <ContentTitle contentTitle={"복약 조회"} />
-        <div>
-          <DetailSearch />
-          <div className="board-wrap">
-            <div className="flex">
-              <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
-              <div className="flex searchselect">
-                <input type="radio" />
-                <label htmlFor="">나의 대상자 보기</label>
-                <input type="radio" />
-                <label htmlFor="">전체 대상자 보기</label>
-              </div>
-            </div>
-            <Table
-              className={"medicine-table"}
-              head={thead}
-              contents={content}
-              contentKey={key}
-              onClick={() => {
-                navigate("/MedicineCareSelectOne");
-              }}
-            />
-          </div>
-        </div>
-      </div>
-    </main>
-  );
-}
 
client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx (deleted)
--- client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx
@@ -1,53 +0,0 @@
-import React from "react";
-import Table from "../../../component/Table.jsx";
-import DetailSearch from "../../../component/DetailSearch.jsx";
-import ContentTitle from "../../../component/ContentTitle.jsx";
-import SubTitle from "../../../component/SubTitle.jsx";
-import { useNavigate } from 'react-router';
-
-export default function TemperatureManagementSelect_government() {
-  const navigate = useNavigate();
-    //게시판
-    const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도",];
-    const key = ["No", "name", "number","birth", "phone", "address", "low", "high"];
-    const content = [
-      {
-        No: 1,
-        name: "김복남",
-        number: "00000001",
-        birth: "1948.11.15",
-        phone: "010-1234-5678",
-        address: "경상북도 군위군 삼국유사면",
-        agency: "A복지관",
-        protect: "홍길동",
-        high: "18°C",
-        low: "18°C",
-      },
-    ];
-  return (
-    <main>
-      <div className="content-wrap">
-      <ContentTitle contentTitle={"댁내 온도 조회"} />
-          <DetailSearch />
-          <div className="board-wrap">  
-          <div className="flex">
-              <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
-              <div className="flex searchselect">
-                <input type="radio" />
-                <label htmlFor="">나의 대상자 보기</label>
-                <input type="radio" />
-                <label htmlFor="">전체 대상자 보기</label>
-              </div>
-            </div>
-          <Table
-          className={"temperature-table"}
-            head={thead}
-            contents={content}
-            contentKey={key}
-            onClick={()=>{navigate('/TemperatureManagementSelectOne')}}
-          />
-        </div>
-      </div>
-    </main>
-  );
-}
client/views/pages/join/Join.jsx
--- client/views/pages/join/Join.jsx
+++ client/views/pages/join/Join.jsx
@@ -58,7 +58,7 @@
                 />
                 <Button
                   btnName={"중복확인"}
-                  className={"green-btn btn-large"}
+                  className={"red-btn btn-large"}
                   onclick="openIdChk()"
                 />
               </div>
@@ -108,7 +108,7 @@
             <div className="btn-wrap">
               <Button className={"gray-btn btn-large"} btnName={"취소"} />
               <Button
-                className={"green-btn btn-large"}
+                className={"red-btn btn-large"}
                 btnName={"등록"}
                 onClick={() => {
                   navigate("Login");
client/views/pages/user_management/UserAuthoriySelect.jsx
--- client/views/pages/user_management/UserAuthoriySelect.jsx
+++ client/views/pages/user_management/UserAuthoriySelect.jsx
@@ -4,32 +4,11 @@
 import Modal from "../../component/Modal.jsx";
 import Table from "../../component/Table.jsx";
 import Button from "../../component/Button.jsx";
-
-function Menu({ className, children, href, title }) {
-  if (!children) {
-    return <li className="venue-lvl">
-      <a href={href ?? '#'}>
-        <span>{title}</span>
-      </a>
-    </li>
-  }
-  const [open, setOpend] = useState('open');
-  // if (className) className = 'group-lvl';
-  // className = className ?? 'group-lvl';
-  className ??= 'group-lvl';
-  className = `${className} sub-nav ${open}`; //[className, 'sub-nav', open].join(' ')
-  return <li className={className}>
-    <a href={href ?? '#'} onClick={() => setOpend(open ? '' : 'open')} className="max-agency">
-      <span>{title}</span><button>관리기관 추가</button>
-    </a>
-    {open && <ul id="venue-scope-options">
-      {children}
-    </ul>}
-  </li>
-}
+import Category from "../../component/Category.jsx";
+import { width } from "@mui/system";
 
 export default function UserAuthoriySelect() {
-  const [agencyName, setAgencyName]= useState("시행기관")
+  const [agencyName, setAgencyName] = useState("시행기관")
   const [modalOpen, setModalOpen] = React.useState(false);
   const openModal = () => {
     setModalOpen(true);
@@ -72,7 +51,7 @@
       address: "경상북도 군위군 삼국유사면",
       worker: "10명"
     },
-   
+
   ];
 
   const thead1 = [
@@ -99,13 +78,13 @@
       No: 1,
       name: "김복남",
       management_number: 2022080101,
-      birth:"1950.02.03",
+      birth: "1950.02.03",
       gender: "남",
       phone: "010-1234-1234",
       address: "경상북도 군위군 삼국유사면",
-      family:(
+      family: (
         <Button
-          className={"btn-small gray-btn"}
+          className={"btn-small lightgray-btn"}
           btnName={"보호자(가족) 보기"}
           onClick={openModal}
         />
@@ -156,14 +135,14 @@
       title: "복지사(간호사)",
       description: (
         <Table
-        className={"senior-table"}
-        head={thead}
-        contents={content}
-        contentKey={key}
-        onClick={() => {
-          navigate("/SeniorSelectOne");
-        }}
-      />
+          className={"senior-table"}
+          head={thead}
+          contents={content}
+          contentKey={key}
+          onClick={() => {
+            navigate("/SeniorSelectOne");
+          }}
+        />
       ),
     },
   ]
@@ -173,12 +152,50 @@
     <main>
       <Modal open={modalOpen} close={closeModal} header="'김복남'님의 가족">
         <div className="board-wrap">
-        <div className="btn-wrap flex-end margin-bottom">
-              <Button
-                className={"btn-small green-btn"}
-                btnName={"등록"}
-              />
-            </div>
+          <SubTitle explanation={"최초 로그인 ID는 연락처, PW는 생년월일 8자리입니다."} className="margin-bottom" />
+          <table className="margin-bottom2 senior-insert">
+            <tr>
+              <th>이름</th>
+              <td>
+                <input type="text" />
+              </td>
+              <th>생년월일</th>
+              <td>
+                <div className="flex">
+                  <select name="year" id="year">
+                    <option value="">년</option>
+                  </select>
+                  <select name="month" id="month">
+                    <option value="">월</option>
+                  </select>
+                  <select name="days" id="days">
+                    <option value="">일</option>
+                  </select>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <th>연락처</th>
+              <td colSpan={3}>
+                <input type="input" maxLength="11" />
+              </td>
+            </tr>
+            <tr>
+              <th>대상자와의 관계</th>
+              <td colSpan={3}>
+                <input type="text" />
+              </td>
+            </tr>
+          </table>
+          <div className="btn-wrap flex-center margin-bottom5">
+            <Button
+              className={"btn-small red-btn"}
+              btnName={"추가"}
+              onClick={() => {
+                navigate("/SeniorInsert");
+              }}
+            />
+          </div>
           <div>
             <Table
               className={"caregiver-user"}
@@ -187,35 +204,30 @@
               contentKey={key3}
             />
           </div>
-          <div>
-            <Button
-              className={"btn-100 green-btn"}
-              btnName={"닫기"}
-              onClick={closeModal}
-            />
-          </div>
         </div>
       </Modal>
-      <Modal open={modalOpen2} close={closeModal2} header="'김복남'님의 가족">
-        <div className="board-wrap">        
-            <SubTitle explanation={"회원 등록 시 ID는 연락처, 패스워드는 생년월일 8자리입니다."} className="margin-bottom"/>
+      <Modal open={modalOpen2} close={closeModal2} header="대상자(사용자) 등록">
+        <div className="board-wrap">
+          <SubTitle explanation={"회원 등록 시 ID는 연락처, 패스워드는 생년월일 8자리입니다."} className="margin-bottom" />
           <table className="margin-bottom2 senior-insert">
-          <tr>
+            <tr>
               <th>대상자등록번호</th>
               <td colSpan={3} className="flex">
-                <input type="text" placeholder="생성하기 버튼 클릭 시 자동으로 생성됩니다."/>
+                <input type="text" placeholder="생성하기 버튼 클릭 시 자동으로 생성됩니다." />
                 <Button
-              className={"btn-large gray-btn"}
-              btnName={"생성하기"}
-            />
+                  className={"btn-short red-btn margin-left"}
+                  btnName={"생성"}
+                />
               </td>
             </tr>
             <tr>
               <th>이름</th>
               <td>
                 <input type="text" />
-              </td>
-              <th>성별</th>
+              </td>              
+            </tr>
+            <tr>
+            <th>성별</th>
               <td className="flex-start gender">
                 <div className="flex-start">
                   <input type="radio" name="genderSelect"></input>
@@ -228,7 +240,7 @@
               </td>
             </tr>
             <tr>
-            <th>생년월일</th>
+              <th>생년월일</th>
               <td>
                 <div className="flex">
                   <select name="year" id="year">
@@ -246,7 +258,7 @@
               <td>
               <input type="text" />
               </td> */}
-              
+
             </tr>
             <tr>
               <th>연락처</th>
@@ -279,129 +291,98 @@
               </td>
             </tr> */}
           </table>
-          <div>
+          <div className="flex-center">
             <Button
-              className={"btn-100 green-btn"}
+              className={"btn-small red-btn"}
               btnName={"등록"}
               onClick={closeModal2}
             />
           </div>
         </div>
       </Modal>
+      <ContentTitle contentTitle={"사용자 관리"} explanation={"관리기관 리스트 및 시행기관 사용자 리스트를 확인할 수 있습니다."} />
       <div className="content-wrap">
-        <ContentTitle contentTitle={"사용자 관리"} explanation={"관리기관 리스트 및 시행기관 사용자 리스트를 확인할 수 있습니다."}/>
+        
         <div
           className="flex-align-start"
           style={{ height: "calc(100% - 61px)" }}
         >
-          <div className="left flex30" style={{ height: "100%" }}>
+          <div className="left" style={{ height: "100%", width:"27%" }}>
             <div style={{ height: "100%" }}>
               <SubTitle
                 subtitle={"관리기관 리스트"}
                 explanation={"시스템 로그인의 사용자를 관리합니다."}
                 className="margin-bottom"
               />
-              <div class="hierarchy-menu category">
-                <ul>
-                  <Menu className="customer-lvl" href="#" title="올잇메디">
-                    <li class="group-lvl sub-nav open">
-                      <a href="#" className="top-agency">
-                        <span>지자체</span><button>시행기관 추가</button>
-                      </a>
-                      <ul id="venue-scope-options" className="low-agency">
-                        <Menu href="#" title={`${agencyName}`} />
-                        <Menu href="#" title={`${agencyName}`} />
-                        <Menu href="#" title={`${agencyName}`} />
-
-                      </ul>
-                    </li>
-                    <li class="group-lvl sub-nav open">
-                      <a href="#" class="active top-agency">
-                        <span>관리 병원</span><button>시행기관 추가</button>
-                      </a>
-                      <ul className="low-agency">
-                        <Menu href="#" title="병원1" />
-                        <Menu href="#" title="병원2" />
-                        <Menu href="#" title="병원3" />
-                      </ul>
-
-                    </li>
-                    <li class="venue-lvl ">
-                      <a href="#" className="top-agency">
-                        <span>관리자</span>
-                      </a>
-                    </li>
-                  </Menu>
-                </ul>
-              </div>
+                <Category />
             </div>
           </div>
-          <div className="right flex60" style={{ height: "100%" }}>
+          <div className="right" style={{ height: "100%", width:"70%" }}>
             <div style={{ height: "100%" }}>
               <SubTitle
                 subtitle={`${agencyName} 사용자 리스트`}
                 explanation={"선택된 기관의 사용자 리스트 입니다."}
                 className="margin-bottom"
               />
-                <div className="tab-container">
-                  <ul className="tab-menu-mobile">
-                    <div>
-                      <SubTitle
-                        className="margin-bottom"
-                        subtitle={"사용자 선택"}
-                        explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
-                      />
-                    </div>
-                    <select name="" id="" style={{ width: "100%" }}>
-                      <option value="사용자선택">보호자</option>
-                      <option value="사용자선택">보호사</option>
-                      <option value="사용자선택">병원</option>
-                      <option value="사용자선택">지자체</option>
-                      <option value="사용자선택">관리자</option>
-                    </select>
-                  </ul>
-                  <ul className="tab-menu">
-                    {data.map((item) => (
-                      <li
-                        key={item.id}
-                        className={index === item.id ? "active" : null}
-                        onClick={() => setIndex(item.id)}
-                      >
-                        {item.title}
-                      </li>
-                    ))}
-                  </ul>
-                  <div className="content-wrap">
-                    <div className="search-management flex-end margin-bottom2">
-                      <select>
-                        <option value="이름">이름</option>
-                        <option value="아이디">사용자등록번호</option>
-                        <option value="아이디">ID</option>
-                      </select>
-                      <input type="text" />
-                      <Button
-                        className={"btn-small gray-btn"}
-                        btnName={"검색"}
-                        onClick={() => navigate("/SeniorInsert")}
-                      />
-                    </div>
-                    <div className="btn-wrap flex-end margin-bottom">
-              <Button
-                className={"btn-small green-btn"}
-                btnName={"등록"}
-                onClick={openModal2}
-              />
-              <Button className={"btn-small green-btn"} btnName={"삭제"} />
-            </div>
-                    <ul className="tab-content">
-                      {data
-                        .filter((item) => index === item.id)
-                        .map((item) => (
-                          <li>{item.description}</li>
-                        ))}
-                    </ul>
+              <div className="tab-container">
+                <ul className="tab-menu-mobile">
+                  <div>
+                    <SubTitle
+                      className="margin-bottom"
+                      subtitle={"사용자 선택"}
+                      explanation={"사용자 별로 선택 후 관리할 수 있습니다. "}
+                    />
                   </div>
+                  <select name="" id="" style={{ width: "100%" }}>
+                    <option value="사용자선택">보호자</option>
+                    <option value="사용자선택">보호사</option>
+                    <option value="사용자선택">병원</option>
+                    <option value="사용자선택">지자체</option>
+                    <option value="사용자선택">관리자</option>
+                  </select>
+                </ul>
+                <ul className="tab-menu">
+                  {data.map((item) => (
+                    <li
+                      key={item.id}
+                      className={index === item.id ? "active" : null}
+                      onClick={() => setIndex(item.id)}
+                    >
+                      {item.title}
+                    </li>
+                  ))}
+                </ul>
+                <div className="content-wrap userlist">
+                  <div className="search-management flex-start margin-bottom2">
+                    <select>
+                      <option value="이름">이름</option>
+                      <option value="아이디">사용자등록번호</option>
+                      <option value="아이디">ID</option>
+                    </select>
+                    <input type="text" />
+                    <Button
+                      className={"btn-small gray-btn"}
+                      btnName={"검색"}
+                      onClick={() => navigate("/SeniorInsert")}
+                    />
+                  </div>
+                  <div className="btn-wrap flex-end margin-bottom">
+                    <Button
+                      className={"btn-small gray-btn"}
+                      btnName={"등록"}
+                      onClick={openModal2}
+                    />
+                    <Button className={"btn-small red-btn"} btnName={"삭제"} />
+                  </div>
+                  <ul className="tab-content">
+                    {data
+                      .filter((item) => index === item.id)
+                      .map((item) => (
+                        <li>{item.description}</li>
+                      ))}
+                  </ul>
                 </div>
+              </div>
             </div>
           </div>
         </div>
 
client/views/pages/visit/visit/VisitSelect.jsx (deleted)
--- client/views/pages/visit/visit/VisitSelect.jsx
@@ -1,83 +0,0 @@
-import React from "react";
-import DetailSearch from "../../../component/DetailSearch.jsx";
-import Button from "../../../component/Button.jsx";
-import Table from "../../../component/Table.jsx";
-import { useNavigate } from "react-router";
-import ContentTitle from "../../../component/ContentTitle.jsx";
-import SubTitle from "../../../component/SubTitle.jsx";
-
-export default function VisitSelect() {
-  const navigate = useNavigate();
-
-  //게시판
-  const thead = [
-    "No", "이름","대상자등록번호", "생년월일", "연락처", "주소", ,"최근 방문일","방문목적","상세사유",
-  ];
-  const key = [
-    "No", "name","number", "birth", "phone", "address","visit","reason" ,"reason_detail"
-  ];
-  const content = [
-    {
-      No: 1,
-      name: "김복남",
-      number: "00000001",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      visit: "2023.02.08",
-      reason: "정기방문",
-      reason_detail: "정기방문일",
-    },
-    {
-      No: 2,
-      name: "박영남",
-      number: "00000002",
-      birth: "1948.11.15",
-      phone: "010-1234-5678",
-      address: "경상북도 군위군 삼국유사면",
-      visit: "2023.02.08",
-      reason: "병원동행",
-      reason_detail: "두통을 호소하심",
-    },
-  ];
-  return (
-    <main>
-      <div className="content-wrap">
-        <ContentTitle contentTitle={"방문 조회"} />
-        <DetailSearch />
-        <div className="board-wrap">
-        <div className="flex">
-              <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
-              <div className="flex searchselect">
-                <input type="radio" />
-                <label htmlFor="">나의 대상자 보기</label>
-                <input type="radio" />
-                <label htmlFor="">전체 대상자 보기</label>
-              </div>
-            </div>
-          <div className="visit-table">
-            <Table
-              className={"visit-table"}
-              head={thead}
-              contents={content}
-              contentKey={key}
-              onClick={() => {
-                navigate("/VisitSelectOne");
-              }}
-            />
-          </div>
-          {/* <div className="btn-wrap flex-end">
-            <Button
-              className={"btn-small green-btn"}
-              btnName={"등록"}
-              onClick={() => {
-                navigate("/VisitInsert");
-              }}
-            />
-            <Button className={"btn-small green-btn"} btnName={"삭제"} />
-          </div> */}
-        </div>
-      </div>
-    </main>
-  );
-}
Add a comment
List