dev_bert
kyebyungha 3 years ago
commit fc736c79dd

@ -9,9 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="기록정보 홈화면 표시오류 수정"> <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="기록정보 홈화면 표시오류 수정-2">
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -255,14 +256,7 @@
<workItem from="1652058308312" duration="456000" /> <workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="3124000" /> <workItem from="1652060536329" duration="3124000" />
<workItem from="1652100883750" duration="5459000" /> <workItem from="1652100883750" duration="5459000" />
<workItem from="1652321382844" duration="7258000" /> <workItem from="1652321382844" duration="8153000" />
</task>
<task id="LOCAL-00022" summary="D-Day 관리기능 적용-2">
<created>1649519729954</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1649519729954</updated>
</task> </task>
<task id="LOCAL-00023" summary="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1"> <task id="LOCAL-00023" summary="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1">
<created>1649607799069</created> <created>1649607799069</created>
@ -600,7 +594,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1652340136434</updated> <updated>1652340136434</updated>
</task> </task>
<option name="localTasksCounter" value="71" /> <task id="LOCAL-00071" summary="기록정보 홈화면 표시오류 수정-2">
<created>1652340163521</created>
<option name="number" value="00071" />
<option name="presentableId" value="LOCAL-00071" />
<option name="project" value="LOCAL" />
<updated>1652340163521</updated>
</task>
<option name="localTasksCounter" value="72" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -620,7 +621,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="아이디 저장기능 적용" />
<MESSAGE value="체크리스트 오류 수정" /> <MESSAGE value="체크리스트 오류 수정" />
<MESSAGE value="계정연동 취소하기 기능적용-1" /> <MESSAGE value="계정연동 취소하기 기능적용-1" />
<MESSAGE value="계정연동 취소하기 기능적용-2" /> <MESSAGE value="계정연동 취소하기 기능적용-2" />
@ -645,6 +645,7 @@
<MESSAGE value="1. 젖병 기록 수정" /> <MESSAGE value="1. 젖병 기록 수정" />
<MESSAGE value="유축수유표시 오류 수정" /> <MESSAGE value="유축수유표시 오류 수정" />
<MESSAGE value="기록정보 홈화면 표시오류 수정" /> <MESSAGE value="기록정보 홈화면 표시오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="기록정보 홈화면 표시오류 수정" /> <MESSAGE value="기록정보 홈화면 표시오류 수정-2" />
<option name="LAST_COMMIT_MESSAGE" value="기록정보 홈화면 표시오류 수정-2" />
</component> </component>
</project> </project>

@ -521,6 +521,7 @@
AND x.nutirition_cd_no != '' AND x.nutirition_cd_no != ''
) x ) x
LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no ) z LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no ) z
WHERE z.time_val is not null
ORDER BY dn_no DESC ORDER BY dn_no DESC
</select> </select>

