Commit @6b90917da812c0c795bea1ad92405b54e071cc96

박정하 2023-11-28

231128 박정하 메인 수정

@6b90917da812c0c795bea1ad92405b54e071cc96

6b90917

.vscode/settings.json (added)

+++ .vscode/settings.json

...	...	@@ -0,0 +1,3 @@
	1	+{
	2	+ "editor.fontFamily": "Consolas, 'Courier New', monospace"
	3	+}(파일 끝에 줄바꿈 문자 없음)

182bd6f

6b90917

client/views/component/Calendar_admin.jsx

--- client/views/component/Calendar_admin.jsx

+++ client/views/component/Calendar_admin.jsx


 import React, { useState } from "react";
-import { useNavigate, useLocation } from "react-router";
-import { useSelector } from "react-redux";
 
 import Calendar from "react-calendar";
 import "react-calendar/dist/Calendar.css";
-import Modal from "./Modal.jsx";
 import moment from "moment";
 
 import CommonUtil from "../../resources/js/CommonUtil.js";
 
 export default function CalendarComponent({ data }) {
-  const navigate = useNavigate();
-  const location = useLocation();
-
   //전역 변수 저장 객체
-  const state = useSelector((state) => { return state });
-
   const [value, setValue] = useState(new Date());
   const activeDate = moment(value).format('YYYY-MM-DD');
 

       temperatureData = '-'
     } else {
       if (todayTemperature.length > 0) {
-        var temperatures = "";
-
         if (moment(date['date']).format("MM") >= 11 || moment(date['date']).format("MM") <= 2) {
-          temperatures = Math.min.apply(null, todayTemperature);
+          temperatureData = Math.min.apply(null, todayTemperature) + '℃';
         } else {
-          temperatures = Math.max.apply(null, todayTemperature);
+          temperatureData = Math.max.apply(null, todayTemperature) + '℃';
         }
-        
-        temperatureData = temperatures + '℃'
       }
     }
 

182bd6f

6b90917

client/views/pages/main/Main_agency.jsx

--- client/views/pages/main/Main_agency.jsx

+++ client/views/pages/main/Main_agency.jsx


   const location = useLocation();
 
   //전역 변수 저장 객체
-  const state = useSelector((state) => { return state });
+  const state = useSelector((state) => {
+    return state;
+  });
 
   const thead = ["No", "계약업체명", "구분", "담당자 연락처", "주소"];
-  const key = ["No", "agency", "division", "phone", "address",];
+  const key = ["No", "agency", "division", "phone", "address"];
   const content = [
     {
       No: (
-        <p><span>{thead[0]}</span>  1948.11.15</p>
+        <p>
+          <span>{thead[0]}</span> 1948.11.15
+        </p>
       ),
       agency: (
-        <p><span>{thead[1]}</span>  A복지관</p>
+        <p>
+          <span>{thead[1]}</span> A복지관
+        </p>
       ),
       division: (
-        <p><span>{thead[2]}</span>교환</p>
+        <p>
+          <span>{thead[2]}</span>교환
+        </p>
       ),
       phone: (
-        <p><span>{thead[3]}</span>010-1234-5678</p>
+        <p>
+          <span>{thead[3]}</span>010-1234-5678
+        </p>
       ),
       address: (
-        <p><span>{thead[4]}</span>경상북도 군위군 삼국유사면</p>
+        <p>
+          <span>{thead[4]}</span>경상북도 군위군 삼국유사면
+        </p>
       ),
     },
   ];

     seniorList: [],
     seniorListCount: 0,
     search: {
-      'agent_id': state.loginUser['user_id'],
-      'user_use': true,
-    }
+      agent_id: state.loginUser["user_id"],
+      user_use: true,
+    },
   });
   // 내 시니어 목록 조회
   const [seniorGenderData, setSeniorGenderData] = React.useState([]);

     fetch("/user/seniorSelectList.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify(mySenior.search),
-    }).then((response) => response.json()).then((data) => {
-      data.search = mySenior.search;
-      console.log("내 시니어 목록 조회 : ", data);
-      setMySenior(data);
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        data.search = mySenior.search;
+        console.log("내 시니어 목록 조회 : ", data);
+        setMySenior(data);
 
-      let seniorGenderArr = [];
-      const today = new Date();
-      data['seniorList'].map((item, idx) => {
-        const birth = new Date(item['user_birth']);
-        let age = today.getFullYear() - birth.getFullYear() + 1;
-        seniorGenderArr.push({ "gender": item['user_gender'], "age": age })
-      })
-      console.log("seniorGenderArr: ", seniorGenderArr)
+        let seniorGenderArr = [];
+        const today = new Date();
+        data["seniorList"].map((item, idx) => {
+          const birth = new Date(item["user_birth"]);
+          let age = today.getFullYear() - birth.getFullYear() + 1;
+          seniorGenderArr.push({ gender: item["user_gender"], age: age });
+        });
+        console.log("seniorGenderArr: ", seniorGenderArr);
 
-      let genderData = [];
-      for (let i = 0; i < 18; i++) {
-        let age = i * 5;
-        let age1 = ((i + 1) * 5) - 1;
-        if (i == 17) {
-          genderData.push({ "age": age + '+', "male": 0, "female": 0 })
-        } else {
-          genderData.push({ "age": age + '-' + age1, "male": 0, "female": 0 })
-        }
-      }
-      console.log("genderData: ", genderData)
-
-      seniorGenderArr.map((item, idx) => {
+        let genderData = [];
         for (let i = 0; i < 18; i++) {
-          if (item['age'] >= i * 5 && item['age'] <= ((i + 1) * 5) - 1) {
-            if (item['gender'] == "남") {
-              genderData[i]['male']--
-            } else if (item['gender'] == "여") {
-              genderData[i]['female']++
-            }
+          let age = i * 5;
+          let age1 = (i + 1) * 5 - 1;
+          if (i == 17) {
+            genderData.push({ age: age + "+", male: 0, female: 0 });
+          } else {
+            genderData.push({ age: age + "-" + age1, male: 0, female: 0 });
           }
         }
-      })
+        console.log("genderData: ", genderData);
 
-      setSeniorGenderData(genderData)
-      console.log("genderData: ", genderData)
-    }).catch((error) => {
-      console.log('seniorSelectList() /user/seniorSelectList.json error : ', error);
-    });
-  }
+        seniorGenderArr.map((item, idx) => {
+          for (let i = 0; i < 18; i++) {
+            if (item["age"] >= i * 5 && item["age"] <= (i + 1) * 5 - 1) {
+              if (item["gender"] == "남") {
+                genderData[i]["male"]--;
+              } else if (item["gender"] == "여") {
+                genderData[i]["female"]++;
+              }
+            }
+          }
+        });
+
+        setSeniorGenderData(genderData);
+        console.log("genderData: ", genderData);
+      })
+      .catch((error) => {
+        console.log(
+          "seniorSelectList() /user/seniorSelectList.json error : ",
+          error
+        );
+      });
+  };
 
   //온도 위험 대상자(시니어) 수 조회
   const [temperatureCount, setTemperatureCount] = React.useState(0);
   const temperatureRiskCount = () => {
-    fetch("/stats/agentTemperatureRisk.json", {
+    fetch("/stats/temperatureRisk.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'agent_id': state.loginUser['user_id'],
+        agent_id: state.loginUser["user_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
-      setTemperatureCount(data);
-    }).catch((error) => {
-      console.log('temperatureRiskCount() /stats/agentTemperatureRisk.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
+        setTemperatureCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "temperatureRiskCount() /stats/temperatureRisk.json error : ",
+          error
+        );
+      });
+  };
 
   //배터리 부족 대상자(시니어) 수 조회
   const [batteryCount, setbatteryCount] = React.useState(0);
   const batteryRiskCount = () => {
-    fetch("/stats/agentBatteryRisk.json", {
+    fetch("/stats/batteryRisk.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'agent_id': state.loginUser['user_id'],
+        agent_id: state.loginUser["user_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
-      setbatteryCount(data);
-    }).catch((error) => {
-      console.log('batteryRiskCount() /stats/agentBatteryRisk.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
+        setbatteryCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "batteryRiskCount() /stats/batteryRisk.json error : ",
+          error
+        );
+      });
+  };
+
+  //데이터 미확인 대상자(시니어) 수 조회
+  const [receiveDataMissCount, setReceiveDataMissCount] = React.useState(0);
+  const receiveDataMissRiskCount = () => {
+    fetch("/stats/receiveDataMissCount.json", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json; charset=UTF-8",
+      },
+      body: JSON.stringify({
+        agent_id: state.loginUser["user_id"],
+      }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("데이터 미확인 대상자(시니어) 수 조회 : ", data);
+        setReceiveDataMissCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "receiveDataMissRiskCount() /stats/receiveDataMissCount.json error : ",
+          error
+        );
+      });
+  };
 
   // 최근 복약률
-  const [medicationSelectListByNew, setMedicationSelectListByNew] = React.useState([]);
+  const [medicationSelectListByNew, setMedicationSelectListByNew] =
+    React.useState([]);
   // 최근 복약률 조회
   const seniorMedicationSelectListByNew = () => {
     fetch("/user/seniorMedicationSelectListByNew.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
-      body: JSON.stringify({ "agent_id": state.loginUser['user_id'] }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("seniorMedicationSelectListByNew : ", data);
-      setMedicationSelectListByNew(data)
-    }).catch((error) => {
-      console.log('seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ', error);
-    });
+      body: JSON.stringify({
+        agent_id: state.loginUser["user_id"],
+      }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("seniorMedicationSelectListByNew : ", data);
+        setMedicationSelectListByNew(data);
+      })
+      .catch((error) => {
+        console.log(
+          "seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ",
+          error
+        );
+      });
   };
 
   // 복약률 목록
-  const [medicationSelectListByMonth, setMedicationSelectListByMonth] = React.useState([]);
-  const [medicationSelectListByYear, setMedicationSelectListByYear] = React.useState([]);
+  const [medicationSelectListByMonth, setMedicationSelectListByMonth] =
+    React.useState([]);
+  const [medicationSelectListByYear, setMedicationSelectListByYear] =
+    React.useState([]);
   // 복약률 목록 조회
   const seniorMedicationSelectListByMonth = () => {
     let totalYearArr = [];

     fetch("/user/seniorMedicationSelectListByMonth.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
-      body: JSON.stringify({ "agency_id": state.loginUser['agency_id'] }),
-    }).then((response) => response.json()).then((data) => {
-      data.map((item, idx) => {
-        item['year'] = item['medication_default_date'].substr(0, 4);
-        item['month'] = item['medication_default_date'].substr(5, 2);
-        totalYearArr.push(item['medication_default_date'].substr(0, 4));
-        item['date'] = new Date(item['medication_default_date']).getTime();
-      })
-
-      const setYearArr = [...new Set(totalYearArr)];
-      console.log("totalYearArr: ", setYearArr);
-
-      setYearArr.map((year, yearIdx) => {
-        let sum = 0;
-        let count = 0;
-        let avg = 0;
-
-        let monthArr = ['-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-'];
-
+      body: JSON.stringify({ agency_id: state.loginUser["agency_id"] }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
         data.map((item, idx) => {
-          if (item['year'] == year) {
-            sum += item['average'];
-            count++;
-            monthArr[Number(item['month']) - 1] = item['average'];
-          }
-        })
+          item["year"] = item["medication_default_date"].substr(0, 4);
+          item["month"] = item["medication_default_date"].substr(5, 2);
+          totalYearArr.push(item["medication_default_date"].substr(0, 4));
+          item["date"] = new Date(item["medication_default_date"]).getTime();
+        });
 
-        avg = parseInt(sum / count);
-        yearArr.push({ "year": [year], "average": avg, "data": monthArr });
+        const setYearArr = [...new Set(totalYearArr)];
+        console.log("totalYearArr: ", setYearArr);
+
+        setYearArr.map((year, yearIdx) => {
+          let sum = 0;
+          let count = 0;
+          let avg = 0;
+
+          let monthArr = [
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+          ];
+
+          data.map((item, idx) => {
+            if (item["year"] == year) {
+              sum += item["average"];
+              count++;
+              monthArr[Number(item["month"]) - 1] = item["average"];
+            }
+          });
+
+          avg = parseInt(sum / count);
+          yearArr.push({ year: [year], average: avg, data: monthArr });
+        });
+
+        console.log("yearArr : ", yearArr);
+        setMedicationSelectListByYear(yearArr);
+
+        console.log("seniorMedicationSelectListByMonth : ", data);
+        setMedicationSelectListByMonth(data);
       })
-
-      console.log("yearArr : ", yearArr);
-      setMedicationSelectListByYear(yearArr);
-
-      console.log("seniorMedicationSelectListByMonth : ", data);
-      setMedicationSelectListByMonth(data);
-    }).catch((error) => {
-      console.log('seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ', error);
-    });
+      .catch((error) => {
+        console.log(
+          "seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ",
+          error
+        );
+      });
   };
