입소 일자 검색 수정

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

@@ -85,8 +85,8 @@ public class PatientController extends LifeCenterController {
         paging = LifeCenterPaging.getInstance();
         paging.paging(config, total, page, param);
         
-        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("inputState", inputState);
         mv.addObject("patientName", patientName);

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

@@ -21,7 +21,7 @@
         </if>
         <if test='startDate != null and startDate != "" and endDate != null and endDate != ""'>
             <![CDATA[
-               AND DATE_FORMAT(FINAL_CLINIC_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+               AND DATE_FORMAT(HOSPITALIZATION_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
             ]]>
         </if>
     </select>
@@ -62,7 +62,7 @@
     </if>
     <if test='startDate != null and startDate != "" and endDate != null and endDate != ""'>
         <![CDATA[
-            AND DATE_FORMAT(FINAL_CLINIC_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
+            AND DATE_FORMAT(HOSPITALIZATION_DATE, '%Y-%m-%d') BETWEEN #{startDate} AND #{endDate}
         ]]>
     </if>
         <![CDATA[

src/main/webapp/WEB-INF/jsp/patient/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>
@@ -79,12 +85,12 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th>진료일</th>
+                                                <th>입소일자</th>
                                                 <td>
                                                     <div class="row">
                                                         <div class="col-5">
                                                             <div class="form-group mb-xl-0">
-                                                                <input class="form-control" type="text" name="startDate" value="">
+                                                                <input class="form-control" type="text" name="startDate" value="" autocomplete="off"  placeholder="검색 시작일자">
                                                             </div>
                                                         </div>
                                                         <div
@@ -92,7 +98,7 @@
                                                             ~</div>
                                                         <div class="col-5">
                                                             <div class="form-group mb-xl-0">
-                                                                <input class="form-control" type="text" name="endDate">
+                                                                <input class="form-control" type="text" name="endDate" value="" autocomplete="off" placeholder="검색 종료일자">
                                                             </div>
                                                         </div>
                                                     </div>