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

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

@@ -77,6 +77,7 @@ public class MobileLoginController extends LifeCenterController {
             LifeCenterSessionController.setSessionMobile(request, "sesMWardNum", dto.getWardNumber());
             LifeCenterSessionController.setSessionMobile(request, "sesMRoomNum", dto.getRoomNumber());
             LifeCenterSessionController.setSessionMobile(request, "sesMCenterCode", String.valueOf(dto.getCenterCode()));
+            LifeCenterSessionController.setSessionMobile(request, "sesMCenterName", dto.getCenterName());
 
             logger.error("dto.getPw()dto.getPw() -- > " + dto.getPw());
             object.put("id", dto.getId());

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

@@ -31,6 +31,8 @@ public class MobileMenuController extends LifeCenterController {
         String roomId = LifeCenterSessionController.getSession(request, "sesMRoomNum");
         String patientName = LifeCenterSessionController.getSession(request, "sesMName");
         String sesMpIdx  = LifeCenterSessionController.getSession( request, "sesMpIdx" );
+        String sesMCenterName  = LifeCenterSessionController.getSession( request, "sesMCenterName" );
+        
         PatientDTO dto = new PatientDTO();
         dto.setPatientIdx(Integer.parseInt(sesMpIdx));
         int cnt = patientService.selectMunJinCount(dto);
@@ -40,6 +42,7 @@ public class MobileMenuController extends LifeCenterController {
         mv.addObject("roomId", roomId);
         mv.addObject("name", patientName);
         mv.addObject("munjinCnt", cnt);
+        mv.addObject("centerName", sesMCenterName);
         return mv;
     }
     

src/main/resources/mybatis/mapper/mobile/login.xml

@@ -15,15 +15,18 @@
     
     <select id="selectMPatientInfo" parameterType="PatientDTO" resultType="PatientDTO">
         <![CDATA[
-            SELECT PATIENT_IDX  AS patientIdx,
-                   PATIENT_NAME AS patientName,
-                   GENDER       AS gender,
-                   WARD_NUMBER  AS wardNumber,
-                   ROOM_NUMBER  AS roomNumber,
-                   CENTER_CODE  AS centerCode,
-                   ID           AS id,
-                   PW           AS pw
-              FROM PATIENT_CARE
+            SELECT PC.PATIENT_IDX  AS patientIdx,
+                   PC.PATIENT_NAME AS patientName,
+                   PC.GENDER       AS gender,
+                   PC.WARD_NUMBER  AS wardNumber,
+                   PC.ROOM_NUMBER  AS roomNumber,
+                   PC.CENTER_CODE  AS centerCode,
+                   (SELECT CI.CENTER_NAME
+                      FROM CENTER_INFO CI
+                     WHERE CI.CENTER_CODE = PC.CENTER_CODE) AS centerName,
+                   PC.ID           AS id,
+                   PC.PW           AS pw
+              FROM PATIENT_CARE PC
              WHERE 1 = 1
                AND ID = #{id}
                AND PW = #{pw}

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

@@ -72,7 +72,7 @@ function alreadyMunjin() {
             </div>
             <div class="banner">
                 <div class="name">
-                    레몬케어 생활치료센터
+                    <c:out value="${sesMCenterName}" />
                 </div>
                 <div class="caption">
                     <div class="title">