Commit @74f1d08aaa6a5fcfa84e5c310355ea5f21e0f453

박정하 2023-06-29

230629 박정하 운영서버 적용을 위한 소스 업데이트

@74f1d08aaa6a5fcfa84e5c310355ea5f21e0f453

b1c75c3

74f1d08

Global.js

--- Global.js

+++ Global.js


 const SERVICE_STATUS = process.env.NODE_ENV;//development, production
 const PORT = 80;
 const API_SERVER_HOST = 'localhost:8080';
-//const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
-//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
-const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
-const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
+const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
+const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
+//const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
+//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
 
 module.exports = {
     PROJECT_NAME,

b1c75c3

74f1d08

client/views/pages/equipment/GovernmentEquipmentSelect.jsx

--- client/views/pages/equipment/GovernmentEquipmentSelect.jsx

+++ client/views/pages/equipment/GovernmentEquipmentSelect.jsx


     });
   }
 
-
   //입고 및 미대여 장비 검색 정보
   const [rentalEquipmentSearch, setRentalEquipmentSearch] = React.useState({
     'government_id': defaultGovernmentId,

                   <td data-label="시리얼넘버">{item['equipment_serial_number']}</td>
                   <td data-label="입고일자">{item['equipment_stock_date']}</td>
                   <td data-label="장비상태">{equipmentStates[item['equipment_state']]}</td>
-                  <td data-label="기관">
-                    {orgListOfHierarchy.map((item1, idx1) => {
-                      return (
-                        item1['agencyList'] != undefined && item1['agencyList'] != null ?
-                          item1['agencyList'].map((item2, idx2) => {
-                            return (
-                              item['agency_id'] == item2['agency_id'] ?
-                                item2['agency_name']
-                                : null
-                            )
-                          })
-                          : null
-                      )
-                    })}
-                  </td>
+                  <td data-label="기관">{item['agency_name'] != null ? item['agency_name'] : '없음'}</td>
                   <td cata-label="장비대여">
                     <button className={"btn-small gray-btn"} onClick={() => modalRentalOpen(item)}>장비 배포</button>
                   </td>

b1c75c3

74f1d08

client/views/pages/main/Main_agencyAdmin.jsx

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

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


 
   const [cityName, setCityName] = useState(state.loginUser['agency_name']);
 
-  //특정 대상자의 일별, 복약시간별 복약 목록
-  let array = [];
-  const [stackChartData, setStackChartData] = React.useState([]);
-
-  //대상자(시니어) 목록 조회
+  //대상자(시니어) 목록 조회  
   const [seniorNum, setSeniorNum] = React.useState();
   const [senior, setSenior] = React.useState({ userList: [], userListCount: 0 });
   const seniorSelectList = () => {

         'authority': 'ROLE_SENIOR',
       }),
     }).then((response) => response.json()).then((data) => {
-      data.userList.map((item, idx) => {
-        item['senior_id'] = item['user_id'];
-        setSeniorNum(item);
-        seniorMedicationSelectList(item, item['user_name']);
-      })
-      console.log(">>", array);
-      setStackChartData(array);
       console.log("대상자(시니어) 목록 조회 : ", data);
       setSenior(data);
+      data.userList.map((item, idx) => {
+        console.log(">>", item['user_id'])
+      })
     }).catch((error) => {
       console.log('seniorSelectList() /user/userSelectList.json error : ', error);
     });

     className: 'leaflet-background-radius-icon'//leaflet-div-icon
   });
 
+
   //특정 대상자의 실제 복약 정보
   const [seniorMedicationList, setSeniorMedicationList] = React.useState([]);
   const [showMedicationTimeCode, setShowMedicationTimeCode] = React.useState({});
   //특정 대상자의 실제 복약 정보 목록 조회
