From 53c7ee2aefd54ffbbfe156da4fb9a78836c5cfea Mon Sep 17 00:00:00 2001 From: isol2011 Date: Sun, 29 May 2022 16:24:50 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=98=A8=EC=95=A4=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backoffice/m/bf_growth/M_Bf_growthBO.java | 1 + .../m/bf_growth/M_Bf_growthBOImpl.java | 9 + .../m/bf_growth/M_Bf_growthController.java | 15 +- .../bf_growth/com.backoffice.m.bf_growth.xml | 22 + .../ftl/m/bf_food/view_nutrition_balance.ftl | 20 + .../views/ftl/m/bf_growth/food_balance.ftl | 9 +- .../views/ftl/m/bf_growth/growth_balance.ftl | 3 + .../views/ftl/m/bf_growth/health_checkup.ftl | 3 + .../ftl/m/bf_growth/nutrient_balance.ftl | 3 + .../views/ftl/m/bf_growth/vac_schedule.ftl | 3 + src/main/webapp/m/css/style.css | 28 ++ .../m/html/bf_food/영양상세보기.html | 386 ++++++++++++++++++ .../11-7.아기건강-예방접종.html | 1 + 13 files changed, 496 insertions(+), 7 deletions(-) create mode 100644 src/main/webapp/m/html/bf_food/영양상세보기.html diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java index 247f8ae..aabd552 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java @@ -25,5 +25,6 @@ public interface M_Bf_growthBO { public abstract DataMap select_bf_growth_vac_statistics(DataMap paramMap) throws Exception; public abstract List select_bf_growth_vac_list(DataMap paramMap) throws Exception; + public abstract DataMap select_bf_health_noti_count (DataMap paramMap) throws Exception; } diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java index 64235f3..2a9daa2 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java @@ -137,4 +137,13 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB return lm; } + public DataMap select_bf_health_noti_count (DataMap paramMap) throws Exception{ + DataMap rm = null; + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + rm = generalDAO.select_item_to_datamap("select_bf_health_noti_count", paramMap); + } catch (SQLException e) { throw e; } + return rm; + } + } diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java index 3ef100b..998b23f 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java @@ -109,7 +109,7 @@ public class M_Bf_growthController extends AbstractControllerManager{ List lm_rest_stat = bf_growthBO.select_bf_growth_rest_statistics(rm_base); get_lm_rest_stat(lm_rest_stat,rm_base); List lm_rest_his = bf_growthBO.select_bf_growth_rest_list(rm_base); - + DataMap.putToModel(model, "dm_vac_stat", dm_vac_stat); DataMap.putToModel(model, "lm_vac_his", lm_vac_his); DataMap.putToModel(model, "lm_rest_stat", lm_rest_stat); @@ -294,6 +294,9 @@ public class M_Bf_growthController extends AbstractControllerManager{ ingre = recommendBO.select_ingre_recommend_list(rank); } + + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "today", today); DataMap.putToModel(model, "daily", daily); DataMap.putToModel(model, "weekly", weekly); @@ -476,7 +479,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ ingre = recommendBO.select_ingre_recommend_list(rank); } - + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "today", today); DataMap.putToModel(model, "daily", daily); DataMap.putToModel(model, "weekly", weekly); @@ -569,7 +573,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ rm_growth_body.put("height_min_dt", height_min_dt); rm_growth_body.put("lm_growth_body_count", lm_growth_body.size()); */ - + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "rm_growth_body", rm_growth_body); DataMap.putToModel(model, "rm_child", rm_child); DataMap.putToModel(model, "rm_report", rm_report); @@ -601,6 +606,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ DataMap rm_child = init_child(model, request, paramMap); paramMap.put("smc_no", rm_child.get("smc_no")); List lm_health_checkup = bf_growthBO.select_bf_health_checkup_list(paramMap); //smc_no + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "rm_child", rm_child); DataMap.putToModel(model, "rm_health_checkup", lm_health_checkup); } @@ -628,6 +635,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ DataMap rm_child = init_child(model, request, paramMap); paramMap.put("smc_no", rm_child.get("smc_no")); List lm_vac_schedule = bf_growthBO.select_bf_vac_schedule_list(paramMap); //smc_no + DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "rm_child", rm_child); DataMap.putToModel(model, "rm_vac_schedule", lm_vac_schedule); diff --git a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml index fbfb27b..898d51e 100644 --- a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml +++ b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml @@ -386,4 +386,26 @@ order by recmnd_from_dt , dvs.dv_no, dvs.round + + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl index 0a10161..04fbfd1 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl @@ -24,6 +24,24 @@
+ +
+
+
+ 불균형 +
+
+
+ 보통 +
+
+
+ 균형 +
+ + + +
@@ -103,6 +121,7 @@
+ <#if (11 < model['rm_child']['m'])>

식이섬유Dietary fiber