-
 
   React.useEffect(() => {
     temperatureRiskCount();
     batteryRiskCount();
+    receiveDataMissRiskCount();
     seniorMedicationSelectListByNew();
     seniorMedicationSelectListByMonth();
     mySeniorSelectList();

 
   return (
     <main>
-      <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"대상자 현황"} explanation={new Date(new Date().setDate(new Date().getDate() - 1)).toLocaleDateString().replace(/\./g, '').replace(/\s/g, '-') + " 기준"} /></div>
+      <div className="flex-start margin-bottom2">
+        <img src={medicinebox} alt="" />
+        <TitleSmall
+          title={"대상자 현황"}
+          explanation={
+            new Date(new Date().setDate(new Date().getDate() - 1))
+              .toLocaleDateString()
+              .replace(/\./g, "")
+              .replace(/\s/g, "-") + " 기준"
+          }
+        />
+      </div>
       <div className="main-grid-agency margin-bottom2">
         <ul className="content-box statistics-agency" background="#8ef3d1">
-          <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
+          <li
+            className="flex-start"
+            onClick={() => {
+              navigate("/Healthcare");
+            }}
+          >
             <img src={medicineAgency} alt="" />
             <div className="text">
               <p>미복약 위험 대상자</p>

             </div>
           </li>
         </ul>
-        <ul className="content-box statistics-agency" background="#ebe7b9" >
-          <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
+        <ul className="content-box statistics-agency" background="#ebe7b9">
+          <li
+            className="flex-start"
+            onClick={() => {
+              navigate("/Healthcare");
+            }}
+          >
             <img src={temperatureAgency} alt="" />
             <div className="text">
               <p>댁내 온도 위험 대상자</p>

           </li>
         </ul>
         <ul className="content-box statistics-agency" background="#5f9af3">
-          <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
+          <li
+            className="flex-start"
+            onClick={() => {
+              navigate("/Healthcare");
+            }}
+          >
             <img src={batteryAgency} alt="" />
             <div className="text">
               <p>배터리 부족 대상자</p>

           </li>
         </ul>
         <ul className="content-box statistics-agency" background="#8080FF">
-          <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
+          <li
+            className="flex-start"
+            onClick={() => {
+              navigate("/Healthcare");
+            }}
+          >
             <img src={wifioff} alt="" />
             <div className="text">
               <p>데이터 미확인 대상자</p>
-              <p className="peoplecount">{batteryCount}</p>
+              <p className="peoplecount">{receiveDataMissCount}</p>
             </div>
           </li>
         </ul>
       </div>
-      <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"대상자 복약률 평균"} /></div>
+      <div className="flex-start margin-bottom2">
+        <img src={medicinebox} alt="" />
+        <TitleSmall title={"대상자 복약률 평균"} />
+      </div>
       <div className="main-grid-agency margin-bottom2">
         <div className="content-box combine-left-government4">
           <div className="height-50">
-            {
-              medicationSelectListByNew.length > 0 ?
-                <Chart10 data={medicationSelectListByMonth} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+            {medicationSelectListByNew.length > 0 ? (
+              <Chart10 data={medicationSelectListByMonth} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
           <div>
             <table className="visit-data-table">

                   medicationSelectListByYear.map((item, idx) => {
                     return (
                       <tr>
-                        <td>{item['year']}</td>
-                        <td>{item['average'] == '-' ? '-' : item['average'] + '%'}</td>
-                        {CommonUtil.isEmpty(item['data']) == false ? (
-                          item['data'].map((item1, idx1) => {
-                            return (
-                              <>
-                                <td>{item1 == '-' ? '-' : item1 + '%'}</td>
-                              </>
-                            )
-                          })
-                        ) : null}
+                        <td>{item["year"]}</td>
+                        <td>
+                          {item["average"] == "-" ? "-" : item["average"] + "%"}
+                        </td>
+                        {CommonUtil.isEmpty(item["data"]) == false
+                          ? item["data"].map((item1, idx1) => {
+                              return (
+                                <>
+                                  <td>{item1 == "-" ? "-" : item1 + "%"}</td>
+                                </>
+                              );
+                            })
+                          : null}
                       </tr>
-                    )
+                    );
                   })
-                ) :
+                ) : (
                   <tr>
                     <td colSpan={14}>데이터가 없습니다.</td>
                   </tr>
-                }
+                )}
               </tbody>
             </table>
           </div>

       </div> */}
       <div className="main-grid-agency2">
         <div>
-          <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"시니어 복약수 순위"} /></div>
+          <div className="flex-start margin-bottom2">
+            <img src={medicinebox} alt="" />
+            <TitleSmall title={"시니어 복약수 순위"} />
+          </div>
           <div className="content-box combine-left-government3 visitlist margin-bottom2">
