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

[수정] 기타 오류, 체크리스트 수정

Browse Source 
- 아이 order 오류 수정
 - 기록단에서 아이 개월 문제 수정
 - 의사 표기 띄어쓰기 수정
 - 홈화면 기록 밀리는 문제 수정, 기록 카드 간격 조정
dev_bert
Unknown 3 years ago
parent 88c30ee876
commit eb392b8e36
7 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java
Unescape View File

@ -236,8 +236,9 @@ public class M_Bf_family_babyBOImpl extends AbstractBOManager implements M_Bf_fa
generalDAO.startTransaction();
generalDAO.delete("delete_bf_family_baby_disease_by_smc_no", paramMap);
generalDAO.delete("delete_bf_family_baby_order", paramMap);
result = generalDAO.delete("delete_bf_family_baby_single", paramMap);
generalDAO.commitTransaction();
} catch (SQLException e) {
throw e;

11
src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
Unescape View File

@ -183,11 +183,22 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "birth_height"))== true) paramMap.put("birth_height", 0);
if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "birth_head")) == true) paramMap.put("birth_head", 0);
// 3. 입력 or 수정 PROCESS 및 메세지 작성
String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "smc_no"))){
smc_no = String.valueOf(bf_family_babyBO.insert_bf_family_baby(paramMap));
List<DataMap> lm_child = bf_family_babyBO.select_bf_family_baby_list(paramMap);
DataMap.putToModel(model, "lm_child", lm_child);
ArrayList<HashMap<String, Object>> order_list = new ArrayList<>();
paramMap.put("smc_no", smc_no);
HashMap<String, Object> order = new HashMap<String, Object>();
order.put("smc_no", smc_no);
order.put("smc_order", lm_child.size());
order_list.add(order);
paramMap.put("order_list", order_list);
bf_family_babyBO.insert_bf_family_baby_order(paramMap);
log.info("-------------신규 smc_no 11 --------------- : " + smc_no);
ra.addFlashAttribute("script_msg", "등록되었습니다");

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

@ -464,7 +464,7 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_11' THEN
(
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'')
SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사: ', doctor_nm, ', 증상: ', checkup),'')
FROM tbl_bf_daily_nutrition_11 tn1
WHERE tn1.dn_no = x.dn_no
)
@ -514,12 +514,12 @@
FROM tbl_bf_daily_nutrition x
WHERE 1 =1
AND x.smc_no = #smc_no#
AND x.baseday = #base_dt#
AND DATE_FORMAT(x.reg_dt, '%Y-%m-%d') = #base_dt#
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 mod_dt DESC
</select>
<select id="select_bf_daily_nutrition_list_count" resultClass="Integer" parameterClass="dataMap">
@ -813,9 +813,9 @@
) XA
</select>
<insert id="insert_bf_daily_nutrition" parameterClass="dataMap">
<insert id="insert_bf_daily_nutrition" parameterClass="dataMap">
INSERT tbl_bf_daily_nutrition
(
(
reg_dt
,smc_no
,baseday
@ -826,8 +826,8 @@
NOW()
,#smc_no#
,#baseday#
<isNotEmpty property="append_src_img_file">,#append_src_img_file#</isNotEmpty>
<isNotEmpty property="append_300_img_file">,#append_300_img_file#</isNotEmpty>
<isNotEmpty property="append_src_img_file">,#append_src_img_file#</isNotEmpty>
<isNotEmpty property="append_300_img_file">,#append_300_img_file#</isNotEmpty>
,#nutirition_cd_no#
)
@ -1105,7 +1105,7 @@
<isNotEmpty property="allergy_cd_no">,allergy_cd_no</isNotEmpty>
<isNotEmpty property="db_dn_no">,db_dn_no</isNotEmpty>
<isNotEmpty property="db_dn_tp">,db_dn_tp</isNotEmpty>
<isNotEmpty property="weight">,weight</isNotEmpty>
<isNotEmpty property="eat_qty">,weight</isNotEmpty>
<isNotEmpty property="eat_qty">,eat_qty</isNotEmpty>
) VALUES (
STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p')
@ -1125,7 +1125,9 @@
<isNotEmpty property="allergy_cd_no">,#allergy_cd_no#</isNotEmpty>
<isNotEmpty property="db_dn_no">,#db_dn_no#</isNotEmpty>
<isNotEmpty property="db_dn_tp">,#db_dn_tp#</isNotEmpty>
<isNotEmpty property="weight">,#weight#</isNotEmpty>
<isNotEmpty property="eat_qty">
,#eat_qty#/(SELECT srv from tbl_db_nutrient where dn_no=(<isNotEmpty property="db_dn_no">#db_dn_no#</isNotEmpty>))
</isNotEmpty>
<isNotEmpty property="eat_qty">,#eat_qty#</isNotEmpty>
)
</insert>
@ -1369,7 +1371,7 @@
<isNotEmpty property="allergy_cd_no">,#allergy_cd_no#</isNotEmpty>
<isNotEmpty property="db_dhb_no">,#db_dhb_no#</isNotEmpty>
<isNotEmpty property="db_dhb_tp">,#db_dhb_tp#</isNotEmpty>
<isNotEmpty property="weight">,#weight#</isNotEmpty>
<isNotEmpty property="eat_qty">,#eat_qty#/100</isNotEmpty>
<isNotEmpty property="eat_qty">,#eat_qty#</isNotEmpty>
)