-  const seniorMedicationSelectList = (seniorNum, senior_name) => {
+  const seniorMedicationSelectList = (seniorNum) => {
     fetch("/user/seniorMedicationSelectList.json", {
       method: "POST",
       headers: {
         'Content-Type': 'application/json; charset=UTF-8'
       },
-      body: JSON.stringify(seniorNum),
+      body: JSON.stringify(seniorNum['senior_id']),
     }).then((response) => response.json()).then((data) => {
       setSeniorMedicationList(data, seniorNum);
-      seniorMedicationSelectListByDay(data, seniorNum, senior_name);
+      seniorMedicationSelectListByDay(data, seniorNum);
+      console.log("seniorMedicationSelectList: ", seniorMedicationSelectList)
     }).catch((error) => {
       console.log('seniorMedicationSelectList() /user/seniorMedicationSelectList.json error : ', error);
     });
   };
 
+  //특정 대상자의 일별, 복약시간별 복약 목록
+  const [stackChartData, setStackChartData] = React.useState([]);
   //특정 대상자의 일별, 복약시간별 복약 목록 조회
-  const seniorMedicationSelectListByDay = (seniorMedicationList, seniorNum, senior_name) => {
+  const seniorMedicationSelectListByDay = (seniorMedicationList, seniorNum) => {
     fetch("/user/seniorMedicationSelectListByDay.json", {
       method: "POST",
       headers: {

       setShowMedicationTimeCode(showMedicationTimeCode);
 
       if (CommonUtil.isEmpty(data) == false) {
-        let _stackChartData = {};
-        let sum = 0;      // 실제 복약량
-        let counter = 0;  // 복약해야하는 양
-        let percent = 0; // 복약률
-        for (let i = data.length - 1; i >= data.length - 30; i--) {
+        let _stackChartData = [];
+        for (let i = data.length - 1; i >= data.length - 3; i--) {
+          let sum = 0;      // 실제 복약량
+          let counter = 0;  // 복약해야하는 양
           let chartData = {
             xName: data[i]['medication_default_date']
           };
           for (let j = 0; j < data[i]['medication_time_code_list'].length; j++) {
             if (CommonUtil.isEmpty(showMedicationTimeCode[data[i]['medication_time_code_list'][j]]) == false) {
+              chartData[data[i]['medication_time_code_list'][j]] = data[i]['medication_time_code_count_list'][j];
               counter++;
               if (i > 0) {
                 sum += data[i]['medication_time_code_count_list'][j];

               continue;
             }
           }
+          _stackChartData.push({ "sum": sum, "total": counter })
         }
-        percent = Math.floor((sum / counter) * 100);
-        array.push({ "senior_name": senior_name, "sum": sum, "total": counter, "percent": percent });
+        seniorNum.seniorMedicationList = _stackChartData;
       }
     }).catch((error) => {
       console.log('seniorMedicationSelectListByDay() /user/seniorMedicationSelectListByDay.json error : ', error);

           <div className="flex">
             <Title title={`${cityName} 복용률 순위`} explanation={""} />
           </div>
-          <div style={{height:'calc(100% - 60px)'}}>
+          <div style={{ height: 'calc(100% - 60px)' }}>
             <Chart8 data={stackChartData} />
             {/* <Chart8 /> */}
           </div>

b1c75c3

74f1d08

client/views/pages/senior_management/SeniorSelectOne.jsx

--- client/views/pages/senior_management/SeniorSelectOne.jsx

+++ client/views/pages/senior_management/SeniorSelectOne.jsx

...	...	@@ -26,6 +26,44 @@
26	26	};
27	27
28	28
	29	+ //시니어 정보
	30	+ const [senior, setSenior] = React.useState({
	31	+ 'user_id': location.state['senior_id'],
	32	+ 'user_name': null,
	33	+ 'user_password': null,
	34	+ 'user_phonenumber': null,
	35	+ 'user_birth': null,
	36	+ 'user_gender': null,
	37	+ 'user_address': null,
	38	+ 'user_email': null,
	39	+ 'authority': 'ROLE_SENIOR',
	40	+ 'agency_id': location.state['agency_id'],
	41	+ 'government_id': location.state['government_id'],
	42	+
	43	+ 'senior_id': location.state['senior_id'],
	44	+ 'care_grade': null,
	45	+ 'medication_pill': null,
	46	+ 'underlie_disease': null,
	47	+ 'senior_note': null,
	48	+
	49	+ 'seniorMedicationList': []
	50	+ });
	51	+ //시니어 상세 조회
	52	+ const seniorSelectOne = () => {
	53	+ fetch("/user/seniorSelectOne.json", {
	54	+ method: "POST",
	55	+ headers: {
	56	+ 'Content-Type': 'application/json; charset=UTF-8'
	57	+ },
	58	+ body: JSON.stringify(senior),
	59	+ }).then((response) => response.json()).then((data) => {
	60	+ console.log("seniorSelectOne data : ", data);
	61	+ setSenior(data);
	62	+ }).catch((error) => {
	63	+ console.log('seniorSelectOne() /user/seniorSelectOne.json error : ', error);
	64	+ });
	65	+ };
	66	+
29	67	const [medicationTimeCodeList, setMedicationTimeCodeList] = React.useState([]);
30	68	//복약 시간 코드 목록 조회
31	69	const medicationTimeCodeSelectList = () => {
...	...	@@ -42,57 +80,6 @@
42	80	console.log('medicationTimeCodeSelectList() /common/medicationTimeCodeSelectList.json error : ', error);
43	81	});
44	82	}
45		-
46		- // 시스템 코드 - 장비 상태
47		- const [equipmentStates, setEquipmentStates] = React.useState({});
48		- // 시스템 코드 - 장비 상태 조회
49		- const equipmentStatesSelect = () => {
50		- console.log('equipmentStatesSelect Function Run');
51		-
52		- //fetch post
53		- fetch("/common/systemCode/equipmentStatesSelect.json", {
54		- method: "POST",
55		- headers: {
56		- 'Content-Type': 'application/json; charset=UTF-8'
57		- },
58		- body: JSON.stringify({})
59		- }).then((response) => response.json()).then((data) => {
60		- console.log('equipmentStatesSelect response : ', data);
61		- setEquipmentStates(data);
62		- }).catch((error) => {
63		- console.log('equipmentStatesSelect error : ', error);
64		- });
65		- }
66		-
67		- //입고 및 미대여 장비 검색 정보
68		- const [deliveryEquipmentSearch, setDeliveryEquipmentSearch] = React.useState({
69		- 'government_id': location.state['government_id'],
70		- 'senior_id': 'IS_NULL',
71		- 'currentPage': 1,
72		- 'perPage': 10,
73		- });
74		- //입고 및 미대여 목록
75		- const [deliveryEquipment, setDeliveryEquipment] = React.useState({ equipmentList: [], equipmentListCount: 0 });
76		- //입고 및 미대여 목록 조회
77		- const deliveryEquipmentSelectList = (currentPage) => {
78		- deliveryEquipmentSearch.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
79		- setDeliveryEquipmentSearch({ ...deliveryEquipmentSearch });
80		-
81		- fetch("/equipment/equipmentSelectList.json", {
82		- method: "POST",
83		- headers: {
84		- 'Content-Type': 'application/json; charset=UTF-8'
85		- },
86		- body: JSON.stringify(deliveryEquipmentSearch)
87		- }).then((response) => response.json()).then((data) => {
88		- console.log('deliveryEquipmentSelectList response : ', data);
89		- setDeliveryEquipment(data);
90		- }).catch((error) => {
91		- console.log('deliveryEquipmentSelectList error : ', error);
92		- });
93		- }
94		-
95		-
96	83
97	84	//장비 대여 모달 여부
98	85	const [modalRentalIsOpen, setModalRentalIsOpen] = React.useState(false);
...	...	@@ -167,6 +154,59 @@
167	154	}
168	155
169	156
	157	+ // 시스템 코드 - 장비 상태
	158	+ const [equipmentStates, setEquipmentStates] = React.useState({});
	159	+ // 시스템 코드 - 장비 상태 조회
	160	+ const equipmentStatesSelect = () => {
	161	+ console.log('equipmentStatesSelect Function Run');
	162	+
	163	+ //fetch post
	164	+ fetch("/common/systemCode/equipmentStatesSelect.json", {
	165	+ method: "POST",
	166	+ headers: {
	167	+ 'Content-Type': 'application/json; charset=UTF-8'
	168	+ },
	169	+ body: JSON.stringify({})
	170	+ }).then((response) => response.json()).then((data) => {
	171	+ console.log('equipmentStatesSelect response : ', data);
	172	+ setEquipmentStates(data);
	173	+ }).catch((error) => {
	174	+ console.log('equipmentStatesSelect error : ', error);
	175	+ });
	176	+ }
	177	+
	178	+ //입고 및 미대여 장비 검색 정보
	179	+ const [deliveryEquipmentSearch, setDeliveryEquipmentSearch] = React.useState({
	180	+ 'government_id': location.state['government_id'],
	181	+ 'agency_id': location.state['agency_id'],
	182	+ 'senior_id': 'IS_NULL',
	183	+ 'currentPage': 1,
	184	+ 'perPage': 10,
	185	+ });
	186	+ //입고 및 미대여 목록
	187	+ const [deliveryEquipment, setDeliveryEquipment] = React.useState({ equipmentList: [], equipmentListCount: 0 });
	188	+ //입고 및 미대여 목록 조회
	189	+ const deliveryEquipmentSelectList = (currentPage) => {
	190	+ deliveryEquipmentSearch.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
	191	+ setDeliveryEquipmentSearch({ ...deliveryEquipmentSearch });
	192	+
	193	+ console.log(">>", senior['agency_id'])
	194	+ deliveryEquipmentSearch.agency_id = senior['agency_id'];
	195	+
	196	+ fetch("/equipment/equipmentSelectList.json", {
	197	+ method: "POST",
	198	+ headers: {
	199	+ 'Content-Type': 'application/json; charset=UTF-8'
	200	+ },
	201	+ body: JSON.stringify(deliveryEquipmentSearch)
	202	+ }).then((response) => response.json()).then((data) => {
	203	+ console.log('deliveryEquipmentSelectList response : ', data);
	204	+ setDeliveryEquipment(data);
	205	+ }).catch((error) => {
	206	+ console.log('deliveryEquipmentSelectList error : ', error);
	207	+ });
	208	+ }
	209	+
170	210	//장비 대여 종료 모달 여부
171	211	const [modalRentalEndIsOpen, setModalRentalEndIsOpen] = React.useState(false);
172	212	const [rentalData, setRentalData] = React.useState({});
...	...	@@ -240,46 +280,6 @@
240	280	console.log('equipmentUpdateSenior() /equipment/equipmentUpdateSenior.json error : ', error);
241	281	});
242	282	}
243		-
244		-
245		- //시니어 정보
246		- const [senior, setSenior] = React.useState({
247		- 'user_id': location.state['senior_id'],
248		- 'user_name': null,
249		- 'user_password': null,
250		- 'user_phonenumber': null,
251		- 'user_birth': null,
252		- 'user_gender': null,
253		- 'user_address': null,
254		- 'user_email': null,
255		- 'authority': 'ROLE_SENIOR',
256		- 'agency_id': location.state['agency_id'],
257		- 'government_id': location.state['government_id'],
258		-
259		- 'senior_id': location.state['senior_id'],
260		- 'care_grade': null,
261		- 'medication_pill': null,
262		- 'underlie_disease': null,
263		- 'senior_note': null,
264		-
265		- 'seniorMedicationList': []
266		- });
267		- //시니어 상세 조회
268		- const seniorSelectOne = () => {
269		- fetch("/user/seniorSelectOne.json", {
270		- method: "POST",
271		- headers: {
272		- 'Content-Type': 'application/json; charset=UTF-8'
273		- },
274		- body: JSON.stringify(senior),
275		- }).then((response) => response.json()).then((data) => {
276		- console.log("seniorSelectOne data : ", data);
277		- setSenior(data);
278		- }).catch((error) => {
279		- console.log('seniorSelectOne() /user/seniorSelectOne.json error : ', error);
280		- });
281		- };
282		-
283	283
284	284
285	285	//대상자의 보호자 목록
...	...	@@ -438,15 +438,26 @@
438	438
439	439
440	440	React.useEffect(() => {
441		- medicationTimeCodeSelectList();
442		- equipmentStatesSelect();
443		- deliveryEquipmentSelectList();
444		-
445	441	seniorSelectOne();
446	442	guardianSelectListBySenior();
447	443	agentSelectListBySenior();
448	444	equipmentRentalList();
449		- }, [])
	445	+
	446	+ medicationTimeCodeSelectList();
	447	+ equipmentStatesSelect();
	448	+
	449	+ if (CommonUtil.isEmpty(deliveryEquipmentSearch['agency_id']) == false) {
	450	+ deliveryEquipmentSelectList(1);
	451	+ }
	452	+ }, []);
	453	+
	454	+ React.useEffect(() => {
	455	+ if (CommonUtil.isEmpty(deliveryEquipmentSearch['agency_id']) && CommonUtil.isEmpty(senior['agency_id']) == false) {
	456	+ deliveryEquipmentSearch['agency_id'] = senior['agency_id'];
	457	+ setDeliveryEquipmentSearch({...deliveryEquipmentSearch});
	458	+ deliveryEquipmentSelectList(1);
	459	+ };
	460	+ }, [senior])
