11. 29 1차 수정요청 의료진 웹 수정

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

@@ -83,7 +83,7 @@ public class MobileServeyController extends LifeCenterController {
         
         LifeCenterFunction.scriptMessage( response, "alertBox({ txt : '문진이 정상적으로 제출되었습니다.', callBack : function(){ location.href='/mobile/serveyhistory' } });" );
         
-        return "/common/black";
+        return "/common/blank";
     }
     
     @RequestMapping("/servey/insert")

src/main/resources/mybatis/mapper/center/center.xml

@@ -134,7 +134,7 @@
             ]]>
         </if>
         <![CDATA[
-             ORDER BY CI.CREATE_DATE DESC
+             ORDER BY CI.CENTER_NAME ASC
              LIMIT ${limit}, ${limitMax}
         ]]>
     </select>

src/main/resources/mybatis/mapper/patient/patient.xml

@@ -66,7 +66,7 @@
         ]]>
     </if>
         <![CDATA[
-             ORDER BY HOSPITALIZATION_DATE DESC
+             ORDER BY PATIENT_NAME ASC
              LIMIT ${limit}, ${limitMax}
         ]]>
     </select>

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

@@ -150,7 +150,7 @@ var endDate   = "<c:out value='${endDate}'/>";
                                                     <th>담당자(ID)</th>
                                                     <th>전화번호</th>
                                                     <th>입소자 수(명)</th>
-                                                    <th>소용인원(명)</th>
+                                                    <th>수용인원(명)</th>
                                                     <th>의료진 수</th>
                                                     <th>등록일시</th>
                                                 </tr>

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

