동 필수입력 제외

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

@@ -8,8 +8,8 @@ public class PatientDTO {
     private int patientIdx;
     private String patientName;
     private String gender = "";
-    private String wardNumber;
-    private String roomNumber;
+    private String wardNumber="";
+    private String roomNumber="";
     private String finamClinicDate;
     private String hospitalizationDate;
     private String state;

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

@@ -12,8 +12,8 @@ public class PatientPHRLatestDTO {
 	private int patientIdx;
 	private String patientName;
 	private String centerCode;	
-	private String wardNumber;
-	private String roomNumber;
+	private String wardNumber="";
+	private String roomNumber="";
 	private Float temperature;
 	private Date temperatureCreateDate;
 	private Integer oxygenSaturation;

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

@@ -134,7 +134,7 @@ $( function(){
         messages : {
 //             jumin : "생년월일을 모두 선택해주세요",
             gender: "성별을 선택해주세요",
-            wardNumber : "동을 입력해주세요",
+//             wardNumber : "동을 입력해주세요",
             roomNumber : "호실을 입력해주세요",
             hospitalizationDate : {
                 dateTime:"입소일시를 선택해주세요"
@@ -253,7 +253,7 @@ $( function(){
                                                     <td>
                                                         <div class="form-check-inline">
                                                             <!-- 병동 번호 (동 /호실) -->
-                                                            <input type="text" value="${patientData.wardNumber}" class="form-control" name="wardNumber" required> <span>동</span>
+                                                            <input type="text" value="${patientData.wardNumber}" class="form-control" name="wardNumber"> <span>동</span>
                                                             <input type="text" value="${patientData.roomNumber}" class="form-control" name="roomNumber" required> <span>호</span>
                                                         </div>
                                                     </td>

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

@@ -89,7 +89,10 @@ function nonFaceStart() {
                                         <tr>
                                             <th>병동 번호</th>
                                             <td>
-                                                <c:out value="${info.wardNumber}동 ${info.roomNumber}호" />
+                                                <c:if test="${info.wardNumber ne null and info.wardNumber ne ''}">
+                                                    <c:out value="${info.wardNumber}"/>동 
+                                                </c:if>
+                                                <c:out value="${info.roomNumber}" />호 
                                             </td>
                                             <th>이름</th>
                                             <td>

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

@@ -133,7 +133,7 @@ $( function(){
         messages : {
 //             jumin : "생년월일을 모두 선택해주세요",
             gender: "성별을 선택해주세요",
-            wardNumber : "동을 입력해주세요",
+//             wardNumber : "동을 입력해주세요",
             roomNumber : "호실을 입력해주세요",
             hospitalizationDate : {
                 dateTime:"입소일시를 선택해주세요"
@@ -250,7 +250,7 @@ $( function(){
                                                     <td>
                                                         <div class="form-check-inline">
                                                             <!-- 병동 번호 (동 /호실) -->
-                                                            <input type="text" class="form-control" name="wardNumber" required> <span>동</span>
+                                                            <input type="text" class="form-control" name="wardNumber"> <span>동</span>
                                                             <input type="text" class="form-control" name="roomNumber" required> <span>호</span>
                                                         </div>
                                                     </td>