생활치료센터 현황 (통계) 쿼리오류 수정

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

@@ -209,7 +209,7 @@
         </if>
         <![CDATA[
              GROUP BY CI.CENTER_CODE WITH ROLLUP HAVING 1 = 1
-             ORDER BY NVL(CI.CENTER_NAME, '0')
+             ORDER BY NVL(CI.CENTER_NAME, '!')
              LIMIT #{limit}, #{limitMax}
         ]]>
     </select>

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

@@ -94,6 +94,7 @@ function setEventHandler(){
         maxDate : new Date(),
         minDate : "1900-01-01"
     }).on( "apply.daterangepicker", function( ev, picker ) {
+        console.log( $(this) );
         $(this).val(picker.startDate.format('YYYY-MM-DD'));
     });
     
@@ -119,8 +120,14 @@ function stateCheck(){
         $( "input[name='disisolationDate']" ).prop( "disabled", true ).val( "" );
         $( "#state-label").text( "" );
     } else {
-        $( "input[name='disisolationDate']" ).prop( "disabled", false ).val( getNowYmd() );
-        $( "#state-label").text( "(" + $( "#state option:checked" ).text() + ")" );
+      console.log( $( "input[name='disisolationDate']" ).val() );
+        if( $( "input[name='disisolationDate']" ).val() == "" ) {
+          $( "input[name='disisolationDate']" ).prop( "disabled", false ).val( getNowYmd() );
+          $( "#state-label").text( "(" + $( "#state option:checked" ).text() + ")" );
+        } else {
+          $( "input[name='disisolationDate']" ).prop( "disabled", false ).val( $( "input[name='disisolationDate']" ).val() );
+          $( "#state-label").text( "(" + $( "#state option:checked" ).text() + ")" );
+        }
     }
 }
 

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

@@ -206,6 +206,19 @@ $( function(){
             }
         },
         submitHandler: function(form) {
+            if( $( "input[name='bloodPressureLevelCon']" ).val() != "" ) {
+              if( $( "input[name='bloodPressureLevelRel']" ).val() == "" ) {
+                alert( '혈압을 모두입력하세요' );
+                return false;
+              }
+            }
+
+            if( $( "input[name='bloodPressureLevelRel']" ).val() != "" ) {
+              if( $( "input[name='bloodPressureLevelCon']" ).val() == "" ) {
+                alert( '혈압을 모두입력하세요' );
+                return false;
+              }
+            }
             form.submit();
         }
     });

src/main/webapp/WEB-INF/jsp/staffTotal/report/list.jsp

@@ -184,7 +184,7 @@ function getExcel(){
                                         <div class="col-6 text-right">
 <%--                                             <button class="btn btn-secondary mb-1" onclick="location.href='/clipsoft/report.jsp?fileName=situation&registDay=<c:out value="${registDay}" />&registDayTime=<c:out value="${registDayTime}" />'";>차트</button> --%>
                                             <button class="btn btn-secondary mb-1" onclick="window.open('/clipsoft/report.jsp?fileName=situation&registDay=<c:out value="${registDay}" />&registDayTime=<c:out value="${registDayTime}" />', '_blank')";>차트</button>
-                                            <button class="btn btn-success" data-toggle="modal" data-target="#excelDownMemo">Excel 다운로드</button>
+                                            <button class="btn btn-success mb-1" data-toggle="modal" data-target="#excelDownMemo">Excel 다운로드</button>
                                         </div>
                                     </div>
                                     <div class="table-responsive">