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

[수정] 메모리 월간,일간 버그 수정

Browse Source
dev_bert
정이솔 3 years ago
parent fb30d19699
commit b332d133e3
2 changed files with 245 additions and 7 deletions
Show Stats Download Patch File Download Diff File

250
src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
Unescape View File

@ -12,7 +12,8 @@
CASE WHEN (XA.hour * 3.4) + (add_degree * 3.4) > 340 then (100-hour) * 3.4 CASE WHEN (XA.hour * 3.4) + (add_degree * 3.4) > 340 then (100-hour) * 3.4
ELSE XA.add_degree ELSE XA.add_degree
END as add_degree, END as add_degree,
XA.cnt XA.cnt,
XA.time_val
FROM FROM
( (
SELECT SELECT
@ -64,7 +65,7 @@
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_10' THEN when c.cd_no = 'BF_NU_TP_10' THEN
(select (bm * 60 + bs) * 0.233 (select (bm + bs) * 0.233
from tbl_bf_daily_nutrition_10 tn1 from tbl_bf_daily_nutrition_10 tn1
left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
@ -96,7 +97,124 @@
) )
END END
, 1) AS add_degree, , 1) AS add_degree,
count(*) as cnt count(*) as cnt,
CASE
WHEN c.cd_no = 'BF_NU_TP_1' THEN
(
SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_2' THEN
(
SELECT
case when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
else ifnull(concat('유축수유', ' ', eat_qty, 'ml'),'')
end
FROM tbl_bf_daily_nutrition_2 tn1
LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_3' THEN
(
SELECT
concat(
case
when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
end
,' '
,tn1.eat_qty, 'g(ml) 섭취'
)
FROM tbl_bf_daily_nutrition_3 tn1
LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no
LEFT OUTER JOIN tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_5' THEN
( SELECT
concat(
(case when sleep_tp = 15 then '낮잠' when sleep_tp = 16 then '밤잠' end),
' ',
ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
)
FROM tbl_bf_daily_nutrition_5 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_6' THEN
( SELECT
concat(
(case when rest_tp = 19 then '대변량' when rest_tp = 20 then '소변량' end),
' ',
ifnull(tn2.title,'')
)
FROM tbl_bf_daily_nutrition_6 tn1
INNER JOIN tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_7' THEN
(
ufn_get_dv_disease(b.dn_no)
)
WHEN c.cd_no = 'BF_NU_TP_9' THEN
(
SELECT
concat(
case
when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
end
,
tn1.eat_qty, 'g(ml) 섭취'
)
FROM tbl_bf_daily_nutrition_9 tn1
LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_10' THEN
(
SELECT
concat(
case
when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '')
when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
end , tn1.eat_qty, 'g(ml) 섭취' )
FROM tbl_bf_daily_nutrition_10 tn1
LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_11' THEN
(
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사: ', doctor_nm, ', 증상: ', checkup),'')
FROM tbl_bf_daily_nutrition_11 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_12' THEN
(
SELECT ifnull(daily_life, '')
FROM tbl_bf_daily_nutrition_12 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_13' THEN
(
SELECT achievement
FROM tbl_bf_daily_nutrition_13 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_14' THEN
(
SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'')
FROM tbl_bf_daily_nutrition_14 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_15' THEN
(
SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
FROM tbl_bf_daily_nutrition_15 tn1
WHERE tn1.dn_no = b.dn_no
)
END AS time_val
FROM tbl_bf_family_match a FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
@ -107,13 +225,15 @@
group by DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0') group by DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0')
order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc
) XA ) XA
where XA.time_val is not null
</select> </select>
<select id="select_day" resultClass="dataMap" parameterClass="dataMap"> <select id="select_day" resultClass="dataMap" parameterClass="dataMap">
SELECT start_degree, SELECT start_degree,
category, category,
title, title,
CASE WHEN add_degree = '0' then '1' else add_degree END as add_degree CASE WHEN add_degree = '0' then '1' else add_degree END as add_degree,
time_val
FROM ( FROM (
SELECT DATE_FORMAT(b.reg_dt, '%H:%i') as hour_min, SELECT DATE_FORMAT(b.reg_dt, '%H:%i') as hour_min,
(DATE_FORMAT(b.reg_dt, '%H') * 60 + DATE_FORMAT(b.reg_dt, '%i')) * 0.25 as start_degree, (DATE_FORMAT(b.reg_dt, '%H') * 60 + DATE_FORMAT(b.reg_dt, '%i')) * 0.25 as start_degree,
@ -162,7 +282,7 @@
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_10' THEN when c.cd_no = 'BF_NU_TP_10' THEN
(select bm * 60 + bs (select bm + bs
from tbl_bf_daily_nutrition_10 tn1 from tbl_bf_daily_nutrition_10 tn1
left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
@ -192,7 +312,124 @@
from tbl_bf_daily_nutrition_15 tn1 from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
END, 1) * 0.25 AS add_degree END, 4) * 0.25 AS add_degree,
CASE
WHEN c.cd_no = 'BF_NU_TP_1' THEN
(
SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_2' THEN
(
SELECT
case when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
else ifnull(concat('유축수유', ' ', eat_qty, 'ml'),'')
end
FROM tbl_bf_daily_nutrition_2 tn1
LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_3' THEN
(
SELECT
concat(
case
when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
end
,' '
,tn1.eat_qty, 'g(ml) 섭취'
)
FROM tbl_bf_daily_nutrition_3 tn1
LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no
LEFT OUTER JOIN tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_5' THEN
( SELECT
concat(
(case when sleep_tp = 15 then '낮잠' when sleep_tp = 16 then '밤잠' end),
' ',
ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
)
FROM tbl_bf_daily_nutrition_5 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_6' THEN
( SELECT
concat(
(case when rest_tp = 19 then '대변량' when rest_tp = 20 then '소변량' end),
' ',
ifnull(tn2.title,'')
)
FROM tbl_bf_daily_nutrition_6 tn1
INNER JOIN tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_7' THEN
(
ufn_get_dv_disease(b.dn_no)
)
WHEN c.cd_no = 'BF_NU_TP_9' THEN
(
SELECT
concat(
case
when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
end
,
tn1.eat_qty, 'g(ml) 섭취'
)
FROM tbl_bf_daily_nutrition_9 tn1
LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_10' THEN
(
SELECT
concat(
case
when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '')
when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
end , tn1.eat_qty, 'g(ml) 섭취' )
FROM tbl_bf_daily_nutrition_10 tn1
LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_11' THEN
(
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사: ', doctor_nm, ', 증상: ', checkup),'')
FROM tbl_bf_daily_nutrition_11 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_12' THEN
(
SELECT ifnull(daily_life, '')
FROM tbl_bf_daily_nutrition_12 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_13' THEN
(
SELECT achievement
FROM tbl_bf_daily_nutrition_13 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_14' THEN
(
SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'')
FROM tbl_bf_daily_nutrition_14 tn1
WHERE tn1.dn_no = b.dn_no
)
WHEN c.cd_no = 'BF_NU_TP_15' THEN
(
SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
FROM tbl_bf_daily_nutrition_15 tn1
WHERE tn1.dn_no = b.dn_no
)
END AS time_val
FROM tbl_bf_family_match a FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
@ -203,6 +440,7 @@
GROUP BY DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H:%i:') GROUP BY DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H:%i:')
ORDER BY add_degree desc ORDER BY add_degree desc
) XA ) XA
where XA.time_val is not null
</select> </select>
<select id="select_day_week" resultClass="dataMap" parameterClass="dataMap"> <select id="select_day_week" resultClass="dataMap" parameterClass="dataMap">

2
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -180,7 +180,7 @@
</ul> </ul>
<ul class="number_right"> <ul class="number_right">
<li>01</li> <li>00</li>
<li>03</li> <li>03</li>
<li>06</li> <li>06</li>
<li>09</li> <li>09</li>

Write Preview
Loading…
Cancel
Save