10
src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
Unescape View File

@ -109,7 +109,8 @@
FROM
(
SELECT
x.smc_no
z.smc_order
,x.smc_no
,x.name
,x.gender
,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday
@ -141,6 +142,7 @@
,(select d_title from tbl_d_day td where td.smc_no = x.smc_no and date_format(d_day, '%Y-%m-%d') >= date_format(now(), '%Y-%m-%d') order by td.d_day limit 1) as d_title
FROM tbl_bf_family_baby x
INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
LEFT JOIN tbl_bf_family_baby_order z on x.smc_no = z.smc_no
WHERE 1 =1
AND y.member_id = #member_id#
ORDER BY x.smc_no
@ -150,6 +152,8 @@
LEFT JOIN tbl_mt_file append_300_img_file
ON x.append_300_img_file = append_300_img_file.mt_file_seq
ORDER BY x.smc_order
</select>
<select id="select_bf_family_baby_list_count" resultClass="Integer" parameterClass="dataMap">
@ -335,6 +339,10 @@
DELETE FROM tbl_bf_family_baby WHERE smc_no = #smc_no#
</delete>
<delete id="delete_bf_family_baby_order" parameterClass="dataMap">
DELETE FROM tbl_bf_family_baby_order WHERE smc_no = #smc_no#
</delete>
<delete id="delete_bf_family_baby_multi" parameterClass="dataMap">
DELETE FROM tbl_bf_family_baby
WHERE smc_no IN

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

@ -306,7 +306,7 @@
WHERE tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_11' THEN
(select concat(ifnull(hosp_nm, ''), ' 의사:', doctor_nm, ', 증상: ', checkup)
(select concat(ifnull(hosp_nm, ''), ' 의사: ', doctor_nm, ', 증상: ', checkup)
from tbl_bf_daily_nutrition_11 tn1
where tn1.dn_no = b.dn_no
)

2
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
Unescape View File

@ -35,7 +35,7 @@
<div class="nutrition_header_child">
<div class="nutrition_header_child_top">
<p class="proimg"><img src="<#if model['rm_child']['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${model['rm_child']['append_300_img_file']!}<#else>${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png</#if>" alt="프로필 사진" /></p>
<p class="info"><span class="name">${model['rm_child']['name']!}</span><span class="age">${(model['rm_child']['m']?number/12)!}세 ${(model['rm_child']['m']?number%12)!}개월 (${model['rm_child']['gender_ko']!})</span></p>
<p class="info"><span class="name">${model['rm_child']['name']!}</span><span class="age">${(model['rm_child']['past_month']?number/12)!}세 ${(model['rm_child']['past_month']?number%12)!}개월 (${model['rm_child']['gender_ko']!})</span></p>
<p class="cal"><span id="nowdate" class="date">${model['rm']['reg_day']!}</span><span id="nowtime" class="clock">${model['rm']['reg_time']!}</span></p>
</div>
</div>

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

@ -16,8 +16,8 @@
.main_cont_camera .img_preview img { position: absolute; width:100%; height:100%; top: 50%; left: 50%; transform: translate(-50%, -50%); }
/* 퍼블리싱 수정 css */
.main_cont_camera { padding-top:50px; background: none; }
.main_cont_camera li { position:relative; width:100%; padding-bottom:200px; text-align:center; background: none; display: flex; }
.main_cont_camera { padding-top:50px; background: none; padding-bottom: 100px; }
.main_cont_camera li { position:relative; width:100%; padding-bottom:125px; text-align:center; background: none; display: flex; }
.main_cont_camera li:last-child { padding-bottom:50px; background: none; }
.main_cont_camera .img_preview { position:relative; overflow:hidden; width: 70px; height: 70px; margin: 0 43px 0 20px; background:#fff; border:5px solid #fff; border-radius:20px; box-shadow: 0 0 6px rgba(0, 0, 0, 0.2); }
.main_cont_camera .img_preview:after {

Write Preview
Loading…
Cancel
Save