Merge branch 'master' into simplatform

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

@@ -183,10 +183,15 @@ public class PatientController extends LifeCenterController {
         
         if (!bloodPress.equals("")) {
             String[] bloodPressureLevel = dto.getBloodPressureLevel().split("[|]");
-            logger.error("bloodPress -- > " + bloodPressureLevel[0]);
-            logger.error("bloodPress -- > " + bloodPressureLevel[1]);
+            dto.setBloodPressureLevelCon(bloodPressureLevel[0]);
+            dto.setBloodPressureLevelRel(bloodPressureLevel[0]);
         }
         
+        String strDisease = getDisease(dto);
+        String strSymptom = getSymptom(dto);
+        
+        mv.addObject("disease", strDisease);
+        mv.addObject("symptom", strSymptom);
         mv.addObject("patientIdx", patientIdx);
         mv.addObject("info", dto);
         return mv;
@@ -290,4 +295,101 @@ public class PatientController extends LifeCenterController {
         
         return object.toString();
     }
+    
+    
+    private String getDisease(PatientDTO dto) {
+        String highBloodPressureCheck = dto.getHighBloodPressureCheck().equals("Y") ? "고혈압" : "";
+        String lowBloodPressureCheck = dto.getLowBloodPressureCheck().equals("Y") ? "저혈압" : "";
+        String organTransplantCheck = dto.getOrganTransplantCheck().equals("Y") ? "장기이식(신장, 간 등)" : "";
+        String diabetesCheck = dto.getDiabetesCheck().equals("Y") ? "당뇨" : "";
+        String respiratoryDiseaseCheck = dto.getRespiratoryDiseaseCheck().equals("Y") ? "호흡기질환" : "";
+        String immunologicalDiseaseCheck = dto.getImmunologicalDiseaseCheck().equals("Y") ? "면역질환(류마티스 등)" : "";
+        String heartDisease = dto.getHeartDisease().equals("Y") ? "심장질환" : "";
+        String liverDisease = dto.getLiverDisease().equals("Y") ? "간질환" : "";
+        String operation = dto.getOperation().equals("Y") ? "수술(" + dto.getOperationContent() + ")" : "";
+        String allergyCheck = dto.getAllergyCheck().equals("Y") ? "알레르기" : "";
+        String kidneyDisease = dto.getKidneyDisease().equals("Y") ? "신장질환" : "";
+        String cancerCheck = dto.getCancerCheck().equals("Y") ? "암(" + dto.getCancerName() + ")" : "";
+        String ectCheckDisease = dto.getEctCheckDisease().equals("Y") ? "기타(" + dto.getEtcContentDisease() + ")" : "";
+        
+        ArrayList<String> disease = new ArrayList<String>();
+        disease.add(highBloodPressureCheck);
+        disease.add(lowBloodPressureCheck);
+        disease.add(organTransplantCheck);
+        disease.add(diabetesCheck);
+        disease.add(respiratoryDiseaseCheck);
+        disease.add(immunologicalDiseaseCheck);
+        disease.add(heartDisease);
+        disease.add(liverDisease);
+        disease.add(operation);
+        disease.add(allergyCheck);
+        disease.add(kidneyDisease);
+        disease.add(cancerCheck);
+        disease.add(ectCheckDisease);
+        
+        String strDisease = "";
+        for (int i = 0; i < disease.size(); i++) {
+            String str = disease.get(i);
+            if (!str.equals("")) {
+                strDisease += str;
+                
+                if (i < disease.size()-2) {
+                    strDisease += ", ";
+                }
+            }
+        }
+        
+        logger.error("!!!!!!!!!!!!!!!!!!!! -- > " + strDisease);
+        return strDisease;
+    }
+    
+    private String getSymptom(PatientDTO dto) {
+        String feverCheck = dto.getFeverCheck().equals("Y") ? "열감(열나는 느낌)" : "";
+        String coughCheck = dto.getCoughCheck().equals("Y") ? "기침" : "";
+        String colic = dto.getColic().equals("Y") ? "복통(배아픔)" : "";
+        String coldFitCheck = dto.getColdFitCheck().equals("Y") ? "오한(추운 느낌)" : "";
+        String sputumCheck = dto.getSputumCheck().equals("Y") ? "가래" : "";
+        String ocinCheck = dto.getOcinCheck().equals("Y") ? "오심(구역질)" : "";
+        String chestPain = dto.getChestPain().equals("Y") ? "흉통" : "";
+        String noseCheck = dto.getNoseCheck().equals("Y") ? "콧물 또는 코 막힘" : "";
+        String vomitingCheck = dto.getVomitingCheck().equals("Y") ? "구토" : "";
+        String musclePainCheck = dto.getMusclePainCheck().equals("Y") ? "근육통(몸살)" : "";
+        String soreThroatCheck = dto.getSoreThroatCheck().equals("Y") ? "인후통(목 아픔)" : "";
+        String diarrheaCheck = dto.getDiarrheaCheck().equals("Y") ? "설사" : "";
+        String headacheCheck = dto.getHeadacheCheck().equals("Y") ? "두통(머리아픔)" : "";
+        String dyspneaCheck = dto.getDyspneaCheck().equals("Y") ? "호흡곤란(숨가쁨)" : "";
+        String fatigueCheck = dto.getFatigueCheck().equals("Y") ? "권태감(피로감)" : "";
+        String ectCheckSymptom = dto.getEctCheckSymptom().equals("Y") ? "기타(" + dto.getEtcContentSymptom() + ")" : "";
+        
+        String strSymptom = "";
+        ArrayList<String> symptom = new ArrayList<String>();
+        symptom.add(feverCheck);
+        symptom.add(coughCheck);
+        symptom.add(colic);
+        symptom.add(coldFitCheck);
+        symptom.add(sputumCheck);
+        symptom.add(ocinCheck);
+        symptom.add(chestPain);
+        symptom.add(noseCheck);
+        symptom.add(vomitingCheck);
+        symptom.add(musclePainCheck);
+        symptom.add(soreThroatCheck);
+        symptom.add(diarrheaCheck);
+        symptom.add(headacheCheck);
+        symptom.add(dyspneaCheck);
+        symptom.add(fatigueCheck);
+        symptom.add(ectCheckSymptom);
+        
+        for (int i = 0; i < symptom.size(); i++) {
+            String str = symptom.get(i);
+            if (!str.equals("")) {
+                strSymptom += str;
+                if (i < symptom.size()-2) {
+                    strSymptom += ", ";
+                }
+            }
+        }
+        
+        return strSymptom;
+    }
 }

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