-            {
-              medicationSelectListByNew.length > 0 ?
-                <Chart8 data={medicationSelectListByNew} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+            {medicationSelectListByNew.length > 0 ? (
+              <Chart8 data={medicationSelectListByNew} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
         <div>
-          <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"연령대별 통계"} /></div>
+          <div className="flex-start margin-bottom2">
+            <img src={medicinebox} alt="" />
+            <TitleSmall title={"연령대별 통계"} />
+          </div>
           <div className="content-box combine-left-government3 visitlist margin-bottom2">
-            {
-              seniorGenderData.length > 0 ?
-                <Chart7 data={seniorGenderData} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+            {seniorGenderData.length > 0 ? (
+              <Chart7 data={seniorGenderData} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
       </div>
-      <div>
-
-      </div>
+      <div></div>
     </main>
   );
 }

182bd6f

6b90917

client/views/pages/main/Main_agencyAdmin.jsx

--- client/views/pages/main/Main_agencyAdmin.jsx

+++ client/views/pages/main/Main_agencyAdmin.jsx


   //온도 위험 대상자(시니어) 수 조회
   const [temperatureCount, setTemperatureCount] = React.useState(0);
   const temperatureRiskCount = () => {
-    fetch("/stats/agencyTemperatureRisk.json", {
+    fetch("/stats/temperatureRisk.json", {
       method: "POST",
       headers: {
         'Content-Type': 'application/json; charset=UTF-8'

       console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
       setTemperatureCount(data);
     }).catch((error) => {
-      console.log('temperatureRiskCount() /stats/agencyTemperatureRisk.json error : ', error);
+      console.log('temperatureRiskCount() /stats/temperatureRisk.json error : ', error);
     });
   }
 
   //배터리 부족 대상자(시니어) 수 조회
   const [batteryCount, setbatteryCount] = React.useState(0);
   const batteryRiskCount = () => {
-    fetch("/stats/agencyBatteryRisk.json", {
+    fetch("/stats/batteryRisk.json", {
       method: "POST",
       headers: {
         'Content-Type': 'application/json; charset=UTF-8'

       console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
       setbatteryCount(data);
     }).catch((error) => {
-      console.log('batteryRiskCount() /stats/agencyBatteryRisk.json error : ', error);
+      console.log('batteryRiskCount() /stats/batteryRisk.json error : ', error);
+    });
+  }
+
+  //데이터 미확인 대상자(시니어) 수 조회
+  const [receiveDataMissCount, setReceiveDataMissCount] = React.useState(0);
+  const receiveDataMissRiskCount = () => {
+    fetch("/stats/receiveDataMissCount.json", {
+      method: "POST",
+      headers: {
+        'Content-Type': 'application/json; charset=UTF-8'
+      },
+      body: JSON.stringify({
+        'agency_id': state.loginUser['agency_id'],
+      }),
+    }).then((response) => response.json()).then((data) => {
+      console.log("데이터 미확인 대상자(시니어) 수 조회 : ", data);
+      setReceiveDataMissCount(data);
+    }).catch((error) => {
+      console.log('receiveDataMissRiskCount() /stats/receiveDataMissCount.json error : ', error);
     });
   }
 

     seniorSelectList();
     temperatureRiskCount();
     batteryRiskCount();
+    receiveDataMissRiskCount();
     visitByMonthList();
     seniorByAgent();
     seniorMedicationSelectListByNew();

             <li onClick={() => { navigate("/HealthcareAdmin") }}>
               <p><WifiOffIcon sx={{ width: "50px", height: "50px", padding: "5px", color: "#ffffff", background: "#8080FF", borderRadius: "50px", boxSizing: "border-box" }} /></p>
               <p>{cityName} 데이터 미확인 대상자 </p>
-              <p>{batteryCount}</p>
+              <p>{receiveDataMissCount}</p>
             </li>
           </ul>
         </div>

182bd6f

6b90917

client/views/pages/main/Main_government.jsx

--- client/views/pages/main/Main_government.jsx

+++ client/views/pages/main/Main_government.jsx


 import { useNavigate, useLocation } from "react-router";
 import { useSelector } from "react-redux";
 
-
-
-import { MapContainer, TileLayer, LayerGroup, Marker, Circle, CircleMarker, Tooltip, Popup, useMap } from 'react-leaflet';
-import L, { CRS, latLng, bounds } from 'leaflet';
-
+import {
+  MapContainer,
+  TileLayer,
+  LayerGroup,
+  Marker,
+  Circle,
+  CircleMarker,
+  Tooltip,
+  Popup,
+  useMap,
+} from "react-leaflet";
+import L, { CRS, latLng, bounds } from "leaflet";
 
 import Title from "../../component/Title.jsx";
 /* import Map from "../../component/chart/Map.jsx"; */

 import Chart8 from "../../component/chart/Chart8.jsx";
 import RowChart_govern from "../../component/chart/RowChart_govern.jsx";
 import AddCircleIcon from "@mui/icons-material/AddCircle";
-import BatteryCharging20Icon from '@mui/icons-material/BatteryCharging20';
-import DeviceThermostatIcon from '@mui/icons-material/DeviceThermostat';
-import MedicationIcon from '@mui/icons-material/Medication';
-import ElderlyIcon from '@mui/icons-material/Elderly';
-import WifiOffIcon from '@mui/icons-material/WifiOff';
+import BatteryCharging20Icon from "@mui/icons-material/BatteryCharging20";
+import DeviceThermostatIcon from "@mui/icons-material/DeviceThermostat";
+import MedicationIcon from "@mui/icons-material/Medication";
+import ElderlyIcon from "@mui/icons-material/Elderly";
+import WifiOffIcon from "@mui/icons-material/WifiOff";
 
 import CommonUtil from "../../../resources/js/CommonUtil.js";
 

   const location = useLocation();
 
   //전역 변수 저장 객체
-  const state = useSelector((state) => { return state });
+  const state = useSelector((state) => {
+    return state;
+  });
 
-  const [cityName, setCityName] = useState(state.loginUser['government_name']);
+  const [cityName, setCityName] = useState(state.loginUser["government_name"]);
 
   //대상자(시니어) 목록 조회
-  const [senior, setSenior] = React.useState({ userList: [], userListCount: 0 });
+  const [senior, setSenior] = React.useState({
+    userList: [],
+    userListCount: 0,
+  });
   const seniorSelectList = () => {
     fetch("/user/userSelectList.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
-        'agency_id': state.loginUser['agency_id'],
-        'authority': 'ROLE_SENIOR',
+        government_id: state.loginUser["government_id"],
+        agency_id: state.loginUser["agency_id"],
+        authority: "ROLE_SENIOR",
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("대상자(시니어) 목록 조회 : ", data);
-      setSenior(data);
-    }).catch((error) => {
-      console.log('seniorSelectList() /user/userSelectList.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("대상자(시니어) 목록 조회 : ", data);
+        setSenior(data);
+      })
+      .catch((error) => {
+        console.log(
+          "seniorSelectList() /user/userSelectList.json error : ",
+          error
+        );
+      });
+  };
 
   //온도 위험 대상자(시니어) 수 조회
   const [temperatureCount, setTemperatureCount] = React.useState(0);
   const temperatureRiskCount = () => {
-    fetch("/stats/governmentTemperatureRisk.json", {
+    fetch("/stats/temperatureRisk.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
+        government_id: state.loginUser["government_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
-      setTemperatureCount(data);
-    }).catch((error) => {
-      console.log('temperatureRiskCount() /stats/governmentTemperatureRisk.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
+        setTemperatureCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "temperatureRiskCount() /stats/temperatureRisk.json error : ",
+          error
+        );
+      });
+  };
 
   //배터리 부족 대상자(시니어) 수 조회
   const [batteryCount, setbatteryCount] = React.useState(0);
   const batteryRiskCount = () => {
-    fetch("/stats/governmentBatteryRisk.json", {
+    fetch("/stats/batteryRisk.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
+        government_id: state.loginUser["government_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
-      setbatteryCount(data);
-    }).catch((error) => {
-      console.log('batteryRiskCount() /stats/governmentBatteryRisk.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
+        setbatteryCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "batteryRiskCount() /stats/batteryRisk.json error : ",
+          error
+        );
+      });
+  };
+
+  //데이터 미확인 대상자(시니어) 수 조회
+  const [receiveDataMissCount, setReceiveDataMissCount] = React.useState(0);
+  const receiveDataMissRiskCount = () => {
+    fetch("/stats/receiveDataMissCount.json", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json; charset=UTF-8",
+      },
+      body: JSON.stringify({
+        government_id: state.loginUser["government_id"],
+      }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("데이터 미확인 대상자(시니어) 수 조회 : ", data);
+        setReceiveDataMissCount(data);
+      })
+      .catch((error) => {
+        console.log(
+          "receiveDataMissRiskCount() /stats/receiveDataMissCount.json error : ",
+          error
+        );
+      });
+  };
 
   //월별 방문 횟수 조회
   const [visit, setVisit] = React.useState([]);

     fetch("/stats/visitByMonthList.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
+        government_id: state.loginUser["government_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("월별 방문 횟수 조회 : ", data);
-      setVisit(data);
-    }).catch((error) => {
-      console.log('visitByMonthList() /stats/visitByMonthList.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("월별 방문 횟수 조회 : ", data);
+        setVisit(data);
+      })
+      .catch((error) => {
+        console.log(
+          "visitByMonthList() /stats/visitByMonthList.json error : ",
+          error
+        );
+      });
+  };
 
   //시행 기관별 약상자 사용 현황
   const [equipmentUsage, setEquipmentUsage] = React.useState([]);

     fetch("/stats/equipmentByAgency.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
+        government_id: state.loginUser["government_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("시행기관별 약상자 사용 현황 : ", data);
-      let newEquipmentList = updateList(data['agencyList'], data['equipmentList']);
-      console.log("new equipment list", newEquipmentList);
-      setEquipmentUsage(newEquipmentList);
-    }).catch((error) => {
-      console.log('equipmentByAgency() /stats/equipmentByAgency.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("시행기관별 약상자 사용 현황 : ", data);
+        let newEquipmentList = updateList(
+          data["agencyList"],
+          data["equipmentList"]
+        );
+        console.log("new equipment list", newEquipmentList);
+        setEquipmentUsage(newEquipmentList);
+      })
+      .catch((error) => {
+        console.log(
+          "equipmentByAgency() /stats/equipmentByAgency.json error : ",
+          error
+        );
+      });
+  };
 
   //시행 기관별 대상자(시니어) 등록 현황
   const [seniorEnroll, setSeniorEnroll] = React.useState([]);

     fetch("/stats/seniorByAgency.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
-        'government_id': state.loginUser['government_id'],
+        government_id: state.loginUser["government_id"],
       }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("시행기관별 시니어 등록 현황 : ", data);
-      let newSeniorList = updateList(data['agencyList'], data['seniorList']);
-      console.log("new senior list", newSeniorList);
-      setSeniorEnroll(newSeniorList);
-    }).catch((error) => {
-      console.log('seniorByAgency() /stats/seniorByAgency.json error : ', error);
-    });
-  }
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("시행기관별 시니어 등록 현황 : ", data);
+        let newSeniorList = updateList(data["agencyList"], data["seniorList"]);
+        console.log("new senior list", newSeniorList);
+        setSeniorEnroll(newSeniorList);
+      })
+      .catch((error) => {
+        console.log(
+          "seniorByAgency() /stats/seniorByAgency.json error : ",
+          error
+        );
+      });
+  };
 
   // 최근 복약률
-  const [medicationSelectListByNew, setMedicationSelectListByNew] = React.useState([]);
+  const [medicationSelectListByNew, setMedicationSelectListByNew] =
+    React.useState([]);
   // 최근 복약률 조회
   const seniorMedicationSelectListByNew = () => {
     fetch("/user/seniorMedicationSelectListByNew.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
-      body: JSON.stringify({ "government_id": state.loginUser['government_id'] }),
-    }).then((response) => response.json()).then((data) => {
-      console.log("seniorMedicationSelectListByNew : ", data);
-      setMedicationSelectListByNew(data)
-    }).catch((error) => {
-      console.log('seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ', error);
-    });
+      body: JSON.stringify({ government_id: state.loginUser["government_id"] }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
+        console.log("seniorMedicationSelectListByNew : ", data);
+        setMedicationSelectListByNew(data);
+      })
+      .catch((error) => {
+        console.log(
+          "seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ",
+          error
+        );
+      });
   };
 
   // 복약률 목록
-  const [medicationSelectListByMonth, setMedicationSelectListByMonth] = React.useState([]);
-  const [medicationSelectListByYear, setMedicationSelectListByYear] = React.useState([]);
+  const [medicationSelectListByMonth, setMedicationSelectListByMonth] =
+    React.useState([]);
+  const [medicationSelectListByYear, setMedicationSelectListByYear] =
+    React.useState([]);
   // 복약률 목록 조회
   const seniorMedicationSelectListByMonth = () => {
     let totalYearArr = [];

     fetch("/user/seniorMedicationSelectListByMonth.json", {
       method: "POST",
       headers: {
-        'Content-Type': 'application/json; charset=UTF-8'
+        "Content-Type": "application/json; charset=UTF-8",
       },
-      body: JSON.stringify({ "government_id": state.loginUser['government_id'] }),
-    }).then((response) => response.json()).then((data) => {
-      data.map((item, idx) => {
-        item['year'] = item['medication_default_date'].substr(0, 4);
-        item['month'] = item['medication_default_date'].substr(5, 2);
-        totalYearArr.push(item['medication_default_date'].substr(0, 4));
-        item['date'] = new Date(item['medication_default_date']).getTime();
-      })
-
-      const setYearArr = [...new Set(totalYearArr)];
-      console.log("totalYearArr: ", setYearArr);
-
-      setYearArr.map((year, yearIdx) => {
-        let sum = 0;
-        let count = 0;
-        let avg = 0;
-
-        let monthArr = ['-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-'];
-
+      body: JSON.stringify({ government_id: state.loginUser["government_id"] }),
+    })
+      .then((response) => response.json())
+      .then((data) => {
         data.map((item, idx) => {
-          if (item['year'] == year) {
-            sum += item['average'];
-            count++;
-            monthArr[Number(item['month']) - 1] = item['average'];
-          }
-        })
+          item["year"] = item["medication_default_date"].substr(0, 4);
+          item["month"] = item["medication_default_date"].substr(5, 2);
+          totalYearArr.push(item["medication_default_date"].substr(0, 4));
+          item["date"] = new Date(item["medication_default_date"]).getTime();
+        });
 
-        avg = parseInt(sum / count);
-        yearArr.push({ "year": [year], "average": avg, "data": monthArr });
+        const setYearArr = [...new Set(totalYearArr)];
+        console.log("totalYearArr: ", setYearArr);
+
+        setYearArr.map((year, yearIdx) => {
+          let sum = 0;
+          let count = 0;
+          let avg = 0;
+
+          let monthArr = [
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+            "-",
+          ];
+
+          data.map((item, idx) => {
+            if (item["year"] == year) {
+              sum += item["average"];
+              count++;
+              monthArr[Number(item["month"]) - 1] = item["average"];
+            }
+          });
+
+          avg = parseInt(sum / count);
+          yearArr.push({ year: [year], average: avg, data: monthArr });
+        });
+
+        console.log("yearArr : ", yearArr);
+        setMedicationSelectListByYear(yearArr);
+
+        console.log("seniorMedicationSelectListByMonth : ", data);
+        setMedicationSelectListByMonth(data);
       })
-
-      console.log("yearArr : ", yearArr);
-      setMedicationSelectListByYear(yearArr);
-
-      console.log("seniorMedicationSelectListByMonth : ", data);
-      setMedicationSelectListByMonth(data);
-    }).catch((error) => {
-      console.log('seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ', error);
-    });
+      .catch((error) => {
+        console.log(
+          "seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ",
+          error
+        );
+      });
   };
-
 
   function updateList(agencyList, countList) {
     const result = [];

           break;
         }
       }
-      result.push({ agency_id: agency.agency_id, agency_name: agency.agency_name, count: count });
+      result.push({
+        agency_id: agency.agency_id,
+        agency_name: agency.agency_name,
+        count: count,
+      });
     }
     return result;
   }
 
