From a9633ac0a723321e37df32b6d12cb5221e5c597b Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 4 Apr 2022 23:22:20 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=88=ED=99=94=EB=A9=B4=20=ED=8D=BC?=
 =?UTF-8?q?=EB=B8=94=EB=A6=AC=EC=8B=B1=20=EA=B8=B0=EB=8A=A5=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  33 +++--
 .../M_Bf_daily_nutritionBO.java               |   4 +
 .../M_Bf_daily_nutritionBOImpl.java           |  41 +++++-
 .../backoffice/m/index/M_IndexController.java |  19 ++-
 .../com.backoffice.m.bf_daily_nutrition.xml   | 102 +++++++++++++
 .../com.backoffice.m.bf_family_baby.xml       |   6 +
 .../sqlmap/m/index/com.backoffice.m.index.xml |   4 +-
 .../WEB-INF/views/ftl/m/index/index.ftl       | 135 ++++++++++--------
 8 files changed, 265 insertions(+), 79 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f35470..6894bdf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,16 +9,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="닉네임 변경기능 적용">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="계정 동기화 기능 수정">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -201,7 +200,9 @@
       <workItem from="1648720402622" duration="2770000" />
       <workItem from="1648786659469" duration="28242000" />
       <workItem from="1648875329000" duration="23079000" />
-      <workItem from="1648963023291" duration="18348000" />
+      <workItem from="1648963023291" duration="19862000" />
+      <workItem from="1649040256227" duration="5551000" />
+      <workItem from="1649066917331" duration="9694000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -294,7 +295,14 @@
       <option name="project" value="LOCAL" />
       <updated>1648975038077</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="계정 동기화 기능 수정">
+      <created>1648986499410</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1648986499410</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -327,6 +335,7 @@
     <MESSAGE value="음악설정 수정&#10;부모정보 변경 삭제" />
     <MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
     <MESSAGE value="닉네임 변경기능 적용" />
