Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into databank

src/main/resources/messages/message_ko.properties

@@ -33,6 +33,7 @@ menu.main.appGuide = 앱 사용 문의 : 1661-8308
 title.healthRecord = 건강정보기록
 
 header.previous = 이전
+header.next = 다음
 
 health.tab.bodyTemp = 체온
 health.tab.bloodPh = 혈압/맥박수
@@ -212,12 +213,39 @@ survey.confirm = 확인
 
 
 
-# 기록 보기
+# 기록 보기 /mobile/history
 title.viewRecord = 기록보기
-
-
-
-
-
-# 메시지 수신함
-title.messageReceived = 메시지 수신함
+history.btn.serveyhistory = 문진 내역 보기
+history.healthHistory = 건강기록
+history.unmeasured =  미측정
+history.division = 구분
+history.morning = 오전
+history.afternoon = 오후
+history.record.bodyTemp = 체온
+history.record.bloodPh = 맥박수/혈압
+history.record.oxygen = 산소포화도
+history.record.bloodSugar = 혈당
+history.record.symptom = 임상증상
+history.record.mental = 정신건강
+history.confirm = 확인
+history.bloodPressureLevelCon = 수축기
+history.bloodPressureLevelRel = 이완기
+history.score = 점
+history.number = 번
+history.vas = 주관적 심리적 고통정도
+history.result.normal = 정상
+history.result.light = 경미한 수준
+history.result.middle = 중간 수준
+history.result.slightlySevere = 약간 심한 수준
+history.result.severe = 심한 수준
+history.result.warning = 주의 요망
+history.depressed = 우울
+history.injury.stressSymptoms = 외상 후 스트레스 증상
+history.question = 문항
+
+
+
+# 메시지 수신함 /mobile/push/list
+title.messageInbox = 메시지 수신함
+push.monthlyPushMessage.ReceptionHistory = 월별 푸시메시지 수신 내역
+push.emptyMessageInbox = 받은 푸시 메시지가 없습니다

src/main/webapp/WEB-INF/jsp/mobile/history/history.jsp

@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
@@ -9,31 +10,34 @@
         <div class="container">
             <div class="header">
                 <div class="previous">
-                    <a href="./menu">이전</a>
+                    <a href="./menu"><spring:message code="header.previous" /></a>
                 </div>
                 <div class="title">
-                    기록보기
+                    <spring:message code="title.viewRecord" />
                 </div>
             </div>
             <div class="examination">
                 <div class="daily">
-                    <a href="?date=${prevDate}" class="previous active">이전</a>
-                    <c:out value="${date}"/>
+                    <a href="?date=${prevDate}" class="previous active"><spring:message code="header.previous" /></a>
+                    <fmt:parseDate var="cDate" value="${date}" pattern="yyyy-MM-dd" />
+                    <c:set var="currentDate"><fmt:formatDate value="${cDate}" type="date" /></c:set>
+                    <c:out value="${currentDate}" />
+
                     <c:if test="${nextDate <= nowDate}">
-                        <a href="?date=${nextDate}" class="next active">다음</a>
+                        <a href="?date=${nextDate}" class="next active"><spring:message code="header.next" /></a>
                     </c:if>
                 </div>
                 <div class="history">
                     <c:if test="${munjinCnt > 0}">
-                        <a href="./serveyhistory">문진 내역 보기 ▶</a>
+                        <a href="./serveyhistory"><spring:message code="history.btn.serveyhistory" /> ▶</a>
                     </c:if>
                     <c:if test="${munjinCnt eq 0}">
-                        <a href="./servey">문진 내역 보기 ▶</a>
+                        <a href="./servey"><spring:message code="history.btn.serveyhistory" /> ▶</a>
                     </c:if>
                 </div>
                 <div class="data">
                     <div class="point">
-                        건강기록
+                        <spring:message code="history.healthHistory" />
                     </div>
                     <div class="table">
                         <table>
@@ -44,18 +48,18 @@
                             </colgroup>
                             <thead class="gray">
                                 <tr>
-                                    <th>구분</th>
-                                    <th>오전</th>
-                                    <th>오후</th>
+                                    <th><spring:message code="history.division" /></th>
+                                    <th><spring:message code="history.morning" /></th>
+                                    <th><spring:message code="history.afternoon" /></th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr>
-                                    <th>체온</th>
+                                    <th><spring:message code="history.record.bodyTemp" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.amTemperature eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -70,7 +74,7 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.pmTemperature eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -83,11 +87,11 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th>맥박수/혈압</th>
+                                    <th><spring:message code="history.record.bloodPh" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.amPulseRate eq null and historyData.amSystolicBloodPressure eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -102,8 +106,8 @@
                                                     <c:set var="amSystolicBloodPressureData" value="${fn:split( historyData.amSystolicBloodPressure,'/' )[0]}" />
                                                     <c:set var="amSystolicBloodPressureDate" value="${fn:split( historyData.amSystolicBloodPressure,'/' )[1]}" />
                                                     <c:set var="amDiastolicBloodPressureData" value="${fn:split( historyData.amDiastolicBloodPressure,'/' )[0]}" />