-
-
   const iconHouse = new L.Icon({
-    iconUrl: '/client/resources/files/images/house.png',
-    iconRetinaUrl: '/client/resources/files/images/house.png',
+    iconUrl: "/client/resources/files/images/house.png",
+    iconRetinaUrl: "/client/resources/files/images/house.png",
     iconSize: [20, 20],
-    className: 'leaflet-background-radius-icon'//leaflet-div-icon
+    className: "leaflet-background-radius-icon", //leaflet-div-icon
   });
 
   React.useEffect(() => {
     seniorSelectList();
     temperatureRiskCount();
     batteryRiskCount();
+    receiveDataMissRiskCount();
     visitByMonthList();
     equipmentByAgency();
     seniorByAgency();

         <div className="sub-grid-government">
           <ul className="content-box statistics-govern" background="#8ef3d1">
             <li>
-              <p><MedicationIcon sx={{ width: "50px", height: "50px", color: "#ffffff", background: "#076143", borderRadius: "50px" }} /></p>
+              <p>
+                <MedicationIcon
+                  sx={{
+                    width: "50px",
+                    height: "50px",
+                    color: "#ffffff",
+                    background: "#076143",
+                    borderRadius: "50px",
+                  }}
+                />
+              </p>
               <p>{cityName} 미복약 위험 대상자</p>
               <p>0</p>
             </li>
           </ul>
-          <ul className="content-box statistics-govern" background="#ebe7b9" >
+          <ul className="content-box statistics-govern" background="#ebe7b9">
             <li>
-              <p><DeviceThermostatIcon sx={{ width: "50px", height: "50px", color: "#ffffff", background: "#f1de05", borderRadius: "50px" }} /></p>
+              <p>
+                <DeviceThermostatIcon
+                  sx={{
+                    width: "50px",
+                    height: "50px",
+                    color: "#ffffff",
+                    background: "#f1de05",
+                    borderRadius: "50px",
+                  }}
+                />
+              </p>
               <p>{cityName} 댁내 온도 위험 대상자</p>
-              <p className={temperatureCount > 0 ? "red" : null}>{temperatureCount}</p>
+              <p className={temperatureCount > 0 ? "red" : null}>
+                {temperatureCount}
+              </p>
             </li>
           </ul>
           <ul className="content-box statistics-govern" background="#5f9af3">
             <li>
-              <p><BatteryCharging20Icon sx={{ width: "50px", height: "50px", color: "#ffffff", background: "#5f9af3", borderRadius: "50px" }} /></p>
+              <p>
+                <BatteryCharging20Icon
+                  sx={{
+                    width: "50px",
+                    height: "50px",
+                    color: "#ffffff",
+                    background: "#5f9af3",
+                    borderRadius: "50px",
+                  }}
+                />
+              </p>
               <p>{cityName} 배터리 부족 대상자 </p>
               <p>{batteryCount}</p>
             </li>
           </ul>
           <ul className="content-box statistics-govern" background="#8080FF">
             <li>
-              <p><WifiOffIcon sx={{ width: "50px", height: "50px", padding: "5px", color: "#ffffff", background: "#8080FF", borderRadius: "50px", boxSizing: "border-box" }} /></p>
+              <p>
+                <WifiOffIcon
+                  sx={{
+                    width: "50px",
+                    height: "50px",
+                    padding: "5px",
+                    color: "#ffffff",
+                    background: "#8080FF",
+                    borderRadius: "50px",
+                    boxSizing: "border-box",
+                  }}
+                />
+              </p>
               <p>{cityName} 데이터 미확인 대상자 </p>
-              <p>{batteryCount}</p>
+              <p>{receiveDataMissCount}</p>
             </li>
           </ul>
         </div>
         <div className="content-box combine-left-government combine-bottom-government2 main-main">
           <div className="flex">
-            <Title title={"지역별 케어 대상자 분포 현황"} explanation={"지역 선택 시 해당 지역의 대상자리스트가 보여집니다."} />
+            <Title
+              title={"지역별 케어 대상자 분포 현황"}
+              explanation={
+                "지역 선택 시 해당 지역의 대상자리스트가 보여집니다."
+              }
+            />
           </div>
-          <div style={{ height: 'calc(100% - 60px)' }}>
-            <MapContainer center={latLng(35.8713802646197, 128.601805491072)} zoom={13} scrollWheelZoom={true} style={{ height: '100%' }}>
+          <div style={{ height: "calc(100% - 60px)" }}>
+            <MapContainer
+              center={latLng(35.8713802646197, 128.601805491072)}
+              zoom={13}
+              scrollWheelZoom={true}
+              style={{ height: "100%" }}
+            >
               <TileLayer
                 attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
                 url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"

 
               <LayerGroup>
                 {senior.userList.map((item, idx) => {
-                  return item['y'] != null && item['x'] != null ? (
-                    <Marker position={[item['y'], item['x']]} icon={iconHouse}>
+                  return item["y"] != null && item["x"] != null ? (
+                    <Marker position={[item["y"], item["x"]]} icon={iconHouse}>
                       <Popup>
                         <div>
-                          {item['user_name']}({item['user_birth']} - {item['user_gender']})
+                          {item["user_name"]}({item["user_birth"]} -{" "}
+                          {item["user_gender"]})
                         </div>
                       </Popup>
                     </Marker>
-                  ) : null
+                  ) : null;
                 })}
               </LayerGroup>
             </MapContainer>

           <div className="flex">
             <Title title={`${cityName}  복약수 순위`} />
           </div>
-          <div style={{ height: 'calc(100% - 60px)' }}>
-            {
-              medicationSelectListByNew.length > 0 ?
-                <Chart8 data={medicationSelectListByNew} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+          <div style={{ height: "calc(100% - 60px)" }}>
+            {medicationSelectListByNew.length > 0 ? (
+              <Chart8 data={medicationSelectListByNew} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
-        <div className="content-box combine-left-government2" style={{ minHeight: '300px' }}>
+        <div
+          className="content-box combine-left-government2"
+          style={{ minHeight: "300px" }}
+        >
           <div className="flex">
-            <Title title={`${cityName} 복약률 평균`} explanation={"해당 지역의 대상자 복약률이 그래프로 보여집니다."} />
+            <Title
+              title={`${cityName} 복약률 평균`}
+              explanation={"해당 지역의 대상자 복약률이 그래프로 보여집니다."}
+            />
           </div>
-          <div style={{ height: 'calc(100% - 60px)' }}>
-            {
-              medicationSelectListByMonth.length > 0 ?
-                <Chart2_govern data={medicationSelectListByMonth} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+          <div style={{ height: "calc(100% - 60px)" }}>
+            {medicationSelectListByMonth.length > 0 ? (
+              <Chart2_govern data={medicationSelectListByMonth} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
         <div className="content-box combine-right-government2">
           <div className="flex">
-            <Title title={`기관별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
+            <Title
+              title={`기관별 대상자 등록 현황`}
+              explanation={"약상자 사용자의 데이터 차트가 보여집니다."}
+            />
           </div>
-          <div style={{ height: 'calc(100% - 60px)' }}>
-            {
-              seniorEnroll.length > 0 ?
-                <Chart5 data={seniorEnroll} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+          <div style={{ height: "calc(100% - 60px)" }}>
+            {seniorEnroll.length > 0 ? (
+              <Chart5 data={seniorEnroll} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
         <div className="content-box combine-right-government">
           <div className="flex">
             <Title title={`기관별 약상자 사용 현황`} explanation={""} />
           </div>
-          <div style={{ height: 'calc(100% - 60px)' }}>
-            {
-              equipmentUsage.length > 0 ?
-                <Donut1_govern data={equipmentUsage} />
-                : <div className="no-data"><p>데이터가 없습니다.</p></div>
-            }
+          <div style={{ height: "calc(100% - 60px)" }}>
+            {equipmentUsage.length > 0 ? (
+              <Donut1_govern data={equipmentUsage} />
+            ) : (
+              <div className="no-data">
+                <p>데이터가 없습니다.</p>
+              </div>
+            )}
           </div>
         </div>
         <div className="content-box span4 table-size-fix">

               {medicationSelectListByYear.map((item, idx) => {
                 return (
                   <tr>
-                    <td>{item['year']}</td>
-                    <td>{item['average'] == '-' ? '-' : item['average'] + '%'}</td>
-                    {CommonUtil.isEmpty(item['data']) == false ? (
-                      item['data'].map((item1, idx1) => {
-                        return (
-                          <>
-                            <td>{item1 == '-' ? '-' : item1 + '%'}</td>
-                          </>
-                        )
-                      })
-                    ) : null}
+                    <td>{item["year"]}</td>
+                    <td>
+                      {item["average"] == "-" ? "-" : item["average"] + "%"}
+                    </td>
+                    {CommonUtil.isEmpty(item["data"]) == false
+                      ? item["data"].map((item1, idx1) => {
+                          return (
+                            <>
+                              <td>{item1 == "-" ? "-" : item1 + "%"}</td>
+                            </>
+                          );
+                        })
+                      : null}
                   </tr>
-                )
+                );
               })}
             </tbody>
           </table>

Add a comment

Open 0
Closed 0

List

...	...	@@ -1,21 +1,13 @@
1	1	import React, { useState } from "react";
2		-import { useNavigate, useLocation } from "react-router";
3		-import { useSelector } from "react-redux";
4	2
5	3	import Calendar from "react-calendar";
6	4	import "react-calendar/dist/Calendar.css";
7		-import Modal from "./Modal.jsx";
8	5	import moment from "moment";
9	6
10	7	import CommonUtil from "../../resources/js/CommonUtil.js";
11	8
12	9	export default function CalendarComponent({ data }) {
13		- const navigate = useNavigate();
14		- const location = useLocation();
15		-
16	10	//전역 변수 저장 객체
17		- const state = useSelector((state) => { return state });
18		-
19	11	const [value, setValue] = useState(new Date());
20	12	const activeDate = moment(value).format('YYYY-MM-DD');
21	13
...	...	@@ -68,15 +60,11 @@
68	60	temperatureData = '-'
69	61	} else {
70	62	if (todayTemperature.length > 0) {
71		- var temperatures = "";
72		-
73	63	if (moment(date['date']).format("MM") >= 11 \|\| moment(date['date']).format("MM") <= 2) {
74		- temperatures = Math.min.apply(null, todayTemperature);
	64	+ temperatureData = Math.min.apply(null, todayTemperature) + '℃';
75	65	} else {
76		- temperatures = Math.max.apply(null, todayTemperature);
	66	+ temperatureData = Math.max.apply(null, todayTemperature) + '℃';
77	67	}
78		-
79		- temperatureData = temperatures + '℃'
80	68	}
81	69	}
82	70

...	...	@@ -30,26 +30,38 @@
30	30	const location = useLocation();
31	31
32	32	//전역 변수 저장 객체
33		- const state = useSelector((state) => { return state });
	33	+ const state = useSelector((state) => {
	34	+ return state;
	35	+ });
34	36
35	37	const thead = ["No", "계약업체명", "구분", "담당자 연락처", "주소"];
36		- const key = ["No", "agency", "division", "phone", "address",];
	38	+ const key = ["No", "agency", "division", "phone", "address"];
37	39	const content = [
38	40	{
39	41	No: (
40		- <p><span>{thead[0]}</span> 1948.11.15</p>
	42	+ <p>
	43	+ <span>{thead[0]}</span> 1948.11.15
	44	+ </p>
41	45	),
42	46	agency: (
43		- <p><span>{thead[1]}</span> A복지관</p>
	47	+ <p>
	48	+ <span>{thead[1]}</span> A복지관
	49	+ </p>
44	50	),
45	51	division: (
46		- <p><span>{thead[2]}</span>교환</p>
	52	+ <p>
	53	+ <span>{thead[2]}</span>교환
	54	+ </p>
47	55	),
48	56	phone: (
49		- <p><span>{thead[3]}</span>010-1234-5678</p>
	57	+ <p>
	58	+ <span>{thead[3]}</span>010-1234-5678
	59	+ </p>
50	60	),
51	61	address: (
52		- <p><span>{thead[4]}</span>경상북도 군위군 삼국유사면</p>
	62	+ <p>
	63	+ <span>{thead[4]}</span>경상북도 군위군 삼국유사면
	64	+ </p>
53	65	),
54	66	},
55	67	];
...	...	@@ -59,9 +71,9 @@
59	71	seniorList: [],
60	72	seniorListCount: 0,
61	73	search: {
62		- 'agent_id': state.loginUser['user_id'],
63		- 'user_use': true,
64		- }
	74	+ agent_id: state.loginUser["user_id"],
	75	+ user_use: true,
	76	+ },
65	77	});
66	78	// 내 시니어 목록 조회
67	79	const [seniorGenderData, setSeniorGenderData] = React.useState([]);
...	...	@@ -69,113 +81,167 @@
69	81	fetch("/user/seniorSelectList.json", {
70	82	method: "POST",
71	83	headers: {
72		- 'Content-Type': 'application/json; charset=UTF-8'
	84	+ "Content-Type": "application/json; charset=UTF-8",
73	85	},
74	86	body: JSON.stringify(mySenior.search),
75		- }).then((response) => response.json()).then((data) => {
76		- data.search = mySenior.search;
77		- console.log("내 시니어 목록 조회 : ", data);
78		- setMySenior(data);
	87	+ })
	88	+ .then((response) => response.json())
	89	+ .then((data) => {
	90	+ data.search = mySenior.search;
	91	+ console.log("내 시니어 목록 조회 : ", data);
	92	+ setMySenior(data);
79	93
80		- let seniorGenderArr = [];
81		- const today = new Date();
82		- data['seniorList'].map((item, idx) => {
83		- const birth = new Date(item['user_birth']);
84		- let age = today.getFullYear() - birth.getFullYear() + 1;
85		- seniorGenderArr.push({ "gender": item['user_gender'], "age": age })
86		- })
87		- console.log("seniorGenderArr: ", seniorGenderArr)
	94	+ let seniorGenderArr = [];
	95	+ const today = new Date();
	96	+ data["seniorList"].map((item, idx) => {
	97	+ const birth = new Date(item["user_birth"]);
	98	+ let age = today.getFullYear() - birth.getFullYear() + 1;
	99	+ seniorGenderArr.push({ gender: item["user_gender"], age: age });
	100	+ });
	101	+ console.log("seniorGenderArr: ", seniorGenderArr);
88	102
89		- let genderData = [];
90		- for (let i = 0; i < 18; i++) {
91		- let age = i * 5;
92		- let age1 = ((i + 1) * 5) - 1;
93		- if (i == 17) {
94		- genderData.push({ "age": age + '+', "male": 0, "female": 0 })
95		- } else {
96		- genderData.push({ "age": age + '-' + age1, "male": 0, "female": 0 })
97		- }
98		- }
99		- console.log("genderData: ", genderData)
100		-
101		- seniorGenderArr.map((item, idx) => {
	103	+ let genderData = [];
102	104	for (let i = 0; i < 18; i++) {
103		- if (item['age'] >= i * 5 && item['age'] <= ((i + 1) * 5) - 1) {
104		- if (item['gender'] == "남") {
105		- genderData[i]['male']--
106		- } else if (item['gender'] == "여") {
107		- genderData[i]['female']++
108		- }
	105	+ let age = i * 5;
	106	+ let age1 = (i + 1) * 5 - 1;
	107	+ if (i == 17) {
	108	+ genderData.push({ age: age + "+", male: 0, female: 0 });
	109	+ } else {
	110	+ genderData.push({ age: age + "-" + age1, male: 0, female: 0 });
109	111	}
110	112	}
111		- })
	113	+ console.log("genderData: ", genderData);
112	114
113		- setSeniorGenderData(genderData)
114		- console.log("genderData: ", genderData)
115		- }).catch((error) => {
116		- console.log('seniorSelectList() /user/seniorSelectList.json error : ', error);
117		- });
118		- }
	115	+ seniorGenderArr.map((item, idx) => {
	116	+ for (let i = 0; i < 18; i++) {
	117	+ if (item["age"] >= i * 5 && item["age"] <= (i + 1) * 5 - 1) {
	118	+ if (item["gender"] == "남") {
	119	+ genderData[i]["male"]--;
	120	+ } else if (item["gender"] == "여") {
	121	+ genderData[i]["female"]++;
	122	+ }
	123	+ }
	124	+ }
	125	+ });
	126	+
	127	+ setSeniorGenderData(genderData);
	128	+ console.log("genderData: ", genderData);
	129	+ })
	130	+ .catch((error) => {
	131	+ console.log(
	132	+ "seniorSelectList() /user/seniorSelectList.json error : ",
	133	+ error
	134	+ );
	135	+ });
	136	+ };
119	137
120	138	//온도 위험 대상자(시니어) 수 조회
121	139	const [temperatureCount, setTemperatureCount] = React.useState(0);
122	140	const temperatureRiskCount = () => {
123		- fetch("/stats/agentTemperatureRisk.json", {
	141	+ fetch("/stats/temperatureRisk.json", {
124	142	method: "POST",
125	143	headers: {
126		- 'Content-Type': 'application/json; charset=UTF-8'
	144	+ "Content-Type": "application/json; charset=UTF-8",
127	145	},
128	146	body: JSON.stringify({
129		- 'agent_id': state.loginUser['user_id'],
	147	+ agent_id: state.loginUser["user_id"],
130	148	}),
131		- }).then((response) => response.json()).then((data) => {
132		- console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
133		- setTemperatureCount(data);
134		- }).catch((error) => {
135		- console.log('temperatureRiskCount() /stats/agentTemperatureRisk.json error : ', error);
136		- });
137		- }
	149	+ })
	150	+ .then((response) => response.json())
	151	+ .then((data) => {
	152	+ console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
	153	+ setTemperatureCount(data);
	154	+ })
	155	+ .catch((error) => {
	156	+ console.log(
	157	+ "temperatureRiskCount() /stats/temperatureRisk.json error : ",
	158	+ error
	159	+ );
	160	+ });
	161	+ };
138	162
139	163	//배터리 부족 대상자(시니어) 수 조회
140	164	const [batteryCount, setbatteryCount] = React.useState(0);
141	165	const batteryRiskCount = () => {
142		- fetch("/stats/agentBatteryRisk.json", {
	166	+ fetch("/stats/batteryRisk.json", {
143	167	method: "POST",
144	168	headers: {
145		- 'Content-Type': 'application/json; charset=UTF-8'
	169	+ "Content-Type": "application/json; charset=UTF-8",
146	170	},
147	171	body: JSON.stringify({
148		- 'agent_id': state.loginUser['user_id'],
	172	+ agent_id: state.loginUser["user_id"],
149	173	}),
150		- }).then((response) => response.json()).then((data) => {
151		- console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
152		- setbatteryCount(data);
153		- }).catch((error) => {
154		- console.log('batteryRiskCount() /stats/agentBatteryRisk.json error : ', error);
155		- });
156		- }
	174	+ })
	175	+ .then((response) => response.json())
	176	+ .then((data) => {
	177	+ console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
	178	+ setbatteryCount(data);
	179	+ })
	180	+ .catch((error) => {
	181	+ console.log(
	182	+ "batteryRiskCount() /stats/batteryRisk.json error : ",
	183	+ error
	184	+ );
	185	+ });
	186	+ };
	187	+
	188	+ //데이터 미확인 대상자(시니어) 수 조회
	189	+ const [receiveDataMissCount, setReceiveDataMissCount] = React.useState(0);
	190	+ const receiveDataMissRiskCount = () => {
	191	+ fetch("/stats/receiveDataMissCount.json", {
	192	+ method: "POST",
	193	+ headers: {
	194	+ "Content-Type": "application/json; charset=UTF-8",
	195	+ },
	196	+ body: JSON.stringify({
	197	+ agent_id: state.loginUser["user_id"],
	198	+ }),
	199	+ })
	200	+ .then((response) => response.json())
	201	+ .then((data) => {
	202	+ console.log("데이터 미확인 대상자(시니어) 수 조회 : ", data);
	203	+ setReceiveDataMissCount(data);
	204	+ })
	205	+ .catch((error) => {
	206	+ console.log(
	207	+ "receiveDataMissRiskCount() /stats/receiveDataMissCount.json error : ",
	208	+ error
	209	+ );
	210	+ });
	211	+ };
157	212
158	213	// 최근 복약률
159		- const [medicationSelectListByNew, setMedicationSelectListByNew] = React.useState([]);
	214	+ const [medicationSelectListByNew, setMedicationSelectListByNew] =
	215	+ React.useState([]);
160	216	// 최근 복약률 조회
161	217	const seniorMedicationSelectListByNew = () => {
162	218	fetch("/user/seniorMedicationSelectListByNew.json", {
163	219	method: "POST",
164	220	headers: {
165		- 'Content-Type': 'application/json; charset=UTF-8'
	221	+ "Content-Type": "application/json; charset=UTF-8",
166	222	},
167		- body: JSON.stringify({ "agent_id": state.loginUser['user_id'] }),
168		- }).then((response) => response.json()).then((data) => {
169		- console.log("seniorMedicationSelectListByNew : ", data);
170		- setMedicationSelectListByNew(data)
171		- }).catch((error) => {
172		- console.log('seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ', error);
173		- });
	223	+ body: JSON.stringify({
	224	+ agent_id: state.loginUser["user_id"],
	225	+ }),
	226	+ })
	227	+ .then((response) => response.json())
	228	+ .then((data) => {
	229	+ console.log("seniorMedicationSelectListByNew : ", data);
	230	+ setMedicationSelectListByNew(data);
	231	+ })
	232	+ .catch((error) => {
	233	+ console.log(
	234	+ "seniorMedicationSelectListByNew() /user/seniorMedicationSelectListByNew.json error : ",
	235	+ error
	236	+ );
	237	+ });
174	238	};
175	239
176	240	// 복약률 목록
177		- const [medicationSelectListByMonth, setMedicationSelectListByMonth] = React.useState([]);
178		- const [medicationSelectListByYear, setMedicationSelectListByYear] = React.useState([]);
	241	+ const [medicationSelectListByMonth, setMedicationSelectListByMonth] =
	242	+ React.useState([]);
	243	+ const [medicationSelectListByYear, setMedicationSelectListByYear] =
	244	+ React.useState([]);
179	245	// 복약률 목록 조회
180	246	const seniorMedicationSelectListByMonth = () => {
181	247	let totalYearArr = [];
...	...	@@ -184,53 +250,72 @@
184	250	fetch("/user/seniorMedicationSelectListByMonth.json", {
185	251	method: "POST",
186	252	headers: {
187		- 'Content-Type': 'application/json; charset=UTF-8'
	253	+ "Content-Type": "application/json; charset=UTF-8",
188	254	},
189		- body: JSON.stringify({ "agency_id": state.loginUser['agency_id'] }),
190		- }).then((response) => response.json()).then((data) => {
191		- data.map((item, idx) => {
192		- item['year'] = item['medication_default_date'].substr(0, 4);
193		- item['month'] = item['medication_default_date'].substr(5, 2);
194		- totalYearArr.push(item['medication_default_date'].substr(0, 4));
195		- item['date'] = new Date(item['medication_default_date']).getTime();
196		- })
197		-
198		- const setYearArr = [...new Set(totalYearArr)];
199		- console.log("totalYearArr: ", setYearArr);
200		-
201		- setYearArr.map((year, yearIdx) => {
202		- let sum = 0;
203		- let count = 0;
204		- let avg = 0;
205		-
206		- let monthArr = ['-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-'];
207		-
	255	+ body: JSON.stringify({ agency_id: state.loginUser["agency_id"] }),
	256	+ })
	257	+ .then((response) => response.json())
	258	+ .then((data) => {
208	259	data.map((item, idx) => {
209		- if (item['year'] == year) {
210		- sum += item['average'];
211		- count++;
212		- monthArr[Number(item['month']) - 1] = item['average'];
213		- }
214		- })
	260	+ item["year"] = item["medication_default_date"].substr(0, 4);
	261	+ item["month"] = item["medication_default_date"].substr(5, 2);
	262	+ totalYearArr.push(item["medication_default_date"].substr(0, 4));
	263	+ item["date"] = new Date(item["medication_default_date"]).getTime();
	264	+ });
215	265
216		- avg = parseInt(sum / count);
217		- yearArr.push({ "year": [year], "average": avg, "data": monthArr });
	266	+ const setYearArr = [...new Set(totalYearArr)];
	267	+ console.log("totalYearArr: ", setYearArr);
	268	+
	269	+ setYearArr.map((year, yearIdx) => {
	270	+ let sum = 0;
	271	+ let count = 0;
	272	+ let avg = 0;
	273	+
	274	+ let monthArr = [
	275	+ "-",
	276	+ "-",
	277	+ "-",
	278	+ "-",
	279	+ "-",
	280	+ "-",
	281	+ "-",
	282	+ "-",
	283	+ "-",
	284	+ "-",
	285	+ "-",
	286	+ "-",
	287	+ ];
	288	+
	289	+ data.map((item, idx) => {
	290	+ if (item["year"] == year) {
	291	+ sum += item["average"];
	292	+ count++;
	293	+ monthArr[Number(item["month"]) - 1] = item["average"];
	294	+ }
	295	+ });
	296	+
	297	+ avg = parseInt(sum / count);
	298	+ yearArr.push({ year: [year], average: avg, data: monthArr });
	299	+ });
	300	+
	301	+ console.log("yearArr : ", yearArr);
	302	+ setMedicationSelectListByYear(yearArr);
	303	+
	304	+ console.log("seniorMedicationSelectListByMonth : ", data);
	305	+ setMedicationSelectListByMonth(data);
218	306	})
219		-
220		- console.log("yearArr : ", yearArr);
221		- setMedicationSelectListByYear(yearArr);
222		-
223		- console.log("seniorMedicationSelectListByMonth : ", data);
224		- setMedicationSelectListByMonth(data);
225		- }).catch((error) => {
226		- console.log('seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ', error);
227		- });
	307	+ .catch((error) => {
	308	+ console.log(
	309	+ "seniorMedicationSelectListByMonth() /user/seniorMedicationSelectListByMonth.json error : ",
	310	+ error
	311	+ );
	312	+ });
228	313	};
229		-
230	314
231	315	React.useEffect(() => {
232	316	temperatureRiskCount();
233	317	batteryRiskCount();
	318	+ receiveDataMissRiskCount();
234	319	seniorMedicationSelectListByNew();
235	320	seniorMedicationSelectListByMonth();
236	321	mySeniorSelectList();
...	...	@@ -238,10 +323,26 @@
238	323
239	324	return (
240	325	<main>
241		- <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"대상자 현황"} explanation={new Date(new Date().setDate(new Date().getDate() - 1)).toLocaleDateString().replace(/\./g, '').replace(/\s/g, '-') + " 기준"} /></div>
	326	+ <div className="flex-start margin-bottom2">
	327	+ <img src={medicinebox} alt="" />
	328	+ <TitleSmall
	329	+ title={"대상자 현황"}
	330	+ explanation={
	331	+ new Date(new Date().setDate(new Date().getDate() - 1))
	332	+ .toLocaleDateString()
	333	+ .replace(/\./g, "")
	334	+ .replace(/\s/g, "-") + " 기준"
	335	+ }
	336	+ />
	337	+ </div>
242	338	<div className="main-grid-agency margin-bottom2">
243	339	<ul className="content-box statistics-agency" background="#8ef3d1">
244		- <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
	340	+ <li
	341	+ className="flex-start"
	342	+ onClick={() => {
	343	+ navigate("/Healthcare");
	344	+ }}
	345	+ >
245	346	<img src={medicineAgency} alt="" />
246	347	<div className="text">
247	348	<p>미복약 위험 대상자</p>
...	...	@@ -249,8 +350,13 @@
249	350	</div>
250	351	</li>
251	352	</ul>
252		- <ul className="content-box statistics-agency" background="#ebe7b9" >
253		- <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
	353	+ <ul className="content-box statistics-agency" background="#ebe7b9">
	354	+ <li
	355	+ className="flex-start"
	356	+ onClick={() => {
	357	+ navigate("/Healthcare");
	358	+ }}
	359	+ >
254	360	<img src={temperatureAgency} alt="" />
255	361	<div className="text">
256	362	<p>댁내 온도 위험 대상자</p>
...	...	@@ -259,7 +365,12 @@
259	365	</li>
260	366	</ul>
261	367	<ul className="content-box statistics-agency" background="#5f9af3">
262		- <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
	368	+ <li
	369	+ className="flex-start"
	370	+ onClick={() => {
	371	+ navigate("/Healthcare");
	372	+ }}
	373	+ >
263	374	<img src={batteryAgency} alt="" />
264	375	<div className="text">
265	376	<p>배터리 부족 대상자</p>
...	...	@@ -268,24 +379,34 @@
268	379	</li>
269	380	</ul>
270	381	<ul className="content-box statistics-agency" background="#8080FF">
271		- <li className="flex-start" onClick={() => { navigate("/Healthcare") }}>
	382	+ <li
	383	+ className="flex-start"
	384	+ onClick={() => {
	385	+ navigate("/Healthcare");
	386	+ }}
	387	+ >
272	388	<img src={wifioff} alt="" />
273	389	<div className="text">
274	390	<p>데이터 미확인 대상자</p>
275		- <p className="peoplecount">{batteryCount}</p>
	391	+ <p className="peoplecount">{receiveDataMissCount}</p>
276	392	</div>
277	393	</li>
278	394	</ul>
279	395	</div>
280		- <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"대상자 복약률 평균"} /></div>
	396	+ <div className="flex-start margin-bottom2">
	397	+ <img src={medicinebox} alt="" />
	398	+ <TitleSmall title={"대상자 복약률 평균"} />
	399	+ </div>
281	400	<div className="main-grid-agency margin-bottom2">
282	401	<div className="content-box combine-left-government4">
283	402	<div className="height-50">
284		- {
285		- medicationSelectListByNew.length > 0 ?
286		- <Chart10 data={medicationSelectListByMonth} />
287		- : <div className="no-data"><p>데이터가 없습니다.</p></div>
288		- }
	403	+ {medicationSelectListByNew.length > 0 ? (
	404	+ <Chart10 data={medicationSelectListByMonth} />
	405	+ ) : (
	406	+ <div className="no-data">
	407	+ <p>데이터가 없습니다.</p>
	408	+ </div>
	409	+ )}
289	410	</div>
290	411	<div>
291	412	<table className="visit-data-table">
...	...	@@ -312,25 +433,27 @@
312	433	medicationSelectListByYear.map((item, idx) => {
313	434	return (
314	435	<tr>
315		- <td>{item['year']}</td>
316		- <td>{item['average'] == '-' ? '-' : item['average'] + '%'}</td>
317		- {CommonUtil.isEmpty(item['data']) == false ? (
318		- item['data'].map((item1, idx1) => {
319		- return (
320		- <>
321		- <td>{item1 == '-' ? '-' : item1 + '%'}</td>
322		- </>
323		- )
324		- })
325		- ) : null}
	436	+ <td>{item["year"]}</td>
	437	+ <td>
	438	+ {item["average"] == "-" ? "-" : item["average"] + "%"}
	439	+ </td>
	440	+ {CommonUtil.isEmpty(item["data"]) == false
	441	+ ? item["data"].map((item1, idx1) => {
	442	+ return (
	443	+ <>
	444	+ <td>{item1 == "-" ? "-" : item1 + "%"}</td>
	445	+ </>
	446	+ );
	447	+ })
	448	+ : null}
326	449	</tr>
327		- )
	450	+ );
328	451	})
329		- ) :
	452	+ ) : (
330	453	<tr>
331	454	<td colSpan={14}>데이터가 없습니다.</td>
332	455	</tr>
333		- }
	456	+ )}
334	457	</tbody>
335	458	</table>
336	459	</div>
...	...	@@ -349,29 +472,37 @@
349	472	</div> */}
350	473	<div className="main-grid-agency2">
351	474	<div>
352		- <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"시니어 복약수 순위"} /></div>
	475	+ <div className="flex-start margin-bottom2">
	476	+ <img src={medicinebox} alt="" />
	477	+ <TitleSmall title={"시니어 복약수 순위"} />
	478	+ </div>
353	479	<div className="content-box combine-left-government3 visitlist margin-bottom2">
354		- {
355		- medicationSelectListByNew.length > 0 ?
356		- <Chart8 data={medicationSelectListByNew} />
357		- : <div className="no-data"><p>데이터가 없습니다.</p></div>
358		- }
	480	+ {medicationSelectListByNew.length > 0 ? (
	481	+ <Chart8 data={medicationSelectListByNew} />
	482	+ ) : (
	483	+ <div className="no-data">
	484	+ <p>데이터가 없습니다.</p>
	485	+ </div>
	486	+ )}
359	487	</div>
360	488	</div>
361	489	<div>
362		- <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"연령대별 통계"} /></div>
	490	+ <div className="flex-start margin-bottom2">
	491	+ <img src={medicinebox} alt="" />
	492	+ <TitleSmall title={"연령대별 통계"} />
	493	+ </div>
363	494	<div className="content-box combine-left-government3 visitlist margin-bottom2">
364		- {
365		- seniorGenderData.length > 0 ?
366		- <Chart7 data={seniorGenderData} />
367		- : <div className="no-data"><p>데이터가 없습니다.</p></div>
368		- }
	495	+ {seniorGenderData.length > 0 ? (
	496	+ <Chart7 data={seniorGenderData} />
	497	+ ) : (
	498	+ <div className="no-data">
	499	+ <p>데이터가 없습니다.</p>
	500	+ </div>
	501	+ )}
369	502	</div>
370	503	</div>
371	504	</div>
372		- <div>
373		-
374		- </div>
	505	+ <div></div>
375	506	</main>
376	507	);
377	508	}

...	...	@@ -63,7 +63,7 @@
63	63	//온도 위험 대상자(시니어) 수 조회
64	64	const [temperatureCount, setTemperatureCount] = React.useState(0);
65	65	const temperatureRiskCount = () => {
66		- fetch("/stats/agencyTemperatureRisk.json", {
	66	+ fetch("/stats/temperatureRisk.json", {
67	67	method: "POST",
68	68	headers: {
69	69	'Content-Type': 'application/json; charset=UTF-8'
...	...	@@ -75,14 +75,14 @@
75	75	console.log("온도 위험 대상자(시니어) 수 조회 : ", data);
76	76	setTemperatureCount(data);
77	77	}).catch((error) => {
78		- console.log('temperatureRiskCount() /stats/agencyTemperatureRisk.json error : ', error);
	78	+ console.log('temperatureRiskCount() /stats/temperatureRisk.json error : ', error);
79	79	});
80	80	}
81	81
82	82	//배터리 부족 대상자(시니어) 수 조회
83	83	const [batteryCount, setbatteryCount] = React.useState(0);
84	84	const batteryRiskCount = () => {
85		- fetch("/stats/agencyBatteryRisk.json", {
	85	+ fetch("/stats/batteryRisk.json", {
86	86	method: "POST",
87	87	headers: {
88	88	'Content-Type': 'application/json; charset=UTF-8'
...	...	@@ -94,7 +94,26 @@
94	94	console.log("배터리 부족 대상자(시니어) 수 조회 : ", data);
95	95	setbatteryCount(data);
96	96	}).catch((error) => {
97		- console.log('batteryRiskCount() /stats/agencyBatteryRisk.json error : ', error);
	97	+ console.log('batteryRiskCount() /stats/batteryRisk.json error : ', error);
	98	+ });
	99	+ }
	100	+
	101	+ //데이터 미확인 대상자(시니어) 수 조회
	102	+ const [receiveDataMissCount, setReceiveDataMissCount] = React.useState(0);
	103	+ const receiveDataMissRiskCount = () => {
	104	+ fetch("/stats/receiveDataMissCount.json", {
	105	+ method: "POST",
	106	+ headers: {
	107	+ 'Content-Type': 'application/json; charset=UTF-8'
	108	+ },
	109	+ body: JSON.stringify({
	110	+ 'agency_id': state.loginUser['agency_id'],
	111	+ }),
	112	+ }).then((response) => response.json()).then((data) => {
	113	+ console.log("데이터 미확인 대상자(시니어) 수 조회 : ", data);
	114	+ setReceiveDataMissCount(data);
	115	+ }).catch((error) => {
	116	+ console.log('receiveDataMissRiskCount() /stats/receiveDataMissCount.json error : ', error);
98	117	});
99	118	}
100	119
...	...	@@ -224,6 +243,7 @@
224	243	seniorSelectList();
225	244	temperatureRiskCount();
226	245	batteryRiskCount();
	246	+ receiveDataMissRiskCount();
227	247	visitByMonthList();
228	248	seniorByAgent();
229	249	seniorMedicationSelectListByNew();
...	...	@@ -259,7 +279,7 @@
259	279	<li onClick={() => { navigate("/HealthcareAdmin") }}>
260	280	<p><WifiOffIcon sx={{ width: "50px", height: "50px", padding: "5px", color: "#ffffff", background: "#8080FF", borderRadius: "50px", boxSizing: "border-box" }} /></p>
261	281	<p>{cityName} 데이터 미확인 대상자 </p>
262		- <p>{batteryCount}</p>
	282	+ <p>{receiveDataMissCount}</p>
263	283	</li>
264	284	</ul>
265	285	</div>

Delete comment