diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b427870..337e8c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,14 @@
-
+
+
+
+
+
@@ -256,14 +260,7 @@
-
-
-
- 1649339670142
-
-
-
- 1649339670142
+
1649494087226
@@ -601,7 +598,14 @@
1652323538976
-
+
+ 1652324219016
+
+
+
+ 1652324219016
+
+
@@ -621,7 +625,6 @@
-
@@ -646,6 +649,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/resources/bf.properties b/src/main/resources/bf.properties
index 4b251e2..c22ece4 100644
--- a/src/main/resources/bf.properties
+++ b/src/main/resources/bf.properties
@@ -1,8 +1,8 @@
########## 개발 Environment ##########
-URL_BASE=http://121.166.66.72:14280
+URL_BASE=http://devops.lookylooks.ai:14280
SERVER_TP_KOR=개발
SERVER_TP=DEV
-system.domain=http://121.166.66.72:14280
+system.domain=http://devops.lookylooks.ai:14280
system.weburl=http://devops.lookylooks.ai:14288
SERVER_NAME=bf
PLATFORM_VERSION = 1.0
@@ -51,7 +51,7 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123
-file.music_path=c:/bf/music/
+file.music_path=/home/imcloud/Music
smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=gaonn&0509
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index 0c48276..f6c2ad5 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -379,12 +379,14 @@
WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
(
SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1
- INNER JOIN tbl_db_nutrient tn on tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
(
- SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
+ 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 = x.dn_no
@@ -413,7 +415,6 @@
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
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_6' THEN
@@ -424,7 +425,6 @@
ifnull(tn2.title,'')
)
FROM tbl_bf_daily_nutrition_6 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
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 = x.dn_no
)
@@ -432,7 +432,6 @@
(
SELECT ifnull(tv.dv_disease,'')
FROM tbl_bf_daily_nutrition_7 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no
INNER JOIN tbl_db_vac tv on tn2.dv_no = tv.dv_no
WHERE tn1.dn_no = x.dn_no
@@ -449,7 +448,6 @@
tn1.eat_qty, 'ml 섭취'
)
FROM tbl_bf_daily_nutrition_9 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
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 = x.dn_no
@@ -463,7 +461,6 @@
when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
end , tn1.eat_qty, 'ml 섭취' )
FROM tbl_bf_daily_nutrition_10 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
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 = x.dn_no
@@ -472,35 +469,30 @@
(
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'')
FROM tbl_bf_daily_nutrition_11 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_12' THEN
(
SELECT ifnull(daily_life, '')
FROM tbl_bf_daily_nutrition_12 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_13' THEN
(
SELECT achievement
FROM tbl_bf_daily_nutrition_13 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_14' THEN
(
SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'')
FROM tbl_bf_daily_nutrition_14 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
(
SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
FROM tbl_bf_daily_nutrition_15 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
END AS time_val
@@ -529,8 +521,7 @@
AND x.nutirition_cd_no != ''
) x
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