-    <option name="LAST_COMMIT_MESSAGE" value="닉네임 변경기능 적용" />
+    <MESSAGE value="계정 동기화 기능 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="계정 동기화 기능 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java
index 2c68863..c1f9b5e 100644
--- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java
+++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java
@@ -17,6 +17,10 @@ public interface M_Bf_daily_nutritionBO {
 	
 	public abstract List<DataMap> select_bf_last_status(DataMap paramMap) throws Exception;
 
+	public abstract DataMap select_bf_last_meal_status(DataMap paramMap) throws Exception;
+	public abstract DataMap select_bf_last_sleep_status(DataMap paramMap) throws Exception;
+	public abstract DataMap select_bf_last_bedpan_status(DataMap paramMap) throws Exception;
+
 	public abstract List<DataMap> select_db_vac_list(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_daily_image_list(DataMap paramMap) throws Exception;
 	
diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java
index 7bb1c9c..f518bf3 100644
--- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java
+++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java
@@ -113,7 +113,46 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
 
 		return lm;
 	}
-	
+
+	public DataMap select_bf_last_meal_status(DataMap paramMap) throws Exception{
+		DataMap lm = null;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_item_to_datamap("select_bf_last_meal_status", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return lm;
+	}
+
+	public DataMap select_bf_last_sleep_status(DataMap paramMap) throws Exception{
+		DataMap lm = null;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_item_to_datamap("select_bf_last_sleep_status", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return lm;
+	}
+
+	public DataMap select_bf_last_bedpan_status(DataMap paramMap) throws Exception{
+		DataMap lm = null;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_item_to_datamap("select_bf_last_bedpan_status", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return lm;
+	}
+
 	public List<DataMap> select_daily_image_list(DataMap paramMap) throws Exception{
 		List<DataMap> lm = null;
 
diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index 0d23f3a..ac131b7 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -164,10 +164,6 @@ public class M_IndexController extends AbstractControllerManager{
 				// 아이
 				DataMap rm_child = init_child(model, request, paramMap);
 
-//				log.info("아이정보 ----- ");
-//				log.info(rm_child);
-
-
 				if(rm_child != null) {
 					// 선택아이 성장 정보 조회
 					DataMap rm_last_h = init_child_info(model, request, paramMap, "Y", "N");				
@@ -184,9 +180,18 @@ public class M_IndexController extends AbstractControllerManager{
 					List<DataMap> lm_nutrition = bf_daily_nutritionBO.select_bf_daily_nutrition_list_by_day(paramMap);		
 					DataMap.putToModel(model, "lm_nutrition", lm_nutrition);
 
-					//마지막 식사, 수면, 대소변 현황
-					List<DataMap> lm_last = bf_daily_nutritionBO.select_bf_last_status(paramMap);
-					DataMap.putToModel(model, "lm_last", lm_last);
+					//마지막 식사
+					DataMap lm_last_meal = bf_daily_nutritionBO.select_bf_last_meal_status(paramMap);
+
+					//마지막 수면
+					DataMap lm_last_sleep = bf_daily_nutritionBO.select_bf_last_sleep_status(paramMap);
+
+					//마지막 대소변
+					DataMap lm_last_bedpan = bf_daily_nutritionBO.select_bf_last_bedpan_status(paramMap);
+
+					DataMap.putToModel(model, "lm_last_meal", lm_last_meal);
+					DataMap.putToModel(model, "lm_last_sleep", lm_last_sleep);
+					DataMap.putToModel(model, "lm_last_bedpan", lm_last_bedpan);
 
 					// 60개월 미만 인경우만 영양점수 계산
 					int m = rm_child.getInt("m");
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index da02ded..e3697c3 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -367,6 +367,7 @@
 			,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url
 			,REPLACE(append_300_img_file.mt_file_nm, '/cdn001/', '') AS append_300_img_file_nm
 			,cis_1.title AS nutirition_cd_no_title
+			,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
 			,CASE
 				 WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
 				 (
@@ -662,6 +663,107 @@
 		) XA
 	</select>
 
+	<!-- 마지막 식사 현황 -->
+	<select id="select_bf_last_meal_status" resultClass="dataMap" parameterClass="dataMap">
+		SELECT
+			'BF_NU_TP_10' as cd_no,
+			XA.time_val as time_val,
+			CASE
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
+				WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
+				WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
+				ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
+			END AS ago
+		FROM
+			(
+				SELECT
+					XS.reg_dt,
+					concat(
+							IFNULL(
+									CASE
+										WHEN XS.cd_no = 'BF_NU_TP_1' then
+											(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_1 b where b.dn_no = XS.dn_no)
+										WHEN XS.cd_no = 'BF_NU_TP_2' then
+											(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_2 b where b.dn_no = XS.dn_no)
+										WHEN XS.cd_no = 'BF_NU_TP_3' then
+											(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_3 b where b.dn_no = XS.dn_no)
+										WHEN XS.cd_no = 'BF_NU_TP_9' then
+											(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_9 b where b.dn_no = XS.dn_no)
+										WHEN XS.cd_no = 'BF_NU_TP_10' then
+											(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_10 b where b.dn_no = XS.dn_no)
+										END, 0)
+						, ' ml') AS time_val
+				FROM
+					(
+						SELECT
+							x.nutirition_cd_no as cd_no,
+							x.dn_no,
+							x.reg_dt
+						FROM tbl_bf_daily_nutrition x
+						WHERE 1=1
+						  AND x.smc_no  = #smc_no#
+						  AND x.nutirition_cd_no in ('BF_NU_TP_1', 'BF_NU_TP_2', 'BF_NU_TP_3', 'BF_NU_TP_9', 'BF_NU_TP_10')
+						ORDER BY x.reg_dt desc
+							LIMIT 1
+					) XS
+			) XA
+	</select>
+
+	<!-- 마지막 수면 현황 -->
+	<select id="select_bf_last_sleep_status" resultClass="dataMap" parameterClass="dataMap">
+		SELECT
+			'BF_NU_TP_5' as cd_no,
+			XA.time_val,
+			CASE
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
+				WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
+				WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
+				ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
+			END AS ago
+		FROM
+			(
+				SELECT
+					x.reg_dt,
+					concat( ifnull(sleep_h,0),  '시 ', ifnull(sleep_m,0), '분') as time_val
+				FROM tbl_bf_daily_nutrition x
+						 INNER JOIN tbl_bf_daily_nutrition_5 y on x.dn_no = y.dn_no
+				WHERE 1=1
+				  AND x.smc_no  = #smc_no#
+				  AND x.nutirition_cd_no in ('BF_NU_TP_5')
+				ORDER BY x.reg_dt desc
+					LIMIT 1
+			) XA
+	</select>
+
+	<!-- 마지막 대소변 현황 -->
+	<select id="select_bf_last_bedpan_status" resultClass="dataMap" parameterClass="dataMap">
+		SELECT
+			'BF_NU_TP_6' as cd_no,
+			XA.time_val,
+			CASE
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
+				WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
+				WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
+				WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
+				ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
+				END AS ago
+		FROM
+			(
+				SELECT
+					x.reg_dt,
+					concat(ifnull(y.rest_qty,0), 'ml') as time_val
+				FROM tbl_bf_daily_nutrition x
+						 INNER JOIN tbl_bf_daily_nutrition_6 y on x.dn_no = y.dn_no
+				WHERE 1=1
+				  AND x.smc_no  = #smc_no#
+				  AND x.nutirition_cd_no in ('BF_NU_TP_6')
+				ORDER BY x.reg_dt desc
+					LIMIT 1
+			) XA
+	</select>
+
     <insert id="insert_bf_daily_nutrition" parameterClass="dataMap">    
 		INSERT tbl_bf_daily_nutrition
 		( 
diff --git a/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml b/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
index e407858..f63129b 100644
--- a/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
+++ b/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
@@ -93,6 +93,12 @@
 			,200 - past_day as day200
 			,300 - past_day as day300
 			,365 - past_day as day365
+
+			,DATE_FORMAT(ADDDATE(now(), INTERVAL (100 - past_day) DAY),'%Y.%m.%d') as day100date
+			,DATE_FORMAT(ADDDATE(now(), INTERVAL (200 - past_day) DAY),'%Y.%m.%d') as day200date
+			,DATE_FORMAT(ADDDATE(now(), INTERVAL (300 - past_day) DAY),'%Y.%m.%d') as day300date
+			,DATE_FORMAT(ADDDATE(now(), INTERVAL (365 - past_day) DAY),'%Y.%m.%d') as day365date
+
 			,REPLACE(append_src_img_file.mt_file_local_url, '/cdn001/', '') AS append_src_img_file_url
 			,REPLACE(append_src_img_file.mt_file_nm, '/cdn001/', '') AS append_src_img_file_nm
 			,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url
diff --git a/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml b/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
index 1aec3ef..5918fc6 100644
--- a/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
+++ b/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
@@ -185,6 +185,7 @@
 			XA.cd_no,
 			XA.title,
 			XA.val_1,
+			XA.color_cd,
 			case
 				when y_order_no is not null then XA.y_order_no
 				else x_order_no
@@ -196,7 +197,8 @@
 					title,
 					val_1,
 					x.order_no as x_order_no,
-					y.order_no as y_order_no
+					y.order_no as y_order_no,
+					x.color_cd
 				FROM tbl_code_item x
 				LEFT OUTER JOIN tbl_member_category y on x.cd_no = y.cd_no and y.member_id = #member_id#
 				WHERE cg_cd = #cg_cd# and x.use_yn = 'Y'
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index eec3fc8..d78d465 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -80,23 +80,25 @@
 									<#list model['lm_child'] as item>
 										<li>
 											<div class="main_pofile_txt">
-												<h2><span name="child_nm">${item['name']!}</span></h2>
-												<p>${(item['m']?number/12)!}세 ${(item['m']?number%12)!}개월 (${item['gender_ko']!})</p>
-												<p>${(item['past_day'])!}일(${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일) / (${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
-
-												<#if item['day100'] gt 0>
-													<p>100일 D-${(item['day100'])!}일</p>
-												<#elseif item['day200'] gt 0>
-													<p>200일 D-${(item['day200'])!}일</p>
-												<#elseif item['day300'] gt 0>
-													<p>300일 D-${(item['day300'])!}일</p>
-												<#elseif item['day365'] gt 0>
-													<p>첫돌 D-${(item['day365'])!}일</p>
-												</#if>
-
+												<h2>${item['name']!} (${item['gender_ko']!})</h2>
+												<p>${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
+												<p class="d_day">
+													<#if item['day100'] gt 0>
+														100일 D-${(item['day100'])!}일,${item['day100date']!}
+													<#elseif item['day200'] gt 0>
+														200일 D-${(item['day200'])!}일,${item['day200date']!}
+													<#elseif item['day300'] gt 0>
+														300일 D-${(item['day300'])!}일,${item['day300date']!}
+													<#elseif item['day365'] gt 0>
+														첫돌 D-${(item['day365'])!}일,${item['day365date']!}
+													</#if>
+
+												</p>
 											</div>
 											<div class="main_pofile_img">
-												<p><a href ="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?smc_no=${item['smc_no']!}" ><img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png</#if>" alt="프로필 사진" /></a></p>
+												<p>
+													<a href ="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?smc_no=${item['smc_no']!}" ><img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png</#if>" alt="프로필 사진" /></a>
+												</p>
 											</div>
 										</li>
 									</#list>
@@ -110,54 +112,49 @@
 
 							<!-- main_pofile_info -->
 							<div class="main_pofile_info main_pofile_info01">
-								<div class="main_pofile_info_tit">
-									<span class="p_a">cm</span>
-									<span class="p_b">kg</span>
-								</div>
-
 								<!-- main_pofile_info_txt -->
 								<div class="main_pofile_info_txt txt01 active">
-									<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico01.png" alt="기린 아이콘" /></div>
-									<div class="main_pofile_info_txt02"><strong><#if model['rm_last_h']['height']?exists>${model['rm_last_h']['height']!}cm<#else>-</#if></strong></div>
+									<div class="main_pofile_info_txt02"><strong><#if model['rm_last_h']['height']?exists>${model['rm_last_h']['height']!}<#else>-</#if></strong>cm</div>
 								</div>
 
-
+								<!-- main_pofile_info_txt -->
 								<#if model['rm_last_w']?exists == true>
-									<!-- main_pofile_info_txt -->
-									<div class="main_pofile_info_txt txt02">
-										<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico01.png" alt="기린 아이콘" /></div>
-										<div class="main_pofile_info_txt02"><strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong></div>
-									</div>
+								<div class="main_pofile_info_txt txt02">
+									<div class="main_pofile_info_txt02">
+										<strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong>kg</div>
+								</div>
 								</#if>
 								<div class="main_pofile_info_tit">
 									<span class="txt01 active">cm</span>
 									<span class="txt02">kg</span>
 								</div>
-
 							</div>
 
 							<!-- main_pofile_info -->
 							<div class="main_pofile_info main_pofile_info02">
 
+								<!-- main_pofile_info_txt -->
 								<div class="main_pofile_info_txt txt01 active">
-									<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico02.png" alt="영양 아이콘" /></div>
-									<#if model['rm_child']['totalNutrition']?exists == true>
-										<div class="main_pofile_info_txt02"><strong>${model['rm_child']['totalNutrition']}%</strong></div>
-									</#if>
-									<#if model['rm_child']['totalNutrition']?exists == false>
-										<div class="main_pofile_info_txt02"><strong>-</strong></div>
-									</#if>
+									<div class="main_pofile_info_txt02">
+										<#if model['rm_child']['totalNutrition']?exists == true>
+											<strong>${model['rm_child']['totalNutrition']}</strong>점
+										</#if>
+										<#if model['rm_child']['totalNutrition']?exists == false>
+											<strong>-</strong>
+										</#if>
+									</div>
 								</div>
 
 								<!-- main_pofile_info_txt -->
 								<div class="main_pofile_info_txt txt02">
-									<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico02.png" alt="영양 아이콘" /></div>
-									<#if model['rm_child']['totalFood']?exists == true>
-										<div class="main_pofile_info_txt02"><strong>${model['rm_child']['totalFood']}%</strong></div>
-									</#if>
-									<#if model['rm_child']['totalFood']?exists == false>
-										<div class="main_pofile_info_txt02"><strong>-</strong></div>
-									</#if>
+									<div class="main_pofile_info_txt02">
+										<#if model['rm_child']['totalFood']?exists == true>
+											<strong>${model['rm_child']['totalFood']}</strong>%
+										</#if>
+										<#if model['rm_child']['totalFood']?exists == false>
+											<strong>-</strong>
+										</#if>
+									</div>
 								</div>
 
 								<div class="main_pofile_info_tit">
@@ -176,7 +173,7 @@
 								<div class="swiper-wrapper">
 									<#list model['category_list'] as item>
 										<div class="swiper-slide">
-											<a href="javascript:void(0);" key="${item['val_1']!}"><span>${item['title']!}</span></a>
+											<a href="javascript:void(0);" style="background-color:${item['color_cd']}" key="${item['val_1']!}"><span>${item['title']!}</span></a>
 										</div>
 									</#list>
 									<div class="swiper-slide">
@@ -189,14 +186,34 @@
 
 						<!-- main_cont_last_status -->
 						<div class="main_cont_last_status">
-							<#if (model['lm_last'])?has_content>
-								<#list model['lm_last'] as item>
-									<div>
-										<p>${item['cd_title']!}</p>
-										<span>${item['ago']!} / ${item['time_val']!}</span>
-									</div>
-								</#list>
-							</#if>
+							<div>
+								<p>마지막 식사</p>
+								<#if (model['lm_last_meal'])?has_content>
+									<span>${model['lm_last_meal']['ago']!} / ${model['lm_last_meal']['time_val']!}</span>
+								</#if>
+								<#if (model['lm_last_meal'])?has_content == false>
+									-
+								</#if>
+							</div>
+							<div>
+								<p>마지막 수면</p>
+								<#if (model['lm_last_sleep'])?has_content>
+									<span>${model['lm_last_sleep']['ago']!} / ${model['lm_last_sleep']['time_val']!}</span>
+								</#if>
+								<#if (model['lm_last_sleep'])?has_content == false>
+									-
+								</#if>
+							</div>
+							<div>
+								<p>마지막 대소변</p>
+								<#if (model['lm_last_bedpan'])?has_content>
+									<span>${model['lm_last_bedpan']['ago']!} / ${model['lm_last_bedpan']['time_val']!}</span>
+								</#if>
+								<#if (model['lm_last_bedpan'])?has_content == false>
+									-
+								</#if>
+
+							</div>
 						</div>
 						<!-- //main_cont_last_status -->
 
@@ -220,7 +237,7 @@
 					<div class="main_cont_line"></div>
 
 					<!-- 이미지 업로드 main_cont_camera -->
-					<ul id="ul_photo" class="main_cont_camera" style="overflow-y:auto; height:1200px;">
+					<ul id="ul_photo" class="main_cont_camera">
 						<#assign nutirition_cd_no_title = ''>
 						<#assign ago = ''>
 
@@ -238,17 +255,19 @@
 										</#if>
 										<img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
 									</div>
-									<div class="main_cont_circle"></div>
+									<div class="main_cont_circle" style="border-color: ${item['color_cd']};"></div>
 									<div class="main_cont_info">
 										<div class="info_title">
-											<p><#if (model['lm_nutrition'])?has_content>${nutirition_cd_no_title}</#if></p>
+											<p style="color: ${item['color_cd']};"><#if (model['lm_nutrition'])?has_content>${nutirition_cd_no_title}</#if></p>
 											<span class="info_time">${ago}</span>
 										</div>
-										<div class="info_recode" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'">
-											<p>기록내용</p>
+										<div class="info_amount">
+											<p>${time_text}</p>
+										</div>
+										<div class="info_recode" style="border-color: ${item['color_cd']};" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'">
+											<p style="color: ${item['color_cd']};">순간의 기록</p>
 											<span>
 												${memo}<br/>
-												${time_text}
 											</span>
 										</div>
 									</div>