@ -218,134 +218,134 @@
</select> </select>
<select id="select_timeline" resultClass="dataMap" parameterClass="dataMap"> <select id="select_timeline" resultClass="dataMap" parameterClass="dataMap">
SELECT SELECT ifnull(DATEDIFF(XA.reg_dt, LAG(XA.reg_dt) OVER (ORDER BY b.reg_dt)), '0') as day_diff,
DATE_FORMAT(b.reg_dt, '%Y-%m-%d') as reg_date, ifnull(DATE_FORMAT(TIMEDIFF(XA.reg_dt, LAG(XA.reg_dt) OVER (ORDER BY XA.reg_dt)), '%H:%i'),'00:00') as time_diff,
DATE_FORMAT(b.reg_dt, '%H:%i %p') as hour_min, XA.reg_date,
ifnull(DATEDIFF(b.reg_dt, LAG(b.reg_dt) OVER (ORDER BY b.reg_dt)),'0') as day_diff, XA.hour_min,
ifnull(DATE_FORMAT(TIMEDIFF(b.reg_dt, LAG(b.reg_dt) OVER (ORDER BY b.reg_dt) ), '%H:%i'), '00:00') as time_diff, XA.title,
c.title, XA.dn_no,
b.dn_no, XA.cd_no,
c.cd_no, XA.val_1,
LPAD(c.val_1, 2, '0') as val_1, XA.color_cd,
(select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd, XA.time_val
CASE FROM (
when c.cd_no = 'BF_NU_TP_1' THEN SELECT DATE_FORMAT(b.reg_dt, '%Y-%m-%d') as reg_date,
(select concat(ifnull(eat_qty,0), 'ml') DATE_FORMAT(b.reg_dt, '%H:%i %p') as hour_min,
from tbl_bf_daily_nutrition_1 tn1 c.title,
where tn1.dn_no = b.dn_no b.dn_no,
) c.cd_no,
when c.cd_no = 'BF_NU_TP_2' THEN b.reg_dt,
(select LPAD(c.val_1, 2, '0') as val_1,
case when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'') (select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd,
else ifnull(concat('유축수유', ' ', eat_qty, 'ml'),'') CASE
end when c.cd_no = 'BF_NU_TP_1' THEN
from tbl_bf_daily_nutrition_2 tn1 (select concat(ifnull(eat_qty, 0), 'ml') from tbl_bf_daily_nutrition_1 tn1 where tn1.dn_no = b.dn_no)
left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87 when c.cd_no = 'BF_NU_TP_2' THEN
WHERE tn1.dn_no = b.dn_no (select case
) when tn1.milk_tp = 87 then ifnull(concat(ifnull(tn.prd_nm, ''), ' ', eat_qty, 'ml'), '')
when c.cd_no = 'BF_NU_TP_3' THEN else ifnull(concat('유축수유', ' ', eat_qty, 'ml'), '')
(select end
concat( from tbl_bf_daily_nutrition_2 tn1
case left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '') WHERE tn1.dn_no = b.dn_no
when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '') )
end when c.cd_no = 'BF_NU_TP_3' THEN
,' ' (select concat(
,tn1.eat_qty, 'ml 섭취' case
) when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
from tbl_bf_daily_nutrition_3 tn1 when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no end
left outer join tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no , ' '
where tn1.dn_no = b.dn_no , tn1.eat_qty, 'ml 섭취'
) )
when c.cd_no = 'BF_NU_TP_5' THEN from tbl_bf_daily_nutrition_3 tn1
(select concat( ifnull(sleep_h,0), '시 ', ifnull(sleep_m,0), '분') left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no
from tbl_bf_daily_nutrition_5 tn1 left outer join tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_6' THEN when c.cd_no = 'BF_NU_TP_5' THEN
(select tn2.title (select concat(ifnull(sleep_h, 0), '시 ', ifnull(sleep_m, 0), '분')
from tbl_bf_daily_nutrition_6 tn1 from tbl_bf_daily_nutrition_5 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
where tn1.dn_no = b.dn_no )
) when c.cd_no = 'BF_NU_TP_6' THEN
when c.cd_no = 'BF_NU_TP_7' THEN (select tn2.title
( from tbl_bf_daily_nutrition_6 tn1
SELECT ifnull(tv.dv_disease,'') inner join tbl_code_item_str tn2
FROM tbl_bf_daily_nutrition_7 tn1 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no where tn1.dn_no = b.dn_no
INNER JOIN tbl_db_vac tv on tn2.dv_no = tv.dv_no )
WHERE tn1.dn_no = b.dn_no when c.cd_no = 'BF_NU_TP_7' THEN
) (
when c.cd_no = 'BF_NU_TP_9' THEN SELECT ifnull(tv.dv_disease, '')
(select FROM tbl_bf_daily_nutrition_7 tn1
concat( INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no
case INNER JOIN tbl_db_vac tv on tn2.dv_no = tv.dv_no
when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '') WHERE tn1.dn_no = b.dn_no
when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '') )
end when c.cd_no = 'BF_NU_TP_9' THEN
, (select concat(
tn1.eat_qty, 'ml 섭취' case
) when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
from tbl_bf_daily_nutrition_9 tn1 when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no end
left outer join tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no ,
where tn1.dn_no = b.dn_no tn1.eat_qty, 'ml 섭취'
) )
when c.cd_no = 'BF_NU_TP_10' THEN from tbl_bf_daily_nutrition_9 tn1
( left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
SELECT left outer join tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
concat( where tn1.dn_no = b.dn_no
case )
when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '') when c.cd_no = 'BF_NU_TP_10' THEN
when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '') (
end , tn1.eat_qty, 'ml 섭취' ) SELECT concat(
FROM tbl_bf_daily_nutrition_10 tn1 case
LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '')
LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
WHERE tn1.dn_no = b.dn_no end, tn1.eat_qty, 'ml 섭취')
) FROM tbl_bf_daily_nutrition_10 tn1
when c.cd_no = 'BF_NU_TP_11' THEN LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
(select LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup) WHERE tn1.dn_no = b.dn_no
from tbl_bf_daily_nutrition_11 tn1 )
where tn1.dn_no = b.dn_no when c.cd_no = 'BF_NU_TP_11' THEN
) (select concat(ifnull(hosp_nm, ''), ' 의사:', doctor_nm, ', 증상: ', checkup)
when c.cd_no = 'BF_NU_TP_12' THEN from tbl_bf_daily_nutrition_11 tn1
(select where tn1.dn_no = b.dn_no
daily_life )
from tbl_bf_daily_nutrition_12 tn1 when c.cd_no = 'BF_NU_TP_12' THEN
where tn1.dn_no = b.dn_no (select daily_life
) from tbl_bf_daily_nutrition_12 tn1
when c.cd_no = 'BF_NU_TP_13' THEN where tn1.dn_no = b.dn_no
(select )
achievement when c.cd_no = 'BF_NU_TP_13' THEN
from tbl_bf_daily_nutrition_13 tn1 (select achievement
where tn1.dn_no = b.dn_no from tbl_bf_daily_nutrition_13 tn1
) where tn1.dn_no = b.dn_no
when c.cd_no = 'BF_NU_TP_14' THEN )
(select when c.cd_no = 'BF_NU_TP_14' THEN
concat(ifnull(blq + brq,0), 'ml') (select concat(ifnull(blq + brq, 0), 'ml')
from tbl_bf_daily_nutrition_14 tn1 from tbl_bf_daily_nutrition_14 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_15' THEN when c.cd_no = 'BF_NU_TP_15' THEN
(select (select concat(ifnull(etc_symptom, ''), ' ', ifnull(temperature, ''))
concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) 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 AS time_val
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
WHERE WHERE a.member_id = #member_id#
a.member_id = #member_id# and a.smc_no = #smc_no#
and a.smc_no = #smc_no# and b.reg_dt between date_add(now(), interval -1 month ) and now()
and b.reg_dt between date_add(now(),interval -1 month ) and now() and b.nutirition_cd_no != ''
and b.nutirition_cd_no != '' ) XA
ORDER BY b.reg_dt WHERE XA.time_val is not NULL
</select> ORDER BY XA.reg_dt
</select>
<select id="select_timeline_color_cd" resultClass="dataMap" parameterClass="dataMap"> <select id="select_timeline_color_cd" resultClass="dataMap" parameterClass="dataMap">
SELECT SELECT

Loading…
Cancel
Save