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

src/main/java/com/lemon/lifecenter/common/HomeController.java

@@ -15,8 +15,22 @@ public class HomeController {
         return "/common/download";
     }
     
-    @RequestMapping("/store/download.html")
-    public String downLoad() {
-        return "/common/download";
+    // 의료진 웹 메뉴얼 다운로드
+    @RequestMapping("/store/manual/staff")
+    public String downLoadStaff() {
+        return "redirect:/resources/download/manual/manual_staff.pdf";
+    }
+    
+    // 환자용 앱 매뉴얼 다운로드
+    @RequestMapping("/store/manual/patient")
+    public String downLoadPatient() {
+        return "redirect:/resources/download/manual/manual_patient.pdf";
+    }
+    
+    // 입소자 문진표 서식 다운로드  
+    // 환자관리-> 신규환자등록 왼쪽에 버튼
+    @RequestMapping("/store/manual/survey")
+    public String downLoadSurvey() {
+        return "redirect:/resources/download/manual/manual_survey.pdf";
     }
 }

src/main/java/com/lemon/lifecenter/common/LifeCenterInterCeptor.java

@@ -34,6 +34,8 @@ public class LifeCenterInterCeptor extends HandlerInterceptorAdapter {
         logger.info( "|  URL : " + url + "  |  IP : " + LifeCenterFunction.getRemoteAddr(request) + "  |  Port : " + port );
         logger.info( "|------------------------------------------------------------------|" );
         
+        logger.info( "  sesMobileId : "  + sesMId + "  sesWebId : " + session + "  groupIdx : " + groupIdx );
+        
         if ( url.contains( "/error" ) || url.contains( "/nonface/wait" ) || 
              url.contains( "/store" ) || url.contains( "/favicon.ico" )  || url.contains( "/mobile/getAppVersion" ) ) {
             return true;

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

@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,7 +23,7 @@ public class RestApiController {
     @Autowired
     private RestApiService restApiService;
     
-    @RequestMapping("/mobile/getAppVersion")
+    @RequestMapping(value="/mobile/getAppVersion", method = RequestMethod.POST)
     public ArrayList<HashMap<String, String>> appVersion(@RequestParam(value="deviceType", required=false, defaultValue="") String deviceType) {
         ArrayList<HashMap<String, String>> result = new ArrayList<>();
         HashMap<String, String> data = new HashMap<String, String>();

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

@@ -10,6 +10,7 @@
                AND ID = #{id}
                AND PW = #{pw}
                AND CENTER_CODE = #{centerCode}
+               AND STATE = 'H'
         ]]>
     </select>
     
@@ -31,6 +32,7 @@
                AND ID = #{id}
                AND PW = #{pw}
                AND CENTER_CODE = #{centerCode}
+               AND STATE = 'H'
         ]]>
     </select>
 </mapper>

src/main/webapp/WEB-INF/jsp/login/staff.jsp

@@ -125,9 +125,9 @@ function setCookieCheck() {
                             <p class="lead">Residential treatment center Untact Treatment System</p>
                         </div>
 
-                        <div class="card">
+                        <div class="card pb-2">
                             <div class="card-body">
-                                <div class="m-sm-4">
+                                <div class="m-sm-4" style="margin-bottom:20px !important;">
                                     <form id="loginForm" action="./check" method="post">
                                         <div class="form-group">
                                             <label>아이디</label>
@@ -153,8 +153,14 @@ function setCookieCheck() {
                                     </form>
                                 </div>
                             </div>
+                            
+                            <div class="text-center">
+                                <div class="d-flex flex-wrap justify-content-center align-content-center text-center">
+                                    <a class="btn btn-primary ml-3 mr-3 mb-1 mt-1" target="_blank" href="/store/manual/staff">의료진 사용자 매뉴얼 다운로드</a>
+                                    <a class="btn btn-primary ml-3 mr-3 mb-1 mt-1" target="_blank" href="/store/manual/patient">환자용 앱 사용자 매뉴얼 다운로드</a>
+                                </div>
+                            </div>
                         </div>
-
                     </div>
                 </div>
             </div>

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

@@ -122,6 +122,7 @@ var endDate   = "<c:out value='${endDate}'/>";
                                             <fmt:formatNumber value="${total}" pattern="#,###" />
                                         </div>
                                         <div class="col-6 text-right">
+                                            <a class="btn btn-primary" target="_blank" href="/store/manual/survey">입소자 문진표 서식 다운로드</a>
                                             <c:if test="${sesGroupIdx ne '1'}">
                                                 <button class="btn btn-primary" onclick="location.href='./new';">신규환자등록</button>
                                             </c:if>