450	461
451	462
452	463	return (

b1c75c3

74f1d08

server/modules/web/Server.js

--- server/modules/web/Server.js

+++ server/modules/web/Server.js


 
 http.createServer(webServer).listen(PORT);
 https.createServer({
-    /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
+    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
     cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */
-    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
+    /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
     cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */
     /* requestCert: false,
     rejectUnauthorized: false */
 }, webServer).listen(443);

Add a comment

Open 0
Closed 0

List

...	...	@@ -5,10 +5,10 @@
5	5	const SERVICE_STATUS = process.env.NODE_ENV;//development, production
6	6	const PORT = 80;
7	7	const API_SERVER_HOST = 'localhost:8080';
8		-//const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
9		-//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
10		-const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
11		-const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
	8	+const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
	9	+const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
	10	+//const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
	11	+//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
12	12
13	13	module.exports = {
14	14	PROJECT_NAME,

...	...	@@ -154,7 +154,6 @@
154	154	});
155	155	}
156	156
157		-
158	157	//입고 및 미대여 장비 검색 정보
159	158	const [rentalEquipmentSearch, setRentalEquipmentSearch] = React.useState({
160	159	'government_id': defaultGovernmentId,
...	...	@@ -559,21 +558,7 @@
559	558	<td data-label="시리얼넘버">{item['equipment_serial_number']}</td>
560	559	<td data-label="입고일자">{item['equipment_stock_date']}</td>
561	560	<td data-label="장비상태">{equipmentStates[item['equipment_state']]}</td>
562		- <td data-label="기관">
563		- {orgListOfHierarchy.map((item1, idx1) => {
564		- return (
565		- item1['agencyList'] != undefined && item1['agencyList'] != null ?
566		- item1['agencyList'].map((item2, idx2) => {
567		- return (
568		- item['agency_id'] == item2['agency_id'] ?
569		- item2['agency_name']
570		- : null
571		- )
572		- })
573		- : null
574		- )
575		- })}
576		- </td>
	561	+ <td data-label="기관">{item['agency_name'] != null ? item['agency_name'] : '없음'}</td>
577	562	<td cata-label="장비대여">
578	563	<button className={"btn-small gray-btn"} onClick={() => modalRentalOpen(item)}>장비 배포</button>
579	564	</td>

...	...	@@ -32,11 +32,7 @@
32	32
33	33	const [cityName, setCityName] = useState(state.loginUser['agency_name']);
34	34
35		- //특정 대상자의 일별, 복약시간별 복약 목록
36		- let array = [];
37		- const [stackChartData, setStackChartData] = React.useState([]);
38		-
39		- //대상자(시니어) 목록 조회
	35	+ //대상자(시니어) 목록 조회
40	36	const [seniorNum, setSeniorNum] = React.useState();
41	37	const [senior, setSenior] = React.useState({ userList: [], userListCount: 0 });
42	38	const seniorSelectList = () => {
...	...	@@ -50,15 +46,11 @@
50	46	'authority': 'ROLE_SENIOR',
51	47	}),
52	48	}).then((response) => response.json()).then((data) => {
53		- data.userList.map((item, idx) => {
54		- item['senior_id'] = item['user_id'];
55		- setSeniorNum(item);
56		- seniorMedicationSelectList(item, item['user_name']);
57		- })
58		- console.log(">>", array);
59		- setStackChartData(array);
60	49	console.log("대상자(시니어) 목록 조회 : ", data);
61	50	setSenior(data);
	51	+ data.userList.map((item, idx) => {
	52	+ console.log(">>", item['user_id'])
	53	+ })
62	54	}).catch((error) => {
63	55	console.log('seniorSelectList() /user/userSelectList.json error : ', error);
64	56	});
...	...	@@ -171,27 +163,31 @@
171	163	className: 'leaflet-background-radius-icon'//leaflet-div-icon
172	164	});
173	165
	166	+
