가온앤 체크리스트 적용 1

dev_bert
정이솔 3 years ago
parent 53c7ee2aef
commit 136e5c706e

@ -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) {

@ -26,5 +26,6 @@ public interface M_Bf_growthBO {
public abstract DataMap select_bf_growth_vac_statistics(DataMap paramMap) throws Exception;
public abstract List<DataMap> 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;
}

@ -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;
}
}

@ -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<DataMap> 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<DataMap> 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);

@ -407,5 +407,24 @@
and date_add(fb.birthday,interval ch.to month) >= now()
order by recmnd_from_dt
</select>
<select id="select_bf_vac_noti_count" resultClass="dataMap" parameterClass="dataMap">
select
count(*) counting
, date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt
, date_format(date_add(fb.birthday,interval dvs.end_label month),'%Y. %m. %d') recmnd_to_dt
, date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month
, concat (dvs.round, ' 차 ', dv_disease ) as dv_disease
, dvs.round
from tbl_db_vac_schedule dvs
inner join tbl_db_vac dv
on dvs.dv_no = dv.dv_no
left join tbl_bf_family_baby fb
on fb.smc_no = #smc_no#
where smc_no = #smc_no#
and now() >= date_add(date_add(fb.birthday,interval start_label month), INTERVAL -3 DAY)
and date_add(fb.birthday,interval dvs.end_label month) >= now()
order by recmnd_from_dt , dvs.dv_no, dvs.round
</select>
</sqlMap>

@ -14,7 +14,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="${URL_ROOT}/m/bf_growth/food_balance.do?return_url=index" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">영양</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn"></div>
</header>
<!-- //header_sub -->
@ -24,6 +24,24 @@
<!-- nutrition_subMain_nutrient -->
<div class="nutrition_subMain_nutrient">
<div class="info_cont">
<div class="item">
<div class="circle" style="background-color: #FF3300;"></div>
불균형
</div>
<div class="item">
<div class="circle" style="background-color: #FFDE4D;"></div>
보통
</div>
<div class="item">
<div class="circle" style="background-color: #33CC33;"></div>
균형
</div>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-square-fill" viewBox="0 0 16 16" style="opacity: 0.56;">
<path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm8.93 4.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
</svg>
</div>
<!-- nutrient_wrap -->
<div class="nutrient_wrap">

@ -14,7 +14,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="${URL_ROOT}/m/bf_growth/nutrient_balance.do?return_url=index" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">영양</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn"></div>
</header>
<!-- //header_sub -->
@ -28,15 +28,15 @@
<div class="info_cont">
<div class="item">
<div class="circle" style="background-color: #FF3300;"></div>
불균형
초과
</div>
<div class="item">
<div class="circle" style="background-color: #FFDE4D;"></div>
보통
부족
</div>
<div class="item">
<div class="circle" style="background-color: #33CC33;"></div>
균형
적정
</div>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-square-fill" viewBox="0 0 16 16" style="opacity: 0.56;">
<path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm8.93 4.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>

@ -257,7 +257,7 @@
label += ' N SCORE : ';
}
label += Math.round(tooltipItem.yLabel * 100) / 100;
return label + " %";
return label + " ";
}
},
enabled: 'true',

@ -258,7 +258,7 @@
label += ' N SCORE : ';
}
label += Math.round(tooltipItem.yLabel * 100) / 100;
return label + " %";
return label + " ";
}
},
enabled: 'true',

@ -17,7 +17,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">분석</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn header_cart">
</div>
</header>
@ -61,6 +61,9 @@
<li>
<a href="${URL_ROOT}/m/bf_growth/vac_schedule.do?return_url=index">
예방접종
<#if ( 0 < model['rm_vac_noti']['counting'])>
<div class="new_icon"></div>
</#if>
</a>
</li>
</ul>
@ -84,14 +87,14 @@
<p class="tit">긍정식품군</p>
<p>모유, 분유, 곡류, 채소, 단백질, 과일 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['healthyFood']!}"><span class="title"><#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0</#if>%</span></div>
<div class="circleChart circleChart1" data-percent="${model['today']['healthyFood']!}"><span class="title"><#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0</#if></span></div>
</li>
<li>
<div class="txt">
<p class="tit">부정영양소</p>
<p>과일, 당 첨가식품, 음료, 과자 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['unhealthyFood']!}"><span class="title"><#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0</#if>%</span></div>
<div class="circleChart circleChart1" data-percent="${model['today']['unhealthyFood']!}"><span class="title"><#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0</#if></span></div>
</li>
</ul>
</div>

@ -17,7 +17,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">분석</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn header_cart">
</div>
</header>
@ -60,6 +60,9 @@
<li>
<a href="${URL_ROOT}/m/bf_growth/vac_schedule.do?return_url=index">
예방접종
<#if ( 0 < model['rm_vac_noti']['counting'])>
<div class="new_icon"></div>
</#if>
</a>
</li>
</ul>

@ -17,7 +17,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">분석</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn header_cart">
</div>
</header>
@ -56,6 +56,9 @@
<li>
<a href="${URL_ROOT}/m/bf_growth/vac_schedule.do?return_url=index">
예방접종
<#if ( 0 < model['rm_vac_noti']['counting'])>
<div class="new_icon"></div>
</#if>
</a>
</li>
</ul>

@ -17,7 +17,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">분석</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn header_cart">
</div>
</header>
@ -60,6 +60,9 @@
<li>
<a href="${URL_ROOT}/m/bf_growth/vac_schedule.do?return_url=index">
예방접종
<#if ( 0 < model['rm_vac_noti']['counting']!)>
<div class="new_icon"></div>
</#if>
</a>
</li>
</ul>
@ -82,21 +85,21 @@
<p class="tit">기초영양소</p>
<p>에너지, 탄수화물, 단백질, 지방 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['basicNutrition']!}"><span class="title"><#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0</#if>%</span></div>
<div class="circleChart circleChart1" data-percent="${model['today']['basicNutrition']!}"><span class="title"><#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0</#if></span></div>
</li>
<li>
<div class="txt">
<p class="tit">성장영양소</p>
<p>비타민 B1/B2, 나이아신, 칼륨, 칼슘 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['growthNutrition']!}"><span class="title"><#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0</#if>%</span></div>
<div class="circleChart circleChart1" data-percent="${model['today']['growthNutrition']!}"><span class="title"><#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0</#if></span></div>
</li>
<li>
<div class="txt">
<p class="tit">면역영양소</p>
<p>비타민 A/C/D/E, 아연</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['immuneNutrition']!}"><span class="title"><#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0</#if>%</span></div>
<div class="circleChart circleChart1" data-percent="${model['today']['immuneNutrition']!}"><span class="title"><#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0</#if></span></div>
</li>
</ul>
</div>

@ -17,7 +17,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">분석</h1>
<h1 class="header_title">아기건강</h1>
<div class="side_Rbtn header_cart">
</div>
</header>
@ -56,6 +56,9 @@
<li class="current">
<a href="${URL_ROOT}/m/bf_growth/vac_schedule.do?return_url=index">
예방접종
<#if ( 0 < model['rm_vac_noti']['counting'])>
<div class="new_icon"></div>
</#if>
</a>
</li>
</ul>

@ -17,8 +17,8 @@
<li class="nav_list02">
<a href="${URL_ROOT}/m/bf_growth/nutrient_balance.do?return_url=index">
<div class="icon">분석</div>
<div class="tit">분석</div>
<div class="icon">아기건강</div>
<div class="tit">아기건강</div>
</a>
</li>

Loading…
Cancel
Save