@@ -122,7 +122,7 @@ function setCookieCheck() {
 
                         <div class="text-center mt-4">
                             <h1 class="h2">생활치료센터 비대면진료시스템</h1>
-                            <p class="lead">Life Care Center Untact Treatment System</p>
+                            <p class="lead">Residential treatment center Untact Treatment System</p>
                         </div>
 
                         <div class="card">

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

@@ -4,18 +4,35 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript" src="/resources/js/mobile/health.js"></script>
 <script>
+$.validator.addMethod( "rangeTemperature",  function( value, element ) {
+    var result = true;
+    if( value > 100 || value < 0 ) {
+        result = false;
+    }
+    return this.optional(element) || result;
+}, "체온은 [0 ~ 100] 사이의 숫자만 입력해주세요" );
+
 $( function(){
     $( "#healthForm" ).validate({
         rules : {
             temperature : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangeTemperature : true
+            }
+        },
+        messages : {
+        	temperature : {
+                floatNum : "숫자형식으로 입력해주세요"
             }
         },
         onkeyup: function( element, event ) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         onfocusout: function (element) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         errorPlacement: function(error, element) {
             $( "div.error-msg" ).append( error );

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

@@ -4,24 +4,48 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript" src="/resources/js/mobile/health.js"></script>
 <script>
+$.validator.addMethod( "rangePulseRate",  function( value, element ) {
+    var result = true;
+    if( value > 999 || value < 0 ) {
+        result = false;
+    }
+    return this.optional(element) || result;
+}, "맥박수는 [0 ~ 999] 사이의 숫자만 입력해주세요" );
+
+$.validator.addMethod( "rangeBloodPressure",  function( value, element ) {
+    var result = true;
+    if( value > 999 || value < 0 ) {
+        result = false;
+    }
+    return this.optional(element) || result;
+}, "혈압은 [0 ~ 999] 사이의 숫자만 입력해주세요" );
+
 $( function(){
     $( "#healthForm" ).validate({
         rules : {
             pulseRate : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangePulseRate : true
             },
             bloodPressure : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangeBloodPressure : true
             },
             bloodPressure2 : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangeBloodPressure : true
             }
         },
         onkeyup: function( element, event ) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+        	$( element ).valid();
         },
         onfocusout: function (element) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+        	$( element ).valid();
         },
         errorPlacement: function(error, element) {
             $( "div.error-msg" ).empty().append( error );

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

@@ -4,18 +4,30 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript" src="/resources/js/mobile/health.js"></script>
 <script>
+$.validator.addMethod( "rangeOxygenSaturation",  function( value, element ) {
+    var result = true;
+    if( value > 100 || value < 0 ) {
+        result = false;
+    }
+    return this.optional(element) || result;
+}, "산소포화도는 [0 ~ 100] 사이의 숫자만 입력해주세요" );
+
 $( function(){
     $( "#healthForm" ).validate({
         rules : {
             oxygenSaturation : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangeOxygenSaturation : true
             }
         },
         onkeyup: function( element, event ) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         onfocusout: function (element) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         errorPlacement: function(error, element) {
             $( "div.error-msg" ).empty().append( error );

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

@@ -4,18 +4,30 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript" src="/resources/js/mobile/health.js"></script>
 <script>
+$.validator.addMethod( "rangeBloodSugar",  function( value, element ) {
+    var result = true;
+    if( value > 999 || value < 0 ) {
+        result = false;
+    }
+    return this.optional(element) || result;
+}, "혈당은 [0 ~ 999] 사이의 숫자만 입력해주세요" );
+
 $( function(){
     $( "#healthForm" ).validate({
         rules : {
             bloodSugar : {
-                floatNum : true
+                floatNum : true,
+                floatNumOne : true,
+                rangeBloodSugar : true
             }
         },
         onkeyup: function( element, event ) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         onfocusout: function (element) {
-            $( "div.error-msg" ).text( "" );
+//             $( "div.error-msg" ).text( "" );
+            $( element ).valid();
         },
         errorPlacement: function(error, element) {
             $( "div.error-msg" ).empty().append( error );

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

@@ -165,7 +165,7 @@ var endDate   = "<c:out value='${endDate}'/>";
                                                                 </td>
                                                                 <td><c:out value="${l.gender}" /></td>
                                                                 <td><c:out value="${l.age}" /></td>
-                                                                <td><c:out value="${l.wardNumber}동 ${l.roomNumber} 호" /></td>
+                                                                <td><c:out value="${l.wardNumber}동 ${l.roomNumber}호" /></td>
 <%--                                                                 <td><c:out value="${l.finamClinicDate}" /></td> --%>
                                                                 <td><c:out value="${l.hospitalizationDate}" /></td>
                                                                 <td>

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

@@ -100,11 +100,6 @@ function setEventHandler(){
         
         wrap.find( "input.error-box" ).val( dateYear  + "-" + dateMonth  + "-" + dateDay );
     });
-}
-$( function(){
-    patientNewInit();
-    setEventHandler();
-    
     
     $( "input.date" ).daterangepicker({
         singleDatePicker : true,
@@ -115,6 +110,24 @@ $( function(){
         }
     });
     
+    $( "input.date-no-req" ).daterangepicker({
+        singleDatePicker : true,
+        showDropdowns : true,
+        locale : {
+            //format : "M/DD hh:mm A"
+            format : "YYYY-MM-DD"
+        },
+        autoUpdateInput: false
+    });
+    
+    $('input.date-no-req').on('apply.daterangepicker', function(ev, picker) {
+        $(this).val(picker.startDate.format('YYYY-MM-DD'));
+    });
+}
+$( function(){
+    patientNewInit();
+    setEventHandler();
+    
     $( "#patientForm" ).validate({
         rules: {
             hospitalizationDate : {
@@ -339,7 +352,7 @@ $( function(){
                                                     <th>격리해제 예정일</th>
                                                     <td colspan="3">
                                                         <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control date" type="text" name="disisolationDate">
+                                                            <input class="form-control date-no-req" type="text" name="disisolationDate" autocomplete="off">
                                                             <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                         </div>
                                                     </td>

src/main/webapp/resources/js/mobile/common.js

@@ -127,6 +127,10 @@ $(document).ready(function(){
         $.validator.addMethod( "floatNum",  function( value, element ) {
             return this.optional(element) || /^\-?([0-9]+(\.[0-9]+)?|Infinity)$/.test(value);
         }, "숫자형식만 입력해주세요" );
+        
+        $.validator.addMethod( "floatNumOne",  function( value, element ) {
+            return this.optional(element) || /(^\d+$)|(^\d{1,}.\d{0,1}$)/.test(value);
+        }, "소수점 한자리까지만 입력해주세요" );
     
     }
     /* NAVIGATION BAR */