diff --git a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java index 922bef5..93e3b58 100644 --- a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java @@ -92,9 +92,9 @@ public class FoodScoreCalculation { DataMap.printDataMap(intake); System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 스코어"); DataMap.printDataMap(score); -// System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 신호등"); -// DataMap.printDataMap(light); -// cal.Foodsort(score); + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 신호등"); + DataMap.printDataMap(light); + cal.Foodsort(score); } private int getLabel(int month) { 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 aabd552..06d7c02 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 @@ -26,5 +26,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; + public abstract DataMap select_bf_vac_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 2a9daa2..61439ad 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 @@ -145,5 +145,14 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB } catch (SQLException e) { throw e; } return rm; } + + public DataMap select_bf_vac_noti_count (DataMap paramMap) throws Exception{ + DataMap rm = null; + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + rm = generalDAO.select_item_to_datamap("select_bf_vac_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 998b23f..af581df 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 @@ -297,6 +297,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); DataMap.putToModel(model, "rm_health_noti", rm_health_noti); + DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); + DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); DataMap.putToModel(model, "today", today); DataMap.putToModel(model, "daily", daily); DataMap.putToModel(model, "weekly", weekly); @@ -480,6 +482,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ } DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); + DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); DataMap.putToModel(model, "rm_health_noti", rm_health_noti); DataMap.putToModel(model, "today", today); DataMap.putToModel(model, "daily", daily); @@ -574,6 +578,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ 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 rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); + DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); 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); @@ -606,10 +612,12 @@ 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_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap); + DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); 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); + DataMap.putToModel(model, "rm_health_checkup", lm_health_checkup); } }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} @@ -636,6 +644,8 @@ public class M_Bf_growthController extends AbstractControllerManager{ 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 rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap); + DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti); 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 898d51e..d6178b2 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 @@ -407,5 +407,24 @@ and date_add(fb.birthday,interval ch.to month) >= now() order by recmnd_from_dt + + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl index 69072fb..3986e05 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl @@ -14,7 +14,7 @@
-

영양

+

아기건강

@@ -24,6 +24,24 @@
+ +
+
+
+ 불균형 +
+
+
+ 보통 +
+
+
+ 균형 +
+ + + +
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 04fbfd1..7becce9 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 @@ -14,7 +14,7 @@
-

영양

+

아기건강

@@ -28,15 +28,15 @@
- 불균형 + 초과
- 보통 + 부족
- 균형 + 적정
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl index 4bf7b40..867d11a 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl @@ -257,7 +257,7 @@ label += ' N SCORE : '; } label += Math.round(tooltipItem.yLabel * 100) / 100; - return label + " %"; + return label + " 점"; } }, enabled: 'true', diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_2.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_2.ftl index 130018c..a78bf43 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_2.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_2.ftl @@ -258,7 +258,7 @@ label += ' N SCORE : '; } label += Math.round(tooltipItem.yLabel * 100) / 100; - return label + " %"; + return label + " 점"; } }, enabled: 'true', 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 8da27d6..9cc9a7b 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 @@ -17,7 +17,7 @@
-

분석

+

아기건강

@@ -61,6 +61,9 @@
  • 예방접종 + <#if ( 0 < model['rm_vac_noti']['counting'])> +
    +
    • @@ -84,14 +87,14 @@

    긍정식품군

    모유, 분유, 곡류, 채소, 단백질, 과일 등

    -
    <#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0%
    +
    <#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0점

  • 부정영양소

    과일, 당 첨가식품, 음료, 과자 등

    -
    <#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0%
    +
    <#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0점
    • 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 8eb5ba5..96ead30 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 @@ -17,7 +17,7 @@
    -

    분석

    +

    아기건강

    @@ -60,6 +60,9 @@
  • 예방접종 + <#if ( 0 < model['rm_vac_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 eb5fa35..ed8be4c 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 @@ -17,7 +17,7 @@
    -

    분석

    +

    아기건강

    @@ -56,6 +56,9 @@
  • 예방접종 + <#if ( 0 < model['rm_vac_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 063a409..b5c7034 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 @@ -17,7 +17,7 @@
    -

    분석

    +

    아기건강

    @@ -60,6 +60,9 @@
  • 예방접종 + <#if ( 0 < model['rm_vac_noti']['counting']!)> +
    +
    • @@ -82,21 +85,21 @@

    기초영양소

    에너지, 탄수화물, 단백질, 지방 등

    -
    <#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0%
    +
    <#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0점

  • 성장영양소

    비타민 B1/B2, 나이아신, 칼륨, 칼슘 등

    -
    <#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0%
    +
    <#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0점

  • 면역영양소

    비타민 A/C/D/E, 아연

    -
    <#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0%
    +
    <#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0점
    • 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 4e0d362..228235b 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 @@ -17,7 +17,7 @@
    -

    분석

    +

    아기건강

    @@ -56,6 +56,9 @@
  • 예방접종 + <#if ( 0 < model['rm_vac_noti']['counting'])> +
    +
    • diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl index f72fa54..c47b8a5 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl @@ -17,8 +17,8 @@
  • -
    분석
    -
    분석
    +
    아기건강
    +
    아기건강