-                                                    <div class="mini">수축기<c:out value="${amSystolicBloodPressureData}"/>mmHg</div>
-                                                    <div class="mini">이완기 <c:out value="${amDiastolicBloodPressureData}"/>mmHg</div>
+                                                    <div class="mini"><spring:message code="history.bloodPressureLevelCon" /><c:out value="${amSystolicBloodPressureData}"/>mmHg</div>
+                                                    <div class="mini"><spring:message code="history.bloodPressureLevelRel" /> <c:out value="${amDiastolicBloodPressureData}"/>mmHg</div>
                                                     <div class="date"><c:out value="${amSystolicBloodPressureDate}"/></div>
                                                 </c:if>
                                             </c:otherwise>
@@ -112,7 +116,7 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.pmPulseRate eq null and historyData.pmSystolicBloodPressure eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -127,8 +131,8 @@
                                                     <c:set var="pmSystolicBloodPressureData" value="${fn:split( historyData.pmSystolicBloodPressure,'/' )[0]}" />
                                                     <c:set var="pmSystolicBloodPressureDate" value="${fn:split( historyData.pmSystolicBloodPressure,'/' )[1]}" />
                                                     <c:set var="pmDiastolicBloodPressureData" value="${fn:split( historyData.pmDiastolicBloodPressure,'/' )[0]}" />
-                                                    <div class="mini">수축기<c:out value="${pmSystolicBloodPressureData}"/>mmHg</div>
-                                                    <div class="mini">이완기 <c:out value="${pmDiastolicBloodPressureData}"/>mmHg</div>
+                                                    <div class="mini"><spring:message code="history.bloodPressureLevelCon" /><c:out value="${pmSystolicBloodPressureData}"/>mmHg</div>
+                                                    <div class="mini"><spring:message code="history.bloodPressureLevelRel" /><c:out value="${pmDiastolicBloodPressureData}"/>mmHg</div>
                                                     <div class="date"><c:out value="${pmSystolicBloodPressureDate}"/></div>
                                                 </c:if>
                                             </c:otherwise>
@@ -136,11 +140,11 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th>산소포화도</th>
+                                    <th><spring:message code="history.record.oxygen" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.amOxygenSaturation eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -154,7 +158,7 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.pmOxygenSaturation eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -167,11 +171,11 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th>혈당</th>
+                                    <th><spring:message code="history.record.bloodSugar" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.amBloodSugar eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -185,7 +189,7 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${historyData.pmBloodSugar eq null}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
@@ -198,17 +202,17 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th>임상증상</th>
+                                    <th><spring:message code="history.record.symptom" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${symptomTotal eq 0}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
                                                 
                                                 <c:forEach var="sl" items="${symptomData}">
-                                                    <c:if test="${sl.ampm ne 'am' and fn:length(symptomData) eq 1}"><div>미측정</div></c:if>
+                                                    <c:if test="${sl.ampm ne 'am' and fn:length(symptomData) eq 1}"><div><spring:message code="history.unmeasured" /></div></c:if>
                                                     <c:if test="${sl.ampm eq 'am'}">
                                                         <div class="check"><c:out value="${sl.symptomContent}"/></div>
                                                         <div class="date"><c:out value="${sl.createDate}"/></div>
@@ -221,12 +225,12 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${symptomTotal eq 0}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
                                                 <c:forEach var="sl" items="${symptomData}">
-                                                    <c:if test="${sl.ampm ne 'pm' and fn:length(symptomData) eq 1}"><div>미측정</div></c:if>
+                                                    <c:if test="${sl.ampm ne 'pm' and fn:length(symptomData) eq 1}"><div><spring:message code="history.unmeasured" /></div></c:if>
                                                     <c:if test="${sl.ampm eq 'pm'}">
                                                         <div class="check"><c:out value="${sl.symptomContent}"/></div>
                                                         <div class="date"><c:out value="${sl.createDate}"/></div>
@@ -239,24 +243,27 @@
 
 
                                 <tr>
-                                    <th>정신건강</th>
+                                    <th><spring:message code="history.record.mental" /></th>
                                     <td>
                                         <c:choose>
                                             <c:when test="${mentalData.amCount eq null or mentalData.amCount eq 0}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
                                                 <div class="check">
                                                     <c:choose>
                                                         <c:when test="${mentalData.amStressTotal <= 1}">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.amStressTotal}점, 정상),
