건강정보기록 수정(mobile), 생활치료센터관리 수정

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

@@ -214,8 +214,8 @@ public class CenterController extends LifeCenterController {
         
         ModelAndView mv = setMV("center/list");
         
-        startDate = startDate.equals( "" ) ? LifeCenterFunction.getNow( "yyyy-MM-dd" ) : startDate;
-        endDate   = endDate.equals( "" )   ? LifeCenterFunction.getNow( "yyyy-MM-dd" ) : endDate;
+//        startDate = startDate.equals( "" ) ? LifeCenterFunction.getNow( "yyyy-MM-dd" ) : startDate;
+//        endDate   = endDate.equals( "" )   ? LifeCenterFunction.getNow( "yyyy-MM-dd" ) : endDate;
         
         mv.addObject("locationList", list);
         mv.addObject("locationCode", locationCode);

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

@@ -82,6 +82,8 @@ public class MobileLoginController extends LifeCenterController {
             logger.error("dto.getPw()dto.getPw() -- > " + dto.getPw());
             object.put("id", dto.getId());
             object.put("pw", dto.getPw());
+            object.put("cc" , String.valueOf(dto.getCenterCode()) );
+            
             resultCode = "00";
         }
         
@@ -99,6 +101,7 @@ public class MobileLoginController extends LifeCenterController {
         
         logger.error( "[PATIENT LOGOUT] RemoteIP : " + remoteIp + " UserId : " + sesMId );
         
-        return "redirect:/mobile/login";
+        LifeCenterFunction.scriptMessage(response, "localStorage.clear();location.replace('/mobile/login');");
+        return "/common/blank";
     }
 }

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

@@ -5,11 +5,14 @@
     pageEncoding="UTF-8"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script>
