java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf into devs

Browse Source
dev_bert
jonghwan76 3 years ago
parent 4d9c43a572 ea686fead1
commit a386278ac8
7 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java
Unescape View File

@ -122,7 +122,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
result = generalDAO.update("update_bf_daily_nutrition", paramMap);
for(int i = 1; i < BF_NU_TP_MAX; i++) {
generalDAO.insert("delete_bf_daily_nutrition_" + i + "_by_dn_no", paramMap);
generalDAO.delete("delete_bf_daily_nutrition_" + i + "_by_dn_no", paramMap);
}
String nutirition_cd_no = RenaStringUtil.getData(paramMap, "nutirition_cd_no");
@ -132,7 +132,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
break;
}
}
generalDAO.delete("delete_bf_daily_nutrition_memo", paramMap);
generalDAO.commitTransaction();
} catch (SQLException e) {
throw e;

4
src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java
Unescape View File

@ -147,7 +147,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
int m = rm_child.getInt("m");
if(m<60) {
// if(m<60) {
// 당일 균형 판정
Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd");
@ -249,7 +249,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
monthly.add(data);
}
}
// }
DataMap.putToModel(model, "today", today);
DataMap.putToModel(model, "daily", daily);

57
src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
Unescape View File

@ -7,8 +7,7 @@
,x.afterbirthday
,x.fed_rs
,x.emo_pre
,x.emo_post
,x.emo_post
,x.lacto
,x.fdv
,x.eat_qty
@ -18,7 +17,10 @@
,x.brs
,x.srv
,x.rem
,m.memo
FROM tbl_bf_daily_nutrition_1 x
LEFT JOIN tbl_bf_daily_nutrition_memo m
ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -30,18 +32,18 @@
,x.afterbirthday
,x.fed_rs
,x.emo_pre
,x.emo_post
,x.emo_post
,x.db_dn_no
,x.lacto
,x.eat_qty
,x.bm
,x.bs
,x.rem
,x.rem
,dn.prd_nm
,m.memo
FROM tbl_bf_daily_nutrition_2 x
LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -53,8 +55,7 @@
,x.afterbirthday
,x.fed_rs
,x.emo_pre
,x.emo_post
,x.emo_post
,x.bm
/*
,DATE_FORMAT(x.bm, '%h') As h
@ -68,8 +69,10 @@
,x.weight
,dn.prd_nm
,x.eat_qty
,m.memo
FROM tbl_bf_daily_nutrition_3 x
LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -85,11 +88,12 @@
,x.cup_cd_no
,x.eat_qty
,x.db_dn_no
,x.db_dn_no
,dn.prd_nm
,m.memo
FROM tbl_bf_daily_nutrition_4 x
LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -109,7 +113,9 @@
,x.sleep_s_m
,x.sleep_h
,x.sleep_m
,m.memo
FROM tbl_bf_daily_nutrition_5 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -120,13 +126,14 @@
DATE_FORMAT(x.birthday, '%Y.%m.%d') AS birthday
,x.afterbirthday
,x.emo_pre
,x.emo_post
,x.emo_post
,x.rest_rs
,x.rest_tp
,x.rest_qty
,x.rest_color
,m.memo
FROM tbl_bf_daily_nutrition_6 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -138,7 +145,6 @@
,x.afterbirthday
,x.emo_pre
,x.emo_post
,x.label
,x.vac_rs
,x.vac_alg_tp
@ -146,11 +152,11 @@
,x.m
,x.d
,x.db_dvs_no
,x.memo
,m.memo
,dv.dv_disease AS disease
,dv.dv_type AS type
FROM tbl_bf_daily_nutrition_7 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
LEFT JOIN tbl_db_vac_schedule dvs ON x.db_dvs_no=dvs.dvs_no
LEFT JOIN tbl_db_vac dv ON dvs.dv_no=dv.dv_no
WHERE 1 = 1
@ -173,8 +179,10 @@
,x.db_dn_no
,dn.prd_nm
,m.memo
FROM tbl_bf_daily_nutrition_8 x
LEFT JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -195,8 +203,10 @@
,x.db_dhb_no
,x.weight
,hb.name
,m.memo
FROM tbl_bf_daily_nutrition_9 x
LEFT JOIN tbl_db_home_bf hb ON hb.dhb_no = x.db_dhb_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -220,12 +230,14 @@
when db_dbc_tp = 'sf' then
df.prd_nm
end ) prd_nm
,m.memo
from
tbl_bf_daily_nutrition_10 x
left join tbl_db_bf_commerce dn
on dn.dbc_no = x.db_dbc_no
left join tbl_db_sf_commerce df
on df.dbc_no = x.db_dbc_no
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -239,7 +251,9 @@
,hosp_nm
,doctor_nm
,checkup
,m.memo
FROM tbl_bf_daily_nutrition_11 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -252,7 +266,9 @@
,disturb_min
,disturb_sec
,daily_life
,m.memo
FROM tbl_bf_daily_nutrition_12 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -263,7 +279,9 @@
DATE_FORMAT(x.birthday, '%Y.%m.%d') AS birthday
,x.afterbirthday
,achievement
,m.memo
FROM tbl_bf_daily_nutrition_13 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -279,7 +297,9 @@
,x.brs
,x.blq
,x.brq
,m.memo
FROM tbl_bf_daily_nutrition_14 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -291,7 +311,9 @@
,x.afterbirthday
,x.temperature
,x.etc_symptom
,m.memo
FROM tbl_bf_daily_nutrition_15 x
LEFT JOIN tbl_bf_daily_nutrition_memo m ON x.dn_no = m.dn_no
WHERE 1 = 1
AND x.dn_no = #dn_no#
AND x.smc_no = #smc_no#
@ -1122,6 +1144,11 @@
,#memo#
)
</insert>
<delete id="delete_bf_daily_nutrition_memo" parameterClass="dataMap">
DELETE FROM tbl_bf_daily_nutrition_memo
WHERE dn_no = #dn_no#
</delete>
<select id="select_db_vac_list" resultClass="dataMap" parameterClass="dataMap">
SELECT x.*

12
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_11.ftl
Unescape View File

@ -1,16 +1,4 @@
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="/bf/m/js/jquery.bpopup.min.js"></script>
<link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/jquery-ui.min.css">
<!-- nutrition_kinds_basic -->
<div class="nutrition_kinds_basic nutrition_kinds_toilet">
<h2>방문 유형을 선택해주세요.</h2>
<ul class="nutrition_list_reason nutrition_list_reason_half li_check" id="hosp_tp">
<#if model['lm_hosp_tp']? has_content>
<#list model['lm_hosp_tp'] as item>
<li onclick="javascript:save.set('hosp_tp', '${item['cd_no']}');"> ${item['title']}</li>
</#list>
</#if>
</ul>
</div>
<!-- //nutrition_kinds_basic -->

3
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl
Unescape View File

@ -51,7 +51,7 @@
<input type="hidden" id="rest_rs" name="rest_rs" value="${model['rm']['rest_rs']!}" />
<input type="hidden" id="rest_tp" name="rest_tp" value="${model['rm']['rest_tp']!}" />
<input type="hidden" id="hosp_tp" name="hosp_tp" value="${model['rm']['hosp_nm']!}" />
<input type="hidden" id="hosp_tp" name="hosp_tp" value="${model['rm']['hosp_tp']!}" />
<input type="hidden" id="hosp_nm" name="hosp_nm" value="${model['rm']['hosp_nm']!}" />
<input type="hidden" id="doctor_nm" name="doctor_nm" value="${model['rm']['doctor_nm']!}" />
<input type="hidden" id="checkup" name="checkup" value="${model['rm']['checkup']!}" />
@ -147,6 +147,7 @@
<script>
var save = {
set : function(name, value){
debugger;
$('#' + name).val(value);
},

19
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_11.ftl
Unescape View File

@ -6,25 +6,38 @@
</div>
<!-- //병원 -->
<!-- nutrition_kinds_basic -->
<div class="nutrition_kinds_basic nutrition_kinds_toilet">
<h2>방문 유형을 선택해주세요.</h2>
<ul class="nutrition_list_reason nutrition_list_reason_half li_check">
<#if model['lm_hosp_tp']? has_content>
<#list model['lm_hosp_tp'] as item>
<li onclick="javascript:save.set('hosp_tp', '${item['cd_no']}');" class="<#if model['rm']['hosp_tp']?exists && model['rm']['hosp_tp'] == item['cd_no']?c >active<#else>non-active</#if>"> ${item['title']}</li>
</#list>
</#if>
</ul>
</div>
<!-- //nutrition_kinds_basic -->
<!-- nutrition_kinds_basic02 -->
<div class="nutrition_kinds_basic02">
<div class="p_list_item p_border_box">
<label for="child_height" class="p_label">병원명</label>
<div class="p_input_box">
<input type="text" id="hosp_nm" name="hosp_Nm" value="${model['hosp_nm']!}" class="required" placeholder="병원명을 입력하세요" style ="width:300px;float:right;margin-top:10px;">
<input type="text" id="hosp_nm" name="hosp_nm" value="${model['rm']['hosp_nm']!}" class="required" placeholder="병원명을 입력하세요" style ="width:300px;float:right;margin-top:10px;">
</div>
</div>
<div class="p_list_item p_border_box">
<label for="child_height" class="p_label">의사명</label>
<div class="p_input_box">
<input type="text" id="doctor_nm" name="doctor_nm" value="${model['doctor_nm']!}" class="required" placeholder="의사명을 입력하세요" style ="width:300px;float:right;margin-top:10px;">
<input type="text" id="doctor_nm" name="doctor_nm" value="${model['rm']['doctor_nm']!}" class="required" placeholder="의사명을 입력하세요" style ="width:300px;float:right;margin-top:10px;">
</div>
</div>
<div class="p_list_item p_border_box">
<label for="child_height" class="p_label">검진내용</label>
<div class="p_input_box">
<input type="text" id="checkup" name="checkup" value="${model['checkup']!}" class="required" placeholder="검진내용을 입력하세요" style ="width:500px;float:right;margin-top:10px;">
<input type="text" id="checkup" name="checkup" value="${model['rm']['checkup']!}" class="required" placeholder="검진내용을 입력하세요" style ="width:500px;float:right;margin-top:10px;">
</div>
</div>
</div>

1
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -408,6 +408,7 @@
$('#base_dt_max_h').text(not_h)
$('#last_h').text( '-')
}
if(result.rm_last_w){
$('#base_dt_max_w').text(result.rm_last_w.base_dt_max)
$('#last_w').text(result.rm_last_w.height)

Write Preview
Loading…
Cancel
Save