174	167	//특정 대상자의 실제 복약 정보
175	168	const [seniorMedicationList, setSeniorMedicationList] = React.useState([]);
176	169	const [showMedicationTimeCode, setShowMedicationTimeCode] = React.useState({});
177	170	//특정 대상자의 실제 복약 정보 목록 조회
178		- const seniorMedicationSelectList = (seniorNum, senior_name) => {
	171	+ const seniorMedicationSelectList = (seniorNum) => {
179	172	fetch("/user/seniorMedicationSelectList.json", {
180	173	method: "POST",
181	174	headers: {
182	175	'Content-Type': 'application/json; charset=UTF-8'
183	176	},
184		- body: JSON.stringify(seniorNum),
	177	+ body: JSON.stringify(seniorNum['senior_id']),
185	178	}).then((response) => response.json()).then((data) => {
186	179	setSeniorMedicationList(data, seniorNum);
187		- seniorMedicationSelectListByDay(data, seniorNum, senior_name);
	180	+ seniorMedicationSelectListByDay(data, seniorNum);
	181	+ console.log("seniorMedicationSelectList: ", seniorMedicationSelectList)
188	182	}).catch((error) => {
189	183	console.log('seniorMedicationSelectList() /user/seniorMedicationSelectList.json error : ', error);
190	184	});
191	185	};
192	186
	187	+ //특정 대상자의 일별, 복약시간별 복약 목록
	188	+ const [stackChartData, setStackChartData] = React.useState([]);
193	189	//특정 대상자의 일별, 복약시간별 복약 목록 조회
194		- const seniorMedicationSelectListByDay = (seniorMedicationList, seniorNum, senior_name) => {
	190	+ const seniorMedicationSelectListByDay = (seniorMedicationList, seniorNum) => {
195	191	fetch("/user/seniorMedicationSelectListByDay.json", {
196	192	method: "POST",
197	193	headers: {
...	...	@@ -206,16 +202,16 @@
206	202	setShowMedicationTimeCode(showMedicationTimeCode);
207	203
208	204	if (CommonUtil.isEmpty(data) == false) {
209		- let _stackChartData = {};
210		- let sum = 0; // 실제 복약량
211		- let counter = 0; // 복약해야하는 양
212		- let percent = 0; // 복약률
213		- for (let i = data.length - 1; i >= data.length - 30; i--) {
	205	+ let _stackChartData = [];
	206	+ for (let i = data.length - 1; i >= data.length - 3; i--) {
	207	+ let sum = 0; // 실제 복약량
	208	+ let counter = 0; // 복약해야하는 양
214	209	let chartData = {
215	210	xName: data[i]['medication_default_date']
216	211	};
217	212	for (let j = 0; j < data[i]['medication_time_code_list'].length; j++) {
218	213	if (CommonUtil.isEmpty(showMedicationTimeCode[data[i]['medication_time_code_list'][j]]) == false) {
	214	+ chartData[data[i]['medication_time_code_list'][j]] = data[i]['medication_time_code_count_list'][j];
219	215	counter++;
220	216	if (i > 0) {
221	217	sum += data[i]['medication_time_code_count_list'][j];
...	...	@@ -224,9 +220,9 @@
224	220	continue;
225	221	}
226	222	}
	223	+ _stackChartData.push({ "sum": sum, "total": counter })
227	224	}
228		- percent = Math.floor((sum / counter) * 100);
229		- array.push({ "senior_name": senior_name, "sum": sum, "total": counter, "percent": percent });
	225	+ seniorNum.seniorMedicationList = _stackChartData;
230	226	}
231	227	}).catch((error) => {
232	228	console.log('seniorMedicationSelectListByDay() /user/seniorMedicationSelectListByDay.json error : ', error);
...	...	@@ -312,7 +308,7 @@
312	308	<div className="flex">
313	309	<Title title={`${cityName} 복용률 순위`} explanation={""} />
314	310	</div>
315		- <div style={{height:'calc(100% - 60px)'}}>
	311	+ <div style={{ height: 'calc(100% - 60px)' }}>
316	312	<Chart8 data={stackChartData} />
317	313	{/* <Chart8 /> */}
318	314	</div>

...	...	@@ -17,12 +17,12 @@
17	17
18	18	http.createServer(webServer).listen(PORT);
19	19	https.createServer({
20		- /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
	20	+ key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
21	21	cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
22		- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */
23		- key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
	22	+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
	23	+ /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
24	24	cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),
25		- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
	25	+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */
26	26	/* requestCert: false,
27	27	rejectUnauthorized: false */
28	28	}, webServer).listen(443);

Delete comment