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

src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -94,6 +94,8 @@ public class CenterController extends LifeCenterController {
         CenterInfoDTO dto = new CenterInfoDTO();
         dto.setCenterCode(centerCode);
         dto = centerService.selectCenterInfo(dto);
+        dto.setStaffPhoneNumber( LifeCenterFunction.phone( dto.getStaffPhoneNumber() ) );
+        dto.setCenterNumber( LifeCenterFunction.phone( dto.getCenterNumber() ) );
         
         ModelAndView mv = setMV("center/info");
         
@@ -206,6 +208,10 @@ public class CenterController extends LifeCenterController {
         List<CenterInfoDTO> result = new ArrayList<CenterInfoDTO>();
         if (total > 0) {
             result = centerService.selectCenterList(dto);
+            
+            for( CenterInfoDTO temp : result ) {
+                result.get( result.indexOf( temp ) ).setStaffPhoneNumber( LifeCenterFunction.phone( temp.getStaffPhoneNumber() ) );
+            }
         }
         
         String param = "centerName=" + dto.getCenterName() + "&locationCode=" + dto.getLocationCode() + "&startDate=" + dto.getStartDate() + "&endDate=" + dto.getEndDate();

src/main/java/com/lemon/lifecenter/controller/StaffController.java

@@ -141,6 +141,8 @@ public class StaffController extends LifeCenterController {
         
         dto = memberService.selectMemberInfo(dto);
         
+        dto.setPhoneNumber( LifeCenterFunction.phone( dto.getPhoneNumber() ) );
+        
         ModelAndView mv = setMV("staff/info");
         mv.addObject("info", dto);
         mv.addObject( "sesId", sesId );

src/main/webapp/WEB-INF/jsp/patient/list.jsp

@@ -147,7 +147,7 @@ var endDate   = "<c:out value='${endDate}'/>";
                                                     <th>호실</th>
 <!--                                                     <th>최종진료일시</th> -->
                                                     <th>입소일자</th>
-                                                    <th>격지해제 예정일</th>
+                                                    <th>격리해제 예정일</th>
                                                     <th>상태</th>
                                                 </tr>
                                             </thead>
@@ -173,7 +173,9 @@ var endDate   = "<c:out value='${endDate}'/>";
                                                                         -
                                                                     </c:if>
                                                                     <c:if test="${l.disisolationDate ne ''}">
-                                                                        <c:out value="${l.disisolationDate}" />
+                                                                        <fmt:parseDate var="dDate" value="${l.disisolationDate}" pattern="yyyy-MM-dd" />
+                                                                        <c:set var="disisolationDate"><fmt:formatDate value="${dDate}" pattern="yyyy-MM-dd" /></c:set>
+                                                                        <c:out value="${disisolationDate}" />
                                                                     </c:if>
                                                                 </td>
                                                                 <td><c:out value="${l.state}" /></td>