@@ -59,21 +59,21 @@ public class PatientDTO {
     private String cancerCheck="N";
     private String cancerName;
     private String etcCheck="N";
-    private String etcContent;
+    private String etcContent="";
     private String ectCheckDisease="N";
     private String ectCheckSymptom="N";
-    private String etcContentDisease;
-    private String etcContentSymptom;
+    private String etcContentDisease="";
+    private String etcContentSymptom="";
     
     //patient_symptom
-    private String feverCheck;
-    private String coughCheck;
-    private String colic;
+    private String feverCheck="N";
+    private String coughCheck="N";
+    private String colic="N";
     //private String coldFitCheck;
-    private String sputumCheck;
-    private String ocinCheck;
-    private String feverRight;
-    private String feverLeft;
+    private String sputumCheck="N";
+    private String ocinCheck="N";
+    private String feverRight="";
+    private String feverLeft="";
     //private String fatigueCheck;
     //private String etcCheck;
     //private String etcContent;
@@ -85,13 +85,13 @@ public class PatientDTO {
     private String diarrheaCheck="N";
     //private String headacheCheck;
     //private String dyspneaCheck;
-    private String pulseRate;
-    private String respirationRate;
-    private String bloodPressureLevel;
-    private String oxygenSaturation;
+    private String pulseRate="";
+    private String respirationRate="";
+    private String bloodPressureLevel="";
+    private String oxygenSaturation="";
     
-    private String bloodPressureLevelCon;
-    private String bloodPressureLevelRel;
+    private String bloodPressureLevelCon="";
+    private String bloodPressureLevelRel="";
     
     private String centerName = "";
     

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

@@ -84,7 +84,7 @@
                      basal_disease_yn,  drug_yn,     drug_content,    pregnancy_status,   pregnancy_week,       id,                   pw, 
                      create_date,       create_by,   update_by )
                       
-            VALUES ( #{patientName},    #{gender},   #{wardNumber},   #{roomNumber},      ${hospitalizationDate}, #{state}, 
+            VALUES ( #{patientName},    #{gender},   #{wardNumber},   #{roomNumber},      #{hospitalizationDate}, #{state}, 
                      #{centerCode},     #{jumin},    #{patientPhone}, #{guardianPhone},   #{symptomStartDate},    #{confirmationDate},    #{disisolationDate}, 
                      #{basalDiseaseYn}, #{drugYn},   #{drugContent},  #{pregnancyStatus}, #{pregnancyWeek},       #{id},                  #{pw}, 
                      NOW(),             #{createBy}, '' )

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

@@ -7,9 +7,19 @@
 
 <script type="text/javascript">
 function patientNewInit() {
-    $( "td.basalDisease input" ).prop( "disabled", true );
+    if( $( "#basalN" ).is( ":checked" ) ) {
+        $( "td.basalDisease input" ).prop( "disabled", true );
+    }
     
-    $( "label.label-readonly-check input[type='text']" ).prop( "readonly", true );
+    $( "label.label-readonly-check" ).each( function( i, v ){
+        var $this = $(v);
+        var checkbox = $this.find( "input[type='checkbox']" );
+        var textbox  = $this.find( "input[type='text']" );
+        
+        if( !checkbox.is(":checked") ){
+            textbox.prop( "readonly", true );
+        }
+    });
 };
 function setEventHandler(){
     //체크yes시 content입력 처리
@@ -72,12 +82,10 @@ $( function(){
     patientNewInit();
     setEventHandler();
     
-    
     $( "input.date" ).daterangepicker({
         singleDatePicker : true,
         showDropdowns : true,
         locale : {
-            //format : "M/DD hh:mm A"
             format : "YYYY-MM-DD"
         }
     });
@@ -183,12 +191,13 @@ $( function(){
                                                     <td colspan="2">
                                                         <div class="form-row">
                                                             <!-- 입소일시 -->
-                                                            <c:set var="sysYmd"><fmt:formatDate value="${now}" pattern="yyyy-MM-dd" /></c:set>
-                                                            <c:set var="sysHour"><fmt:formatDate value="${now}" pattern="h" /></c:set>
-                                                            <c:set var="sysMin"><fmt:formatDate value="${now}" pattern="m" /></c:set>
+                                                            <fmt:parseDate var="hospitalizationDate" value="${patientData.hospitalizationDate}" pattern="yyyy-MM-dd HH:mm" />
+                                                            <c:set var="sysYmd"><fmt:formatDate value="${hospitalizationDate}" pattern="yyyy-MM-dd" /></c:set>
+                                                            <c:set var="sysHour"><fmt:formatDate value="${hospitalizationDate}" pattern="h" /></c:set> 
+                                                            <c:set var="sysMin"><fmt:formatDate value="${hospitalizationDate}" pattern="m" /></c:set>
                                                              
                                                             <div class="col-6 calendar-bar">
-                                                                <input class="form-control date hospitalizationDate" type="text" id="hospitalizationDateYmd">
+                                                                <input class="form-control date hospitalizationDate" type="text" value="${sysYmd}" id="hospitalizationDateYmd">
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                             </div>
                                                             <div class="col-3">
@@ -283,25 +292,25 @@ $( function(){
                                                 <tr>
                                                     <th><span class="fix">*</span>연락처</th>
                                                     <td>
-                                                        <input type="text" name="patientPhone" class="form-control" placeholder="연락처를 입력해주세요" required>
+                                                        <input type="text" name="patientPhone" value="${patientData.patientPhone}" class="form-control" placeholder="연락처를 입력해주세요" required>
                                                     </td>
                                                     <th>보호자 연락처</th>
                                                     <td>
-                                                        <input type="text" name="guardianPhone" class="form-control" placeholder="보호자 연락처를 입력해주세요">
+                                                        <input type="text" name="guardianPhone" value="${patientData.guardianPhone}" class="form-control" placeholder="보호자 연락처를 입력해주세요">
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <th><span class="fix">*</span>증상시작일</th>
                                                     <td>
                                                         <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control date" type="text" name="symptomStartDate">
+                                                            <input class="form-control date" type="text" value="${patientData.symptomStartDate}" name="symptomStartDate">
                                                             <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                         </div>
                                                     </td>
                                                     <th><span class="fix">*</span>확진일</th>
                                                     <td>
                                                         <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control date" type="text" name="confirmationDate">
+                                                            <input class="form-control date" type="text" value="${patientData.confirmationDate}" name="confirmationDate">
                                                             <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                         </div>
                                                     </td>
@@ -310,7 +319,7 @@ $( function(){
                                                     <th>격리해제 예정일</th>
                                                     <td colspan="3">
                                                         <div class="form-group calendar-bar mb-xl-0">
-                                                            <input class="form-control date" type="text" name="disisolationDate">
+                                                            <input class="form-control date" type="text" value="${patientData.disisolationDate}" name="disisolationDate">
                                                             <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                         </div>
                                                     </td>
@@ -319,32 +328,32 @@ $( function(){
                                                     <th><span class="fix">*</span>최근약복용<br />(최근 24시간 이내)</th>
                                                     <td>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" onclick="$('#drugContent').attr('readonly', true);" required>
+                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" <c:if test="${patientData.drugYn eq 'N'}">checked="checked"</c:if> onclick="$('#drugContent').attr('readonly', true);" required>
                                                             <span class="form-check-label">미복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" onclick="$('#drugContent').removeAttr('readonly');" required>
+                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" <c:if test="${patientData.drugYn eq 'Y'}">checked="checked"</c:if> onclick="$('#drugContent').removeAttr('readonly');" required>
                                                             <span class="form-check-label">복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input type="text" id="drugContent" class="form-control" name="drugContent" placeholder="약명을 입력하세요." readonly>
+                                                            <input type="text" id="drugContent" class="form-control" name="drugContent" placeholder="약명을 입력하세요." value="${patientData.drugContent}" <c:if test="${patientData.drugYn eq 'N'}">readonly</c:if>>
                                                         </label>
                                                     </td>
                                                     <th><span class="fix">*</span>임신</th>
                                                     <td>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="pregnancyStatus" value="N" required>
+                                                            <input class="form-check-input" type="radio" name="pregnancyStatus" value="N" <c:if test="${patientData.pregnancyStatus eq 'N'}">checked="checked"</c:if> required>
                                                             <span class="form-check-label">무</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="pregnancyStatus" value="Y" required>
+                                                            <input class="form-check-input" type="radio" name="pregnancyStatus" value="Y" <c:if test="${patientData.pregnancyStatus eq 'Y'}">checked="checked"</c:if> required>
                                                             <span class="form-check-label">유</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
                                                                 <select class="custom-select" name="pregnancyWeek" id="pregnancyWeek">
                                                                       <option value="" selected="">임신 주차</option>
                                                                       <c:forEach var="p" begin="1" end="40" step="1">
-                                                                          <option value="${p}">${p} 주</option>
+                                                                          <option value="${p}" <c:if test="${patientData.pregnancyWeek eq p}">selected="selected"</c:if>>${p} 주</option>
                                                                       </c:forEach>
                                                                 </select>
                                                         </label>
@@ -354,11 +363,11 @@ $( function(){
                                                     <th rowspan="4">기저질환 여부</th>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="basalDiseaseYn" value="Y" 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> required>
                                                             <span class="form-check-label">예</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="basalDiseaseYn" value="N" checked="checked" 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> required>
                                                             <span class="form-check-label">아니오</span>
                                                         </label>
                                                         (예인 경우 하단의 기저질환을 선택하세요)
@@ -367,27 +376,27 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3" class="basalDisease">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="highBloodPressureCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="highBloodPressureCheck" type="checkbox" value="Y" <c:if test="${patientData.highBloodPressureCheck 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" name="lowBloodPressureCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="lowBloodPressureCheck" type="checkbox" value="Y" <c:if test="${patientData.lowBloodPressureCheck 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" name="organTransplantCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="organTransplantCheck" type="checkbox" value="Y" <c:if test="${patientData.organTransplantCheck 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" name="diabetesCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="diabetesCheck" type="checkbox" value="Y" <c:if test="${patientData.diabetesCheck 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" name="respiratoryDiseaseCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="respiratoryDiseaseCheck" type="checkbox" value="Y" <c:if test="${patientData.respiratoryDiseaseCheck 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" name="immunologicalDiseaseCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="immunologicalDiseaseCheck" type="checkbox" value="Y" <c:if test="${patientData.immunologicalDiseaseCheck eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">면역질환(류마티스 등)</span>
                                                         </label>
                                                     </td>
@@ -396,23 +405,23 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3" class="basalDisease">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="heartDisease" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="heartDisease" type="checkbox" value="Y" <c:if test="${patientData.heartDisease 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" name="liverDisease" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="liverDisease" type="checkbox" value="Y" <c:if test="${patientData.liverDisease eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">간질환</span>
                                                         </label>
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="operation" type="checkbox" value="Y">
-                                                            <span class="form-check-label">수술 ( <input type="text" id="opertaionContent" name="opertaionContent" class="form-control form-control-sm w150" name=""> )</span>
+                                                            <input class="form-check-input" name="operation" type="checkbox" value="Y" <c:if test="${patientData.operation eq 'Y'}">checked="checked"</c:if>>${patientData.operationContent}
+                                                            <span class="form-check-label">수술 ( <input type="text" id="opertaionContent" value="${patientData.operationContent}" name="opertaionContent" class="form-control form-control-sm w150" <c:if test="${patientData.operation eq 'N'}">readonly</c:if>> )</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="allergyCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="allergyCheck" type="checkbox" value="Y" <c:if test="${patientData.allergyCheck 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" name="kidneyDisease" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="kidneyDisease" type="checkbox" value="Y" <c:if test="${patientData.kidneyDisease eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">신장질환</span>
                                                         </label>
                                                     </td>

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

@@ -130,9 +130,24 @@ function nonFaceStart() {
                                         </tr>
                                         <tr>
                                             <th>격리해제 예정일</th>
-                                            <td colspan="3">
+                                            <td>
                                                 <c:out value="${info.disisolationDate}" />
                                             </td>
+                                            <th>상태</th>
+                                            <td>
+                                                <c:if test="${info.state eq 'H'}">
+                                                    입소
+                                                </c:if>
+                                                <c:if test="${info.state eq 'D'}">
+                                                    퇴소
+                                                </c:if>
+                                                <c:if test="${info.state eq 'T'}">
+                                                    지정병원 이송
+                                                </c:if>
+                                                <c:if test="${info.state eq 'E'}">
+                                                    기타
+                                                </c:if>
+                                            </td>
                                         </tr>
                                         <tr>
                                             <th>최근 약복용<br />(최근 24시간 이내)</th>
@@ -173,40 +188,42 @@ function nonFaceStart() {
                                         </tr>
                                         <tr>
                                             <td colspan="3">
-                                                <c:if test="${info.highBloodPressureCheck eq 'Y'}">, 고혈압</c:if>
-                                                <c:if test="${info.lowBloodPressureCheck eq 'Y'}">, 저혈압</c:if>
-                                                <c:if test="${info.organTransplantCheck eq 'Y'}">, 장기이식(신장, 간 등)</c:if>
-                                                <c:if test="${info.diabetesCheck eq 'Y'}">, 당뇨</c:if>
-                                                <c:if test="${info.respiratoryDiseaseCheck eq 'Y'}">, 호흡기질환</c:if>
-                                                <c:if test="${info.immunologicalDiseaseCheck eq 'Y'}">, 면역질환(류마티스 등)</c:if>
-                                                <c:if test="${info.heartDisease eq 'Y'}">, 심장질환</c:if>
-                                                <c:if test="${info.liverDisease eq 'Y'}">, 간질환</c:if>
-                                                <c:if test="${info.operation eq 'Y'}">, 수술(<c:out value="${info.operationContent}" />)</c:if>
-                                                <c:if test="${info.allergyCheck eq 'Y'}">, 알레르기</c:if>
-                                                <c:if test="${info.kidneyDisease eq 'Y'}">, 신장질환</c:if>
-                                                <c:if test="${info.cancerCheck eq 'Y'}">, 암(<c:out value="${info.cancerName}" />)</c:if>
-                                                <c:if test="${info.ectCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if>
+<%--                                                 <c:if test="${info.highBloodPressureCheck eq 'Y'}">, 고혈압</c:if> --%>
+<%--                                                 <c:if test="${info.lowBloodPressureCheck eq 'Y'}">, 저혈압</c:if> --%>
+<%--                                                 <c:if test="${info.organTransplantCheck eq 'Y'}">, 장기이식(신장, 간 등)</c:if> --%>
+<%--                                                 <c:if test="${info.diabetesCheck eq 'Y'}">, 당뇨</c:if> --%>
+<%--                                                 <c:if test="${info.respiratoryDiseaseCheck eq 'Y'}">, 호흡기질환</c:if> --%>
+<%--                                                 <c:if test="${info.immunologicalDiseaseCheck eq 'Y'}">, 면역질환(류마티스 등)</c:if> --%>
+<%--                                                 <c:if test="${info.heartDisease eq 'Y'}">, 심장질환</c:if> --%>
+<%--                                                 <c:if test="${info.liverDisease eq 'Y'}">, 간질환</c:if> --%>
+<%--                                                 <c:if test="${info.operation eq 'Y'}">, 수술(<c:out value="${info.operationContent}" />)</c:if> --%>
+<%--                                                 <c:if test="${info.allergyCheck eq 'Y'}">, 알레르기</c:if> --%>
+<%--                                                 <c:if test="${info.kidneyDisease eq 'Y'}">, 신장질환</c:if> --%>
+<%--                                                 <c:if test="${info.cancerCheck eq 'Y'}">, 암(<c:out value="${info.cancerName}" />)</c:if> --%>
+<%--                                                 <c:if test="${info.ectCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if> --%>
+                                                <c:out value="${disease}" />
                                             </td>
                                         </tr>
                                         <tr>
                                             <th>현재 증상<br />(입소 당시)</th>
                                             <td colspan="3">
-                                                <c:if test="${info.feverCheck eq 'Y'}">, 열감(열나는느낌)</c:if>
-                                                <c:if test="${info.coughCheck eq 'Y'}">, 기침</c:if>
-                                                <c:if test="${info.colic eq 'Y'}">, 복통(배아픔)</c:if>
-                                                <c:if test="${info.coldFitCheck eq 'Y'}">, 오한(추운 느낌)</c:if>
-                                                <c:if test="${info.sputumCheck eq 'Y'}">, 가래</c:if>
-                                                <c:if test="${info.ocinCheck eq 'Y'}">, 오심(구역질)</c:if>
-                                                <c:if test="${info.chestPain eq 'Y'}">, 흉통</c:if>
-                                                <c:if test="${info.noseCheck eq 'Y'}">, 콧물 또는 코 막힘</c:if>
-                                                <c:if test="${info.vomitingCheck eq 'Y'}">, 구토</c:if>
-                                                <c:if test="${info.musclePainCheck eq 'Y'}">, 근육통(몸살)</c:if>
-                                                <c:if test="${info.soreThroatCheck eq 'Y'}">, 인후통(목 아픔)</c:if>
-                                                <c:if test="${info.diarrheaCheck eq 'Y'}">, 설사</c:if>
-                                                <c:if test="${info.headacheCheck eq 'Y'}">, 두통(머리아픔)</c:if>
-                                                <c:if test="${info.dyspneaCheck eq 'Y'}">, 호흡곤란(숨가쁨)</c:if>
-                                                <c:if test="${info.fatigueCheck eq 'Y'}">, 권태감(피곤함)</c:if>
-                                                <c:if test="${info.ectCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if>
+<%--                                                 <c:if test="${info.feverCheck eq 'Y'}">, 열감(열나는느낌)</c:if> --%>
+<%--                                                 <c:if test="${info.coughCheck eq 'Y'}">, 기침</c:if> --%>
+<%--                                                 <c:if test="${info.colic eq 'Y'}">, 복통(배아픔)</c:if> --%>
+<%--                                                 <c:if test="${info.coldFitCheck eq 'Y'}">, 오한(추운 느낌)</c:if> --%>
+<%--                                                 <c:if test="${info.sputumCheck eq 'Y'}">, 가래</c:if> --%>
+<%--                                                 <c:if test="${info.ocinCheck eq 'Y'}">, 오심(구역질)</c:if> --%>
+<%--                                                 <c:if test="${info.chestPain eq 'Y'}">, 흉통</c:if> --%>
+<%--                                                 <c:if test="${info.noseCheck eq 'Y'}">, 콧물 또는 코 막힘</c:if> --%>
+<%--                                                 <c:if test="${info.vomitingCheck eq 'Y'}">, 구토</c:if> --%>
+<%--                                                 <c:if test="${info.musclePainCheck eq 'Y'}">, 근육통(몸살)</c:if> --%>
+<%--                                                 <c:if test="${info.soreThroatCheck eq 'Y'}">, 인후통(목 아픔)</c:if> --%>
+<%--                                                 <c:if test="${info.diarrheaCheck eq 'Y'}">, 설사</c:if> --%>
+<%--                                                 <c:if test="${info.headacheCheck eq 'Y'}">, 두통(머리아픔)</c:if> --%>
+<%--                                                 <c:if test="${info.dyspneaCheck eq 'Y'}">, 호흡곤란(숨가쁨)</c:if> --%>
+<%--                                                 <c:if test="${info.fatigueCheck eq 'Y'}">, 권태감(피곤함)</c:if> --%>
+<%--                                                 <c:if test="${info.ectCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if> --%>
+                                                <c:out value="${symptom}" />
                                             </td>
                                         </tr>
                                         <tr>

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

@@ -6,9 +6,19 @@
 
 <script type="text/javascript">
 function patientNewInit() {
-    $( "td.basalDisease input" ).prop( "disabled", true );
+    if( $( "#basalN" ).is( ":checked" ) ) {
+        $( "td.basalDisease input" ).prop( "disabled", true );
+    }
     
-    $( "label.label-readonly-check input[type='text']" ).prop( "readonly", true );
+    $( "label.label-readonly-check" ).each( function( i, v ){
+        var $this = $(v);
+        var checkbox = $this.find( "input[type='checkbox']" );
+        var textbox  = $this.find( "input[type='text']" );
+        
+        if( !checkbox.is(":checked") ){
+            textbox.prop( "readonly", true );
+        }
+    });
 };
 function setEventHandler(){
     //체크yes시 content입력 처리
@@ -167,7 +177,7 @@ $( function(){
                                         <c:set var="now" value="<%=new java.util.Date()%>" />
                                         <c:set var="action" value="/patient/new/insert" />
                                         
-                                        <form id="patientForm" action="${action}">
+                                        <form id="patientForm" action="${action}" method="post">
                                             <table class="table mobile-table">
                                                 <colgroup>
                                                     <col style="width:15%">
@@ -349,11 +359,11 @@ $( function(){
                                                     <th rowspan="4">기저질환 여부</th>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="basalDiseaseYn" value="Y" required>
+                                                            <input class="form-check-input" type="radio" id="basalY" name="basalDiseaseYn" value="Y" required>
                                                             <span class="form-check-label">예</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" name="basalDiseaseYn" value="N" checked="checked" required>
+                                                            <input class="form-check-input" type="radio" id="basalN" name="basalDiseaseYn" value="N" checked="checked" required>
                                                             <span class="form-check-label">아니오</span>
                                                         </label>
                                                         (예인 경우 하단의 기저질환을 선택하세요)
@@ -400,7 +410,7 @@ $( function(){
                                                         </label>
                                                         <label class="form-check form-check-inline label-readonly-check">
                                                             <input class="form-check-input" name="operation" type="checkbox" value="Y">
-                                                            <span class="form-check-label">수술 ( <input type="text" id="opertaionContent" name="opertaionContent" class="form-control form-control-sm w150" name=""> )</span>
+                                                            <span class="form-check-label">수술 ( <input type="text" id="operationContent" name="operationContent" class="form-control form-control-sm w150" name=""> )</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
                                                             <input class="form-check-input" name="allergyCheck" type="checkbox" value="Y">