+                                                            <spring:message code="history.injury.stressSymptoms" /> 
+                                                            <br/>(${mentalData.amStressTotal}<spring:message code="history.score" />, <spring:message code="history.result.normal" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amStressTotal == 2 }">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.amStressTotal}점, 주의요망),
+                                                            <spring:message code="history.injury.stressSymptoms" />
+                                                            <br/>(${mentalData.amStressTotal}<spring:message code="history.score" />, <spring:message code="history.history.result.warning" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amStressTotal >= 3}">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.amStressTotal}점, 심한수준),
+                                                            <spring:message code="history.injury.stressSymptoms" />
+                                                            <br/>(${mentalData.amStressTotal}<spring:message code="history.score" />, <spring:message code="history.result.severe" />),
                                                         </c:when>
                                                     </c:choose>
 
@@ -264,29 +271,35 @@
 
                                                     <c:choose>
                                                         <c:when test="${mentalData.amDepressedTotal <= 4}">
-                                                            우울<br/>(${mentalData.amDepressedTotal}점, 정상),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.amDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.normal" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amDepressedTotal >= 5 and mentalData.amDepressedTotal <= 9}">
-                                                            우울<br/>(${mentalData.amDepressedTotal}점, 경미한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.amDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.light" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amDepressedTotal >= 10 and mentalData.amDepressedTotal <= 14}">
-                                                            우울<br/>(${mentalData.amDepressedTotal}점, 중간 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.amDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.middle" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amDepressedTotal >= 15 and mentalData.amDepressedTotal <= 19}">
-                                                            우울<br/>(${mentalData.amDepressedTotal}점, 약간 심한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.amDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.slightlySevere" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.amDepressedTotal >= 20 and mentalData.amDepressedTotal <= 27}">
-                                                            우울<br/>(${mentalData.amDepressedTotal}점, 심한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.amDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.severe" />),
                                                         </c:when>
                                                     </c:choose>
 
                                                     <br/><br/>
 
-                                                    우울 9번 문항<br/>(${mentalData.amDepressedNine}점),
+                                                    
+                                                    <spring:message code="history.depressed" /> 9<spring:message code="history.number" /> <spring:message code="history.question" /><br/>(${mentalData.amDepressedNine}<spring:message code="history.score" />),
 
                                                     <br/><br/>
 
-                                                    주관적 심리적 고통정도<br/>(${mentalData.amVasTotal}점)
+                                                    <spring:message code="history.vas" /><br/>(${mentalData.amVasTotal}<spring:message code="history.score" />)
                                                 </div>
                                             </c:otherwise>
                                         </c:choose>
@@ -294,20 +307,23 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="${mentalData.pmCount eq null or mentalData.pmCount eq 0}">
-                                                <div>미측정</div>
+                                                <div><spring:message code="history.unmeasured" /></div>
                                             </c:when>
                                             
                                             <c:otherwise>
                                                 <div class="check">
                                                     <c:choose>
                                                         <c:when test="${mentalData.pmStressTotal <= 1}">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.pmStressTotal}점, 정상),
+                                                            <spring:message code="history.injury.stressSymptoms" />
+                                                            <br/>(${mentalData.pmStressTotal}<spring:message code="history.score" />, <spring:message code="history.result.normal" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmStressTotal == 2 }">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.pmStressTotal}점, 주의요망),
+                                                            <spring:message code="history.injury.stressSymptoms" />
+                                                            <br/>(${mentalData.pmStressTotal}<spring:message code="history.score" />, <spring:message code="history.result.warning" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmStressTotal >= 3}">
-                                                            외상 후 스트레스 증상<br/>(${mentalData.pmStressTotal}점, 심한수준),
+                                                            <spring:message code="history.injury.stressSymptoms" />
+                                                            <br/>(${mentalData.pmStressTotal}<spring:message code="history.score" />, <spring:message code="history.result.severe" />),
                                                         </c:when>
                                                     </c:choose>
 
@@ -315,29 +331,33 @@
 
                                                     <c:choose>
                                                         <c:when test="${mentalData.pmDepressedTotal <= 4}">
-                                                            우울<br/>(${mentalData.pmDepressedTotal}점, 정상),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.pmDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.normal" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmDepressedTotal >= 5 and mentalData.pmDepressedTotal <= 9}">
-                                                            우울<br/>(${mentalData.pmDepressedTotal}점, 경미한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.pmDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.light" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmDepressedTotal >= 10 and mentalData.pmDepressedTotal <= 14}">
-                                                            우울<br/>(${mentalData.pmDepressedTotal}점, 중간 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.pmDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.middle" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmDepressedTotal >= 15 and mentalData.pmDepressedTotal <= 19}">
-                                                            우울<br/>(${mentalData.pmDepressedTotal}점, 약간 심한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.pmDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.slightlySevere" />),
                                                         </c:when>
                                                         <c:when test="${mentalData.pmDepressedTotal >= 20 and mentalData.pmDepressedTotal <= 27}">
-                                                            우울<br/>(${mentalData.pmDepressedTotal}점, 심한 수준),
+                                                            <spring:message code="history.depressed" />
+                                                            <br/>(${mentalData.pmDepressedTotal}<spring:message code="history.score" />, <spring:message code="history.result.severe" />),
                                                         </c:when>
                                                     </c:choose>
 
                                                     <br/><br/>
 
-                                                    우울 9번 문항<br/>(${mentalData.pmDepressedNine}점),
+                                                    <spring:message code="history.depressed" /> 9<spring:message code="history.number" /> <spring:message code="history.question" /><br/>(${mentalData.pmDepressedNine}<spring:message code="history.score" />),
 
                                                     <br/><br/>
-
-                                                    주관적 심리적 고통정도<br/>(${mentalData.pmVasTotal}점)
+                                                    <spring:message code="history.vas" /><br/>(${mentalData.pmVasTotal}<spring:message code="history.number" />)
                                                 </div>
                                             </c:otherwise>
                                         </c:choose>
@@ -351,7 +371,7 @@
             <div class="btn_group">
                 <ul>
                     <li>
-                        <a href="./menu" class="confirm"><span class="check">확인</span></a>
+                        <a href="./menu" class="confirm"><span class="check"><spring:message code="history.confirm" /></span></a>
                     </li>
                 </ul>
             </div>

src/main/webapp/WEB-INF/jsp/mobile/push/list.jsp

@@ -1,6 +1,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"    pageEncoding="UTF-8"%>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
@@ -18,30 +19,32 @@ span.push-date{float:right;font-size:14px;color:#999;}
         <div class="header">
             <div class="previous">
                 <!-- <a href="javascript:;" onclick="loadApp();">이전</a> -->
-                <a href="/mobile/menu">이전</a>
+                <a href="/mobile/menu"><spring:message code="header.previous" /></a>
             </div>
-            <div class="title">메시지 수신함</div>
+            <div class="title"><spring:message code="title.messageInbox" /></div>
         </div>
         
         <div class="examination">
             <div class="daily" style="margin-top:20px;">
-                <a href="?ym=${prevMonth}" class="previous active">이전</a>
-                    <c:out value="${date}" />
+                <a href="?ym=${prevMonth}" class="previous active"><spring:message code="header.previous" /></a>
+                    <fmt:parseDate var="cDate" value="${date}" pattern="yyyy-MM" />
+                    <c:set var="currentDate"><fmt:formatDate value="${cDate}" type="date" /></c:set>
+                    <c:out value="${currentDate}" />
                 <c:if test="${nextMonth <= nowMonth}">
-                    <a href="?ym=${nextMonth}" class="next active">다음</a>
+                    <a href="?ym=${nextMonth}" class="next active"><spring:message code="header.next" /></a>
                 </c:if>
                 
             </div>
         </div>
         
-        <div class="alert" style="border-top:1px solid #CCCCCC;">월별 푸시메시지 수신 내역</div>
+        <div class="alert" style="border-top:1px solid #CCCCCC;"><spring:message code="push.monthlyPushMessage.ReceptionHistory" /></div>
         
         <div class="faq">
             <ul class="list">
                 <c:if test="${total eq 0}">
                     <li>
                         <a href="javascript:;" class="">
-                            <span class="push-title">받은 푸시 메시지가 없습니다</span>
+                            <span class="push-title"><spring:message code="push.emptyMessageInbox" /></span>
                         </a>
                     </li>
                 </c:if>
@@ -49,7 +52,7 @@ span.push-date{float:right;font-size:14px;color:#999;}
                     <c:if test="${listCount eq 0}">
                         <li>
                             <a href="javascript:;" class="">
-                                <span class="push-title">받은 푸시 메시지가 없습니다</span>
+                                <span class="push-title"><spring:message code="push.emptyMessageInbox" /></span>
                             </a>
                         </li>
                     </c:if>
@@ -58,7 +61,11 @@ span.push-date{float:right;font-size:14px;color:#999;}
                             <li>
                                 <a href="javascript:;" class="">
                                     <span class="push-title"><c:out value="${i.pushTitle}" /></span>
-                                    <span class="push-date" style="float:right;"><c:out value="${i.updateDate}" /></span>
+                                    <span class="push-date" style="float:right;">
+                                        <fmt:parseDate var="uDate" value="${i.updateDate}" pattern="yyyy-MM-dd" />
+                                        <c:set var="updateDate"><fmt:formatDate value="${uDate}" type="date" /></c:set>
+                                        <c:out value="${updateDate}" />
+                                    </span>
                                 </a>
                                 <div class="answer push-content"><c:out value="${i.pushContent}" /></div>
                             </li>