+var startDate = "<c:out value='${startDate}'/>";
+var endDate   = "<c:out value='${endDate}'/>";
+
     $(function() {
         $("input[name=\"startDate\"]").daterangepicker({
             singleDatePicker : true,
             showDropdowns : true,
-            startDate : "<c:out value='${startDate}'/>",
+//             startDate : "<c:out value='${startDate}'/>",
             locale : {
                 //format : "M/DD hh:mm A"
                 format : "YYYY-MM-DD"
@@ -18,12 +21,15 @@
         $("input[name=\"endDate\"]").daterangepicker({
             singleDatePicker : true,
             showDropdowns : true,
-            startDate : "<c:out value='${endDate}'/>",
+//             startDate : "<c:out value='${endDate}'/>",
             locale : {
                 //format : "M/DD hh:mm A"
                 format : "YYYY-MM-DD"
             }
         });
+        
+        $("input[name=\"startDate\"]").val( startDate );
+        $("input[name=\"endDate\"]").val( endDate );
     });
 </script>
 </head>
@@ -86,7 +92,7 @@
                                                     <div class="row">
                                                         <div class="col-lg-4 col-sm-5">
                                                             <div class="form-group calendar-bar mb-xl-0">
-                                                                <input class="form-control" type="text" name="startDate">
+                                                                <input class="form-control" type="text" name="startDate" placeholder="검색 시작일자" autocomplete="off">
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                             </div>
                                                         </div>
@@ -95,7 +101,7 @@
                                                         </div>
                                                         <div class="col-lg-4 col-sm-5">
                                                             <div class="form-group calendar-bar mb-xl-0">
-                                                                <input class="form-control" type="text" name="endDate">
+                                                                <input class="form-control" type="text" name="endDate" placeholder="검색 종료일자" autocomplete="off">
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                             </div>
                                                         </div>

src/main/webapp/WEB-INF/jsp/include/sidebar.jsp

@@ -4,9 +4,9 @@
 
 <nav id="sidebar" class="sidebar">
     <div class="sidebar-content ">
-        <a class="sidebar-brand" href="/patient/list"> <i
-            class="align-middle" data-feather="box"></i> <span
-            class="align-middle">생활치료센터 의료진 시스템</span>
+        <a class="sidebar-brand" href="/"> 
+            <i class="align-middle" data-feather="box"></i>
+            <span class="align-middle">생활치료센터 의료진 시스템</span>
         </a>
 
         <ul class="sidebar-nav">

src/main/webapp/WEB-INF/jsp/mobile/health/health3.jsp

@@ -16,16 +16,18 @@ $( function(){
             var prev = $.trim( $( "input[name='oxygenSaturationPrev']" ).val() );
             var next = $.trim( $( "input[name='oxygenSaturationNext']" ).val() );
             
-            var prev2 = $.trim( $( "input[name='oxygenSaturationPrev2']" ).val() );
-            var next2 = $.trim( $( "input[name='oxygenSaturationNext2']" ).val() );
+//             var prev2 = $.trim( $( "input[name='oxygenSaturationPrev2']" ).val() );
+//             var next2 = $.trim( $( "input[name='oxygenSaturationNext2']" ).val() );
             
             if( prev.length == 1 || next.length == 0 ) {
                 $( "div.error-msg" ).text( "산소포화도 % 를 입력하세요 (소수점자리까지 입력)" );
-            } else if( prev2.length == 1 || next2.length == 0 ) {
-                $( "div.error-msg" ).text( "산소포화도 bpm 을 입력하세요 (소수점자리까지 입력)" );
-            } else {
+            } 
+//             else if( prev2.length == 1 || next2.length == 0 ) {
+//                 $( "div.error-msg" ).text( "산소포화도 bpm 을 입력하세요 (소수점자리까지 입력)" );
+//             } 
+            else {
                 $( "#phrValue" ).val( prev+"."+next );
-                $( "#phrValue2" ).val( prev2+"."+next2 );
+//                 $( "#phrValue2" ).val( prev2+"."+next2 );
                 
                 form.submit();
             }
@@ -88,12 +90,12 @@ $( function(){
                     
                     <div class="data unlink">
                         <div class="point">
-                            <span style="margin-right:30px;">
-                                <input type="text" class="prev m3" name="oxygenSaturationPrev" placeholder="100" maxlength="3"><span class="dot"></span><input type="text" class="next" name="oxygenSaturationNext" placeholder="00" maxlength="2"> %
-                            </span>
                             <span>
-                                <input type="text" class="prev m3" name="oxygenSaturationPrev2" placeholder="100" maxlength="3"><span class="dot"></span><input type="text" class="next" name="oxygenSaturationNext2" placeholder="00" maxlength="2"> bpm 
+                                <input type="text" class="prev m3" name="oxygenSaturationPrev" placeholder="000" maxlength="3"><span class="dot"></span><input type="text" class="next" name="oxygenSaturationNext" placeholder="00" maxlength="2"> %
                             </span>
+                            <!-- span>
+                                <input type="text" class="prev m3" name="oxygenSaturationPrev2" placeholder="000" maxlength="3"><span class="dot"></span><input type="text" class="next" name="oxygenSaturationNext2" placeholder="00" maxlength="2"> bpm 
+                            </span-->
                         </div>
                     </div>
                     
@@ -105,7 +107,7 @@ $( function(){
                         <li>
                             <input type="hidden" name="phrType" value="oxygenSaturation">
                             <input type="hidden" id="phrValue" name="phrValue" value="">
-                            <input type="hidden" id="phrValue2" name="phrValue2" value="">
+<!--                             <input type="hidden" id="phrValue2" name="phrValue2" value=""> -->
                             
                             <button type="submit" class="confirm"><span class="check">기록하기</span></button>
                         </li>

src/main/webapp/WEB-INF/jsp/mobile/health/health4.jsp

@@ -80,7 +80,7 @@ $( function(){
                     </div>
                     
                     <div class="data unlink">
-                        <div class="point"><input type="text" class="prev m3" name="bloodSugarPrev" placeholder="120" maxlength="3"><span class="dot"></span><input type="text" class="next" name="bloodSugarNext" placeholder="00" maxlength="2"><span class="mini">mg/dl</span></div>
+                        <div class="point"><input type="text" class="prev m3" name="bloodSugarPrev" placeholder="120" maxlength="3"><span class="dot"></span><input type="text" class="next" name="bloodSugarNext" placeholder="00" maxlength="2"><span class="mini">mg/dL</span></div>
                     </div>
                     
                     <div class="error-msg tac mt20 error"></div>

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

@@ -95,7 +95,7 @@
                                                 <c:set var="amPulseRateDate" value="${fn:split( historyData.amPulseRate,'/' )[1]}" />
                                                 <c:set var="amSystolicBloodPressureData" value="${fn:split( historyData.amSystolicBloodPressure,'/' )[0]}" />
                                                 <c:set var="amDiastolicBloodPressureData" value="${fn:split( historyData.amDiastolicBloodPressure,'/' )[0]}" />
-                                                <div class="check"><c:out value="${amPulseRateData}"/> ℃</div>
+                                                <div class="check"><c:out value="${amPulseRateData}"/> bpm</div>
                                                 <div class="mini">수축기<c:out value="${amSystolicBloodPressureData}"/>mmHg</div>
                                                 <div class="mini">이완기 <c:out value="${amDiastolicBloodPressureData}"/>mmHg</div>
                                                 <div class="date"><c:out value="${amPulseRateDate}"/></div>
@@ -113,7 +113,7 @@
                                                 <c:set var="pmPulseRateDate" value="${fn:split( historyData.pmPulseRate,'/' )[1]}" />
                                                 <c:set var="pmSystolicBloodPressureData" value="${fn:split( historyData.pmSystolicBloodPressure,'/' )[0]}" />
                                                 <c:set var="pmDiastolicBloodPressureData" value="${fn:split( historyData.pmDiastolicBloodPressure,'/' )[0]}" />
-                                                <div class="check"><c:out value="${pmPulseRateData}"/> ℃</div>
+                                                <div class="check"><c:out value="${pmPulseRateData}"/> bpm</div>
                                                 <div class="mini">수축기<c:out value="${pmSystolicBloodPressureData}"/>mmHg</div>
                                                 <div class="mini">이완기 <c:out value="${pmDiastolicBloodPressureData}"/>mmHg</div>
                                                 <div class="date"><c:out value="${pmPulseRateDate}"/></div>
@@ -132,7 +132,7 @@
                                             <c:otherwise>
                                                 <c:set var="amOxygenSaturationData" value="${fn:split( historyData.amOxygenSaturation,'/' )[0]}" />
                                                 <c:set var="amOxygenSaturationDate" value="${fn:split( historyData.amOxygenSaturation,'/' )[1]}" />
-                                                <div class="check"><c:out value="${amOxygenSaturationData}"/> ℃</div>
+                                                <div class="check"><c:out value="${amOxygenSaturationData}"/> %</div>
                                                 <div class="date"><c:out value="${amOxygenSaturationDate}"/></div>
                                             </c:otherwise>
                                         </c:choose>
@@ -146,7 +146,7 @@
                                             <c:otherwise>
                                                 <c:set var="pmOxygenSaturationData" value="${fn:split( historyData.pmOxygenSaturation,'/' )[0]}" />
                                                 <c:set var="pmOxygenSaturationDate" value="${fn:split( historyData.pmOxygenSaturation,'/' )[1]}" />
-                                                <div class="check"><c:out value="${pmOxygenSaturationData}"/> ℃</div>
+                                                <div class="check"><c:out value="${pmOxygenSaturationData}"/> %</div>
                                                 <div class="date"><c:out value="${pmOxygenSaturationDate}"/></div>
                                             </c:otherwise>
                                         </c:choose>
@@ -163,7 +163,7 @@
                                             <c:otherwise>
                                                 <c:set var="amBloodSugarData" value="${fn:split( historyData.amBloodSugar,'/' )[0]}" />
                                                 <c:set var="amBloodSugarDate" value="${fn:split( historyData.amBloodSugar,'/' )[1]}" />
-                                                <div class="check"><c:out value="${amBloodSugarData}"/> ℃</div>
+                                                <div class="check"><c:out value="${amBloodSugarData}"/> mg/dL</div>
                                                 <div class="date"><c:out value="${amBloodSugarDate}"/></div>
                                             </c:otherwise>
                                         </c:choose>
@@ -177,7 +177,7 @@
                                             <c:otherwise>
                                                 <c:set var="pmBloodSugarData" value="${fn:split( historyData.pmBloodSugar,'/' )[0]}" />
                                                 <c:set var="pmBloodSugarDate" value="${fn:split( historyData.pmBloodSugar,'/' )[1]}" />
-                                                <div class="check"><c:out value="${pmBloodSugarData}"/> ℃</div>
+                                                <div class="check"><c:out value="${pmBloodSugarData}"/> mg/dL</div>
                                                 <div class="date"><c:out value="${pmBloodSugarDate}"/></div>
                                             </c:otherwise>
                                         </c:choose>

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

@@ -45,7 +45,8 @@ $( function(){
                 if( data.code == "00" ) {
                     console.log( "isMobile() -- > " + isMobile() );
                     localStorage.id = data.id;
-                    localStorage.pw = data.pw;
+                    localStorage.pw = $( "#pw" ).val();
+                    localStorage.cc = data.cc;
 
                     if( isMobile() ) {
                         if( checkDevice() == "android" ) {
@@ -55,14 +56,27 @@ $( function(){
                         }
                     }
                     
-                    location.href="/mobile/menu";
+                    location.replace( '/mobile/menu' );
                 } else {
                     $("#errMsg").text( resultMsg );
                 };
             }, null, null );
         }
     });
+    
+    autoLogin();
 });
+function autoLogin(){
+    if( localStorage.getItem( "id" ) != null && 
+        localStorage.getItem( "pw" ) != null && 
+        localStorage.getItem( "cc" ) != null ) {
+        $( "#centerList" ).val( localStorage.getItem( "cc" ) );
+        $( "#id" ).val( localStorage.getItem( "id" ) );
+        $( "#pw" ).val( localStorage.getItem( "pw" ) );
+        
+        $( "#submitBtn" ).trigger( "click" );
+    }
+}
 </script>
 </head>
 <body>

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

@@ -3,13 +3,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
-<script>
-function alreadyMunjin() {
-    alert("문진을 이미 작성하였습니다.");
-}
-console.log("id -- > " + localStorage.getItem("id"));
-console.log("pw -- > " + localStorage.getItem("pw"));
-</script>
 </head>
 <body>
     <div id="main">