<#if (model['intake']['fibtg']?number>100)> @@ -119,6 +138,7 @@
+
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl index 0065ebb..8da27d6 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl @@ -53,6 +53,9 @@
  • 건강검진 + <#if ( 0 < model['rm_health_noti']['counting'])> +
    +
  • @@ -96,9 +99,8 @@ <#if (model['rm_child']['m']>5)&&(model['rm_child']['m']<60)> -
    +

    연관식재료

      @@ -158,7 +159,7 @@
    -
    +
    • --> diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/growth_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/growth_balance.ftl index b394b28..8eb5ba5 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/growth_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/growth_balance.ftl @@ -52,6 +52,9 @@
  • 건강검진 + <#if ( 0 < model['rm_health_noti']['counting'])> +
    +
  • diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/health_checkup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/health_checkup.ftl index a3c63b4..eb5fa35 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/health_checkup.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/health_checkup.ftl @@ -48,6 +48,9 @@
  • 건강검진 + <#if ( 0 < model['rm_health_noti']['counting'])> +
    +
  • diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl index c49286f..063a409 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl @@ -52,6 +52,9 @@
  • 건강검진 + <#if ( 0 < model['rm_health_noti']['counting'])> +
    +
  • diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl index 2da39a5..4e0d362 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl @@ -48,6 +48,9 @@
  • 건강검진 + <#if ( 0 < model['rm_health_noti']['counting'])> +
    +
  • diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index b912ee1..b57eb2f 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -7622,6 +7622,23 @@ p.selectbox { padding: 70px 20px; } +.nutrition_subMain_nutrient .info_cont { + display: flex; +} + +.nutrition_subMain_nutrient .info_cont .item { + margin-right: 10px; + display: flex; + align-items: center; +} + +.nutrition_subMain_nutrient .info_cont .item .circle { + margin-right: 5px; + border-radius: 50%; + width: 10px; + height: 10px; +} + .nutrient_wrap { padding-bottom: 30px; } @@ -14155,6 +14172,17 @@ main.sona_cont_measurement { display: flex; align-items: center; justify-content: center; + position: relative; + } + + .memory_ca .new_icon { + position: relative; + left: 2px; + bottom: 9px; + background-color: red; + height: 5px; + width: 5px; + border-radius: 50%; } .memory_ca li.current{ diff --git a/src/main/webapp/m/html/bf_food/영양상세보기.html b/src/main/webapp/m/html/bf_food/영양상세보기.html new file mode 100644 index 0000000..118a5eb --- /dev/null +++ b/src/main/webapp/m/html/bf_food/영양상세보기.html @@ -0,0 +1,386 @@ + + + + + + + + 아이커 매니저::나의 문의 + + + + + + + + + + + + + +
    + + +
    + +

    영양

    +
    +
    + + + +
    + + +
    +
    +
    +
    + 불균형 +
    +
    +
    + 보통 +
    +
    +
    + 균형 +
    + + + +
    + + +
    +

    기초 영양소

    + +
    + +
    +

    에너지Energy

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    탄수화물Carbohydrate

    +

    50%

    +
    +

    +

    + +
    +
    + + +
    +

    단백질Protein

    +

    20%

    +
    +

    +

    + +
    +
    + + +
    +

    지방Fat

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    식이섬유Dietary fiber

    +

    50%

    +
    +

    +

    + +
    +
    + + +
    +

    당류Sugar

    +

    20%

    +
    +

    +

    + +
    +
    + + +
    +

    나트륨Natrium

    +

    20%

    +
    +

    +

    + +
    +
    + +
    + +
    + + + +
    +

    성장 영양소

    + +
    + +
    +

    비타민B1Vitamin B1

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    비타민B2Vitamin B2

    +

    50%

    +
    +

    +

    + +
    +
    + + +
    +

    나이아신Niacin

    +

    20%

    +
    +

    +

    + +
    +
    + + +
    +

    칼슘Calcium

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    칼륨Kalium

    +

    50%

    +
    +

    +

    + +
    +
    + + +
    +

    철분Iron

    +

    20%

    +
    +

    +

    + +
    +
    + +
    + +
    + + + +
    +

    면역 영양소

    + +
    + +
    +

    비타민AVitamin A

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    비타민CVitamin C

    +

    50%

    +
    +

    +

    + +
    +
    + + +
    +

    비타민DVitamin D

    +

    20%

    +
    +

    +

    + +
    +
    + + +
    +

    비타민EVitamin E

    +

    70%

    +
    +

    +

    + +
    +
    + + +
    +

    아연Zinc

    +

    50%

    +
    +

    +

    + +
    +
    + +
    + +
    + + +
    + + +
    + + +
    + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/m/html/bf_growth/11-7.아기건강-예방접종.html b/src/main/webapp/m/html/bf_growth/11-7.아기건강-예방접종.html index b040f67..8651509 100644 --- a/src/main/webapp/m/html/bf_growth/11-7.아기건강-예방접종.html +++ b/src/main/webapp/m/html/bf_growth/11-7.아기건강-예방접종.html @@ -55,6 +55,7 @@
  • 건강검진 +