1. 환자 등록, 수정 기저질환 체크리스트 수정

2. 환자 문진 기저질환 체크리스트 수정

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

@@ -163,7 +163,8 @@ public class MobileHistoryController  extends LifeCenterController {
         String operation = dto.getOperation().equals("Y") ? "수술" : "";
         String allergyCheck = dto.getAllergyCheck().equals("Y") ? "알레르기" : "";
         String kidneyDisease = dto.getKidneyDisease().equals("Y") ? "신장질환" : "";
-        String cancerCheck = dto.getCancerCheck().equals("Y") ? "암" : "";
+        String cancerName = dto.getCancerName() == null ? "" : "(" + dto.getCancerName() + ")";
+        String cancerCheck = dto.getCancerCheck().equals("Y") ? "암" + cancerName : "";
         String etcContent = dto.getEtcContentDisease() == null ? "" : dto.getEtcContentDisease();
         String ectCheckDisease = dto.getEtcCheckDisease().equals("Y") ? "기타(" + etcContent + ")" : "";
         

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

@@ -71,9 +71,11 @@ public class MobileServeyController extends LifeCenterController {
         dto.setBloodPressureLevel(bloodPressureLevelCon + "|" + bloodPressureLevelRel);
         
         int pcCnt = patientService.updatePatientCareServey(dto);
+        logger.error("dto.getKidneyDisease() -- > " + dto.getKidneyDisease());
         dto.setEtcCheck(dto.getEtcCheckDisease());
         dto.setEtcContent(dto.getEtcContentDisease());
         patientService.updatePatientDisease(dto);
+        
         dto.setEtcCheck(dto.getEtcCheckSymptom());
         dto.setEtcContent(dto.getEtcContentSymptom());
         patientService.updatePatientSymptom(dto);

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

@@ -368,8 +368,8 @@ public class PatientController extends LifeCenterController {
         String operation = dto.getOperation().equals("Y") ? "수술(" + dto.getOperationContent() + ")" : "";
         String allergyCheck = dto.getAllergyCheck().equals("Y") ? "알레르기" : "";
         String kidneyDisease = dto.getKidneyDisease().equals("Y") ? "신장질환" : "";
-        String cancerName = dto.getCancerName() == null ? "" : dto.getCancerName();
-        String cancerCheck = dto.getCancerCheck().equals("Y") ? "암(" + cancerName + ")" : "";
+        String cancerName = dto.getCancerName() == null ? "" : "(" + dto.getCancerName() + ")";
+        String cancerCheck = dto.getCancerCheck().equals("Y") ? "암" + cancerName : "";
         String etcContent = dto.getEtcContentDisease() == null ? "" : dto.getEtcContentDisease();
         String ectCheckDisease = dto.getEtcCheckDisease().equals("Y") ? "기타(" + etcContent + ")" : "";
         

src/main/webapp/WEB-INF/jsp/mobile/servey/servey.jsp

@@ -137,18 +137,31 @@ function patientNewInit() {
 function setEventHandler() {
 
     //체크yes시 content입력 처리
-    $( "li.full input[type='checkbox']" ).on( "click", function(){
+    $( "li.full input[type='checkbox'][name='cancerCheck']" ).on( "click", function(){
         var $this = $( this );
         console.log("!!!!!!!!!!!!!!");
         
-        $this.closest( "div" ).find( "input[type='text']" ).prop( "readonly", $this.is( ":checked" ) === false );
+        $this.closest( "div" ).find( "input[type='text'][name='cancerName']" ).prop( "readonly", $this.is( ":checked" ) === false );
         
         if( $this.is( ":checked" ) === false ) {
             $this.closest( "div" ).find( "input[type='text']" ).val( "" );
         } else {
             $this.closest( "div" ).find( "input[type='text']" ).focus();
         };
-    }); 
+    });
+
+    $( "li.full input[type='checkbox'][name='etcCheckDisease']" ).on( "click", function(){
+        var $this = $( this );
+        console.log("!!!!!!!!!!!!!!");
+        
+        $this.closest( "div" ).find( "input[type='text'][name='etcContentDisease']" ).prop( "readonly", $this.is( ":checked" ) === false );
+        
+        if( $this.is( ":checked" ) === false ) {
+            $this.closest( "div" ).find( "input[type='text']" ).val( "" );
+        } else {
+            $this.closest( "div" ).find( "input[type='text']" ).focus();
+        };
+    });
     
     //기저질환유무 처리
     $( "input[name='basalDiseaseYn']" ).on( "click", function(){
@@ -300,14 +313,21 @@ function setEventHandler() {
                                     <label for="allergy"><span></span>알레르기</label>
                                 </li>
                                 <li>
+                                    <input type="checkbox" id="kidney" name="kidneyDisease" value="Y" />
+                                    <label for="kidney"><span></span>신장질환</label>
+                                </li>
+                                <li class="full">
                                     <input type="checkbox" id="cancer" name="cancerCheck" value="Y" />
                                     <label for="cancer"><span></span>암</label>
+                                    <div class="comment label-readonly-check">
+                                        <input type="text" name="cancerName" placeholder="암명을 입력하세요.">
+                                    </div>
                                 </li>
                                 <li class="full">
                                     <input type="checkbox" id="diseaseEtc" name="etcCheckDisease" value="Y" />
                                     <label for="diseaseEtc"><span></span>기타</label>
                                     <div class="comment label-readonly-check">
-                                        <input type="text" name="etcContentDisease" placeholder="기타 증상 및 암명/수술명을 입력하세요.">
+                                        <input type="text" name="etcContentDisease" placeholder="기타 증상을 입력하세요.">
                                     </div>
                                 </li>
                             </ul>

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

@@ -427,7 +427,8 @@ $( function(){
                                                         </label>
                                                         <label class="form-check form-check-inline label-readonly-check">
                                                             <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="operationContent" value="${patientData.operationContent}" name="operationContent" class="form-control form-control-sm w150" <c:if test="${patientData.operation eq 'N'}">readonly</c:if>> )</span>
+<%--                                                             ( <input type="text" id="operationContent" value="${patientData.operationContent}" name="operationContent" class="form-control form-control-sm w150" <c:if test="${patientData.operation eq 'N'}">readonly</c:if>> ) --%>
+                                                            <span class="form-check-label">수술</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
                                                             <input class="form-check-input" name="allergyCheck" type="checkbox" value="Y" <c:if test="${patientData.allergyCheck eq 'Y'}">checked="checked"</c:if>>

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

@@ -410,7 +410,8 @@ $( 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="operationContent" name="operationContent" class="form-control form-control-sm w150" name=""> )</span>
+<!--                                                             ( <input type="text" id="operationContent" name="operationContent" class="form-control form-control-sm w150" name=""> ) -->
+                                                            <span class="form-check-label">수술</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
                                                             <input class="form-check-input" name="allergyCheck" type="checkbox" value="Y">