환자관리 수정

src/main/java/com/lemon/lifecenter/dto/PatientDTO.java

@@ -20,11 +20,11 @@ public class PatientDTO {
     private String symptomStartDate;
     private String confirmationDate;
     private String disisolationDate;
-    private String basalDiseaseYn = "N";
-    private String drugYn="N";
-    private String drugContent;
-    private String pregnancyStatus;
-    private String pregnancyWeek;
+    private String basalDiseaseYn = "";
+    private String drugYn="";
+    private String drugContent="";
+    private String pregnancyStatus="";
+    private String pregnancyWeek="";
     private String id;
     private String createDate;
     private String updateDate;

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

@@ -52,7 +52,6 @@ function setEventHandler(){
 
     $( "input[name='pregnancyStatus']" ).on( "click", function(){
         var $this = $( this );
-        console.log("!@#!@# -- > " + $this.val());
         if ($this.val() == "Y") {
             $("#pregnancyWeek").prop("disabled", false);
         } else {
@@ -73,7 +72,21 @@ function setEventHandler(){
         $( "#hospitalizationDate" ).val( ymd + " " + hour + ":" + min + ":00" );
     });
     
-    
+  //성별 남선택시 임신유무 고정
+    $( "input[name='gender']" ).on( "click", function(){
+        var gender = $( this ).val();
+        console.log( gender );
+        
+        if( gender == "M" ) {
+            $( "input[name='pregnancyStatus']:input[value='N']" ).prop( "checked", true );
+            $( "input[name='pregnancyStatus']:input[value='Y']" ).prop( "disabled", true );
+            $( "#pregnancyWeek" ).val( "" );
+        } else {
+            $( "input[name='pregnancyStatus']:input[value='N']" ).prop( "checked", false );
+            $( "input[name='pregnancyStatus']:input[value='Y']" ).prop( "disabled", false );
+        }
+    });
+  
     //생년월일
     $( ".select-date" ).on( "change", function(){
         var $this = $( this );
@@ -299,7 +312,7 @@ $( function(){
                                                                 </select>
                                                             </div>
                                                             
-                                                            <input type="text" class="error-box" id="jumin" name="jumin" required>
+                                                            <input type="date" class="error-box" id="jumin" name="jumin" required>
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -387,11 +400,11 @@ $( function(){
                                                     <th rowspan="4">기저질환 여부</th>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" id="basalY" name="basalDiseaseYn" value="Y" <c:if test="${patientData.basalDiseaseYn eq 'Y'}">checked="checked"</c:if> required>
+                                                            <input class="form-check-input" type="radio" id="basalY" name="basalDiseaseYn" value="Y" <c:if test="${patientData.basalDiseaseYn eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">예</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" id="basalN" name="basalDiseaseYn" value="N" <c:if test="${patientData.basalDiseaseYn eq 'N'}">checked="checked"</c:if> required>
+                                                            <input class="form-check-input" type="radio" id="basalN" name="basalDiseaseYn" value="N" <c:if test="${patientData.basalDiseaseYn eq 'N'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">아니오</span>
                                                         </label>
                                                         (예인 경우 하단의 기저질환을 선택하세요)

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

@@ -153,23 +153,17 @@ function nonFaceStart() {
                                             <th>최근 약복용<br />(최근 24시간 이내)</th>
                                             <td>
                                                 <c:choose>
-                                                    <c:when test="${info.drugYn eq 'Y'}">
-                                                        복용 (<c:out value="${info.drugContent}" />)
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        미복용
-                                                    </c:otherwise>
+                                                    <c:when test="${info.drugYn eq 'Y'}">복용 (<c:out value="${info.drugContent}" />)</c:when>
+                                                    <c:when test="${info.drugYn eq 'N'}">미복용</c:when>
+                                                    <c:otherwise></c:otherwise>
                                                 </c:choose>
                                             </td>
                                             <th>임신</th>
                                             <td>
                                                 <c:choose>
-                                                    <c:when test="${info.pregnancyStatus eq 'N'}">
-                                                        무
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        유 (<c:out value="${info.pregnancyWeek}주차" />)
-                                                    </c:otherwise>
+                                                    <c:when test="${info.pregnancyStatus eq 'N'}">무</c:when>
+                                                    <c:when test="${info.pregnancyStatus eq 'Y'}">유 (<c:out value="${info.pregnancyWeek}주차" />)</c:when>
+                                                    <c:otherwise></c:otherwise>
                                                 </c:choose>
                                             </td>
                                         </tr>
@@ -177,12 +171,9 @@ function nonFaceStart() {
                                             <th rowspan="2">기저질환 여부</th>
                                             <td colspan="3">
                                                 <c:choose>
-                                                    <c:when test="${info.basalDiseaseYn eq 'Y'}">
-                                                        유
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        무
-                                                    </c:otherwise>
+                                                    <c:when test="${info.basalDiseaseYn eq 'Y'}">유</c:when>
+                                                    <c:when test="${info.basalDiseaseYn eq 'N'}">무</c:when>
+                                                    <c:otherwise></c:otherwise>
                                                 </c:choose>
                                             </td>
                                         </tr>

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

@@ -51,7 +51,6 @@ function setEventHandler(){
 
     $( "input[name='pregnancyStatus']" ).on( "click", function(){
         var $this = $( this );
-        console.log("!@#!@# -- > " + $this.val());
         if ($this.val() == "Y") {
             $("#pregnancyWeek").prop("disabled", false);
         } else {
@@ -72,6 +71,20 @@ function setEventHandler(){
         $( "#hospitalizationDate" ).val( ymd + " " + hour + ":" + min + ":00" );
     });
     
+    //성별 남선택시 임신유무 고정
+    $( "input[name='gender']" ).on( "click", function(){
+        var gender = $( this ).val();
+        console.log( gender );
+        
+        if( gender == "M" ) {
+            $( "input[name='pregnancyStatus']:input[value='N']" ).prop( "checked", true );
+            $( "input[name='pregnancyStatus']:input[value='Y']" ).prop( "disabled", true );
+            $( "#pregnancyWeek" ).val( "" );
+        } else {
+            $( "input[name='pregnancyStatus']:input[value='N']" ).prop( "checked", false );
+            $( "input[name='pregnancyStatus']:input[value='Y']" ).prop( "disabled", false );
+        }
+    });
     
     //생년월일
     $( ".select-date" ).on( "change", function(){
@@ -292,7 +305,7 @@ $( function(){
                                                                 </select>
                                                             </div>
                                                             
-                                                            <input type="text" class="error-box" id="jumin" name="jumin" required>
+                                                            <input type="date" class="error-box" id="jumin" name="jumin" required>
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -370,11 +383,11 @@ $( function(){
                                                     <th rowspan="4">기저질환 여부</th>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" id="basalY" name="basalDiseaseYn" value="Y" required>
+                                                            <input class="form-check-input" type="radio" id="basalY" name="basalDiseaseYn" value="Y">
                                                             <span class="form-check-label">예</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" id="basalN" name="basalDiseaseYn" value="N" checked="checked" required>
+                                                            <input class="form-check-input" type="radio" id="basalN" name="basalDiseaseYn" value="N">
                                                             <span class="form-check-label">아니오</span>
                                                         </label>
                                                         (예인 경우 하단의 기저질환을 선택하세요)

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

@@ -68,7 +68,7 @@ $(document).ready(function(){
     
     
     $.validator.addMethod( "date",  function( value, element ) {
-        return this.optional(element) || !/Invalid|NaN/.test(new Date(value).toString());
+        return this.optional(element) ||  (Date.parse(value, "yyyy-MM-dd") == NaN) ? false : true;
     }, "날짜형식을 올바르게 입력해주세요  yyyy-mm-dd" );