Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

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

@@ -219,6 +219,47 @@ $( function(){
                 return false;
               }
             }
+<<<<<<< HEAD
+=======
+
+
+            if( $( "input[name='foreignerYn']" ).is(":checked") ) {
+              if( $( "#foreignNumberCheck" ).val() == "false" ) {
+                alertBox({ txt : '외국인인 경우 고유식별정보를 입력해주세요' });
+                return false;
+              }
+            } else {
+              var rf = $('input[name="residentNumberFront"]').val();
+              var rl = $('input[name="residentNumberLast"]').val();
+
+              var fVal = $('input[name="residentNumberLast"]').val().substr(0,1);
+
+              if( fVal >= 5 && fVal <= 8 ) {
+                alertBox({ txt : '올바른 주민등록번호를 입력해주세요' });
+                return false;
+              }
+              
+              if( ssnCheck( rf, rl ) != true ) {
+                alertBox({ txt : '올바른 주민등록번호를 입력해주세요' });
+                return false;
+              }
+            }
+
+
+            if( $( "#residentNumberLast" ).val() != "" ) {
+              $( "#residentNumberLast" ).val( btoa( $( "#residentNumberLast" ).val() ) );
+            }
+
+            if( $( "#foreignNumberLast" ).val() != "" ) {
+              $( "#foreignNumberLast" ).val( btoa( $( "#foreignNumberLast" ).val() ) );
+            }
+
+            if( $( "#passportNumber" ).val() != "" ) {
+              $( "#passportNumber" ).val( btoa( $( "#passportNumber" ).val() ) ); 
+            }
+
+            $( "#submitBtn" ).prop( "disabled", true );
+>>>>>>> 41614e583c911fd72584d9023feb4e362c423a93
             form.submit();
         }
     });
@@ -656,7 +697,7 @@ $( function(){
                                                 <div class="col-12">
                                                     <div class="text-right">
                                                         <button type="button" class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
-                                                        <button type="submit" class="btn btn-primary w100">등록</button>
+                                                        <button type="submit" class="btn btn-primary w100" id="submitBtn">등록</button>
                                                     </div>
                                                 </div>
                                             </div>