환자 정보 수정 완료, 각페이지 취소버튼 수정

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

@@ -149,14 +149,14 @@ public class PatientController extends LifeCenterController {
         dto.setPatientIdx( patientIdx );
         
         //patientDisease Insert
-        dto.setEtcCheck( dto.getEctCheckDisease() );
+        dto.setEtcCheck( dto.getEtcCheckDisease() );
         dto.setEtcContent( dto.getEtcContentDisease() );
         
         patientService.insertPatientDisease( dto );
         
         
         //patientSymptom Insert
-        dto.setEtcCheck( dto.getEctCheckSymptom() );
+        dto.setEtcCheck( dto.getEtcCheckSymptom() );
         dto.setEtcContent( dto.getEtcContentSymptom() );
         dto.setBloodPressureLevel( dto.getBloodPressureLevelCon() + "|" + dto.getBloodPressureLevelRel() );
         
@@ -234,6 +234,45 @@ public class PatientController extends LifeCenterController {
         
         return mv;
     }
+    
+    @RequestMapping("/edit/update")
+    public String patientEditUpdate(
+            @ModelAttribute("dto") final PatientDTO dto,
+            HttpServletRequest request,HttpServletResponse response ) throws Exception {
+        int sesCenterCode = Integer.valueOf( LifeCenterSessionController.getSession( request, "sesCenterCode" ) ) ;
+        String sesId  = LifeCenterSessionController.getSession( request, "sesId" );
+        
+        int patientIdx = dto.getPatientIdx();
+        dto.setPatientIdx( patientIdx );
+        
+        //patientCare Update
+        String jumin = dto.getJumin().replace( "-" , "" );
+        
+        dto.setId( dto.getWardNumber().trim() + dto.getRoomNumber().trim() );
+        dto.setPw( LifeCenterFunction.aesEncrypt( config.aesKey, config.IV, jumin.substring(2) ) );
+        dto.setJumin( jumin );
+        dto.setCenterCode( sesCenterCode );
+        dto.setState( "H" ); // H : 입소
+        dto.setCreateBy( sesId );
+        
+        patientService.updatePatientCare( dto );  // 환지 기본정보 insert
+        
+        //patientDisease Insert
+        dto.setEtcCheck( dto.getEtcCheckDisease() );
+        dto.setEtcContent( dto.getEtcContentDisease() );
+        
+        patientService.updatePatientDisease( dto );
+        
+        
+        //patientSymptom Insert
+        dto.setEtcCheck( dto.getEtcCheckSymptom() );
+        dto.setEtcContent( dto.getEtcContentSymptom() );
+        dto.setBloodPressureLevel( dto.getBloodPressureLevelCon() + "|" + dto.getBloodPressureLevelRel() );
+        
+        patientService.updatePatientSymptom( dto );
+        
+        return "redirect:/patient/info?patientIdx=" + patientIdx;
+    }
 
     @RequestMapping("/privacy")
     public ModelAndView patientPrivacy() {
@@ -310,7 +349,7 @@ public class PatientController extends LifeCenterController {
         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() + ")" : "";
+        String ectCheckDisease = dto.getEtcCheckDisease().equals("Y") ? "기타(" + dto.getEtcContentDisease() + ")" : "";
         
         ArrayList<String> disease = new ArrayList<String>();
         disease.add(highBloodPressureCheck);
@@ -359,7 +398,7 @@ public class PatientController extends LifeCenterController {
         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 ectCheckSymptom = dto.getEtcCheckSymptom().equals("Y") ? "기타(" + dto.getEtcContentSymptom() + ")" : "";
         
         String strSymptom = "";
         ArrayList<String> symptom = new ArrayList<String>();

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

@@ -60,8 +60,8 @@ public class PatientDTO {
     private String cancerName;
     private String etcCheck="N";
     private String etcContent="";
-    private String ectCheckDisease="N";
-    private String ectCheckSymptom="N";
+    private String etcCheckDisease="N";
+    private String etcCheckSymptom="N";
     private String etcContentDisease="";
     private String etcContentSymptom="";
     
@@ -90,8 +90,8 @@ public class PatientDTO {
     private String bloodPressureLevel="";
     private String oxygenSaturation="";
     
-    private String bloodPressureLevelCon="";
-    private String bloodPressureLevelRel="";
+    private String bloodPressureLevelCon="0";
+    private String bloodPressureLevelRel="0";
     
     private String centerName = "";
     
@@ -416,17 +416,17 @@ public class PatientDTO {
     public void setEtcContent(String etcContent) {
         this.etcContent = etcContent;
     }
-    public String getEctCheckDisease() {
-        return ectCheckDisease;
+    public String getEtcCheckDisease() {
+        return etcCheckDisease;
     }
-    public void setEctCheckDisease(String ectCheckDisease) {
-        this.ectCheckDisease = ectCheckDisease;
+    public void setEtcCheckDisease(String etcCheckDisease) {
+        this.etcCheckDisease = etcCheckDisease;
     }
-    public String getEctCheckSymptom() {
-        return ectCheckSymptom;
+    public String getEtcCheckSymptom() {
+        return etcCheckSymptom;
     }
-    public void setEctCheckSymptom(String ectCheckSymptom) {
-        this.ectCheckSymptom = ectCheckSymptom;
+    public void setEtcCheckSymptom(String etcCheckSymptom) {
+        this.etcCheckSymptom = etcCheckSymptom;
     }
     public String getEtcContentDisease() {
         return etcContentDisease;

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

@@ -161,7 +161,7 @@
                    PS.FEVER_RIGHT AS feverRight,
                    PS.FEVER_LEFT AS feverLeft,
                    PS.FATIGUE_CHECK AS fatigueCheck,
-                   PS.ETC_CHECK AS ectCheckSymptom,
+                   PS.ETC_CHECK AS etcCheckSymptom,
                    PS.ETC_CONTENT AS etcContentSymptom,
                    PS.CHEST_PAIN AS chestPain,
                    PS.NOSE_CHECK AS noseCheck,
@@ -197,7 +197,7 @@
                    PD.KIDNEY_DISEASE AS kidneyDisease,
                    PD.CANCER_CHECK AS cancerCheck,
                    PD.CANCER_NAME AS cancerName,
-                   PD.ETC_CHECK AS ectCheckDisease,
+                   PD.ETC_CHECK AS etcCheckDisease,
                    PD.ETC_CONTENT AS etcContentDisease,
                    (SELECT CI.CENTER_NAME
                       FROM CENTER_INFO CI
@@ -215,29 +215,29 @@
     <update id="updatePatientCare" parameterType="PatientDTO" useGeneratedKeys="true">
         <![CDATA[
             UPDATE patient_care
-               SET patient_name = ${patientName},
-                   gender = ${gender},
-                   ward_number = ${wardNumber},
-                   room_number = ${roomNumber},
-                   hospitalization_date = ${hospitalizationDate},
-                   state = ${state},
-                   center_code = ${centerCode},
-                   jumin = ${jumin},
-                   patient_phone = ${patientPhone},
-                   guardian_phone = ${guardianPhone},
-                   symptom_start_date = ${symptomStartDate},
-                   confirmation_date = ${confirmationDate},
-                   disisolation_date = ${disisolationDate},
-                   basal_disease_yn = ${basalDiseaseYn},
-                   drug_yn = ${drugYn},
-                   drug_content = ${drugContent},
-                    pregnancy_status = ${pregnancyStatus},
-                   pregnancy_week = ${pregnancyWeek},
-                   id = ${id},
-                   pw = ${pw},
+               SET patient_name = #{patientName},
+                   gender = #{gender},
+                   ward_number = #{wardNumber},
+                   room_number = #{roomNumber},
+                   hospitalization_date = #{hospitalizationDate},
+                   state = #{state},
+                   center_code = #{centerCode},
+                   jumin = #{jumin},
+                   patient_phone = #{patientPhone},
+                   guardian_phone = #{guardianPhone},
+                   symptom_start_date = #{symptomStartDate},
+                   confirmation_date = #{confirmationDate},
+                   disisolation_date = #{disisolationDate},
+                   basal_disease_yn = #{basalDiseaseYn},
+                   drug_yn = #{drugYn},
+                   drug_content = #{drugContent},
+                    pregnancy_status = #{pregnancyStatus},
+                   pregnancy_week = #{pregnancyWeek},
+                   id = #{id},
+                   pw = #{pw},
                    update_date = NOW(),
-                   update_by = ${updateBy}
-             WHERE patient_idx = ${patientIdx}
+                   update_by = #{updateBy}
+             WHERE patient_idx = #{patientIdx}
         ]]>
     </update>
     
@@ -247,7 +247,7 @@
                SET high_blood_pressure_check = #{highBloodPressureCheck},
                    low_blood_pressure_check = #{lowBloodPressureCheck}, 
                    organ_transplant_check = #{organTransplantCheck},  
-                   diabetes_check = , #{diabetesCheck}, 
+                   diabetes_check = #{diabetesCheck}, 
                    respiratory_disease_check = #{respiratoryDiseaseCheck}, 
                    immunological_disease_check = #{immunologicalDiseaseCheck}, 
                    dyspnea_check = #{dyspneaCheck},
@@ -257,7 +257,7 @@
                    sore_throat_check = #{soreThroatCheck},
                    smell_palate_check = #{smellPalateCheck},
                    fatigue_check = #{fatigueCheck},
-                   heart_disease = #{heartDisea},
+                   heart_disease = #{heartDisease},
                    liver_disease = #{liverDisease},
                    `operation` = #{operation},
                    operation_content = #{operationContent},
@@ -266,8 +266,8 @@
                    cancer_check = #{cancerCheck},
                    cancer_name = #{cancerName},
                    etc_check =   #{etcCheck},
-                   etc_content=${etcContent}
-             WHERE patient_idx = ${patientIdx}
+                   etc_content=#{etcContent}
+             WHERE patient_idx = #{patientIdx}
         ]]>
     </update>
     
@@ -297,7 +297,7 @@
                    respiration_rate = #{respirationRate},
                    blood_pressure_level = #{bloodPressureLevel},
                    oxygen_saturation = #{oxygenSaturation}
-             WHERE patient_idx = #{patient_idx}
+             WHERE patient_idx = #{patientIdx}
         ]]>
     </update>
 </mapper>

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

@@ -81,6 +81,8 @@ function setEventHandler(){
 $( function(){
     patientNewInit();
     setEventHandler();
+    $( ".hospitalizationDate" ).trigger( "change" );
+    $( ".select-date" ).trigger( "change" );
     
     $( "input.date" ).daterangepicker({
         singleDatePicker : true,
@@ -174,9 +176,10 @@ $( function(){
                                     
                                     <c:if test="${centerCount > 0}">
                                         <c:set var="now" value="<%=new java.util.Date()%>" />
-                                        <c:set var="action" value="/patient/new/update" />
+                                        <c:set var="action" value="/patient/edit/update" />
                                         
-                                        <form id="patientForm" action="${action}">
+                                        <form id="patientForm" action="${action}" method="post">
+                                            <input type="hidden" value="${patientIdx}" name="patientIdx">
                                             <table class="table mobile-table">
                                                 <colgroup>
                                                     <col style="width:15%">
@@ -414,7 +417,7 @@ $( 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="opertaionContent" value="${patientData.operationContent}" name="opertaionContent" class="form-control form-control-sm w150" <c:if test="${patientData.operation eq 'N'}">readonly</c:if>> )</span>
+                                                            <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>
                                                         </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>>
@@ -429,12 +432,12 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3" class="basalDisease">
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="cancerCheck" type="checkbox" value="Y">
-                                                            <span class="form-check-label">암 ( <input type="text" name="cancerContent" class="form-control form-control-sm w150"> )</span>
+                                                            <input class="form-check-input" name="cancerCheck" type="checkbox" value="Y" <c:if test="${patientData.cancerCheck eq 'Y'}">checked="checked"</c:if>>
+                                                            <span class="form-check-label">암 ( <input type="text" name="cancerName" value="${patientData.cancerName}" class="form-control form-control-sm w150"> )</span>
                                                         </label>
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="etcCheckBasal" type="checkbox" value="Y">
-                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentBasal" class="form-control form-control-sm w150"> )</span>
+                                                            <input class="form-check-input" name="etcCheckDisease" type="checkbox" value="Y" <c:if test="${patientData.etcCheckDisease eq 'Y'}">checked="checked"</c:if>>
+                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentDisease" value="${patientData.etcContentDisease}" class="form-control form-control-sm w150"> )</span>
                                                         </label>
                                                     </td>
                                                 </tr>
@@ -445,31 +448,31 @@ $( function(){
                                                     <th rowspan="3">현재 증상<br />(입소 당시)</th>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="feverCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="feverCheck" type="checkbox" value="Y" <c:if test="${patientData.feverCheck 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="coughCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="coughCheck" type="checkbox" value="Y" <c:if test="${patientData.coughCheck 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="colic" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="colic" type="checkbox" value="Y" <c:if test="${patientData.colic 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="coldFitCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="coldFitCheck" type="checkbox" value="Y" <c:if test="${patientData.coldFitCheck 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="sputumCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="sputumCheck" type="checkbox" value="Y" <c:if test="${patientData.sputumCheck 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="ocinCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="ocinCheck" type="checkbox" value="Y" <c:if test="${patientData.ocinCheck 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="chestPagin" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="chestPain" type="checkbox" value="Y" <c:if test="${patientData.chestPain eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">흉통(가슴 통증)</span>
                                                         </label>
                                                     </td>
@@ -477,35 +480,35 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="noseCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="noseCheck" type="checkbox" value="Y" <c:if test="${patientData.noseCheck 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="vomitingCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="vomitingCheck" type="checkbox" value="Y" <c:if test="${patientData.vomitingCheck 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="musclePainCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="musclePainCheck" type="checkbox" value="Y" <c:if test="${patientData.musclePainCheck 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="soreThroatCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="soreThroatCheck" type="checkbox" value="Y" <c:if test="${patientData.soreThroatCheck 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="diarrheaCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="diarrheaCheck" type="checkbox" value="Y" <c:if test="${patientData.diarrheaCheck 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="headacheCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="headacheCheck" type="checkbox" value="Y" <c:if test="${patientData.headacheCheck 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="dyspneaCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="dyspneaCheck" type="checkbox" value="Y" <c:if test="${patientData.dyspneaCheck 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="fatigueCheck" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="fatigueCheck" type="checkbox" value="Y" <c:if test="${patientData.fatigueCheck eq 'Y'}">checked="checked"</c:if>>
                                                             <span class="form-check-label">권태감(피곤함)</span>
                                                         </label>
                                                     </td>
@@ -513,43 +516,43 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="etcCheckDisease" type="checkbox" value="option1">
-                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentDisease" class="form-control form-control-sm w150"> )</span>
+                                                            <input class="form-check-input" name="etcCheckSymptom" type="checkbox" value="Y" <c:if test="${patientData.etcCheckSymptom eq 'Y'}">checked="checked"</c:if>>
+                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentSymptom" class="form-control form-control-sm w150" value="${patientData.etcContentSymptom}" <c:if test="${patientData.etcCheckDisease eq 'N'}">readonly</c:if>> )</span>
                                                         </label>
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <th>체온</th>
-                                                    <td>우측 (<input type="text" class="form-control form-control-sm w50" name="feverRight">)℃ /  좌측 (<input type="text" class="form-control form-control-sm w50" name="feverLeft">)℃</td>
+                                                    <td>우측 (<input type="text" class="form-control form-control-sm w50" name="feverRight" value="${patientData.feverRight}">)℃ /  좌측 (<input type="text" value="${patientData.feverLeft}" class="form-control form-control-sm w50" name="feverLeft">)℃</td>
                                                     
                                                     <th>맥박수</th>
                                                     <td>
-                                                        (<input type="text" class="form-control form-control-sm w50" name="pulseRate">) 회/분
+                                                        (<input type="text" class="form-control form-control-sm w50" name="pulseRate" value="${patientData.pulseRate}">) 회/분
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <th>호흡수</th>
                                                     <td>
-                                                        (<input type="text" class="form-control form-control-sm w50" name="respirationRate">) 회/분
+                                                        (<input type="text" class="form-control form-control-sm w50" name="respirationRate" value="${patientData.respirationRate}">) 회/분
                                                     </td>
                                                     <th>혈압</th>
                                                     <td>수축기 (
-                                                        <input type="text" class="form-control form-control-sm w50" name="bloodPressureLevelCon">)mmHg  
+                                                        <input type="text" class="form-control form-control-sm w50" name="bloodPressureLevelCon" value="${patientData.bloodPressureLevelCon}">)mmHg  
                                                         /  이완기 (
-                                                        <input type="text" class="form-control form-control-sm w50" name="bloodPressureLevelRel">)mmHg
+                                                        <input type="text" class="form-control form-control-sm w50" name="bloodPressureLevelRel" value="${patientData.bloodPressureLevelRel}">)mmHg
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <th>산소포화도</th>
                                                     <td colspan="3">
-                                                        (<input type="text" class="form-control form-control-sm w50" name="oxygenSaturation">) %
+                                                        (<input type="text" class="form-control form-control-sm w50" name="oxygenSaturation" value="${patientData.oxygenSaturation}">) %
                                                     </td>
                                                 </tr>
                                             </table>
                                             <div class="row mt-3">
                                                 <div class="col-12">
                                                     <div class="text-right">
-                                                        <button class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
+                                                        <button type="button" class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
                                                         <button type="submit" class="btn btn-primary w100">수정</button>
                                                     </div>
                                                 </div>

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

@@ -266,8 +266,8 @@ function nonFaceStart() {
                                     <div class="row mt-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <button class="btn btn-primary w100">수정</button>
-                                                <button class="btn btn-primary w100" onclick="location.href='./list'">확인</button>
+                                                <button type="button" class="btn btn-primary w100" onclick="location.href='./edit?patientIdx=${patientIdx}';">수정</button>
+                                                <button type="button" class="btn btn-primary w100" onclick="history.back();">확인</button>
                                             </div>
                                         </div>
                                     </div>

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

@@ -96,8 +96,7 @@
                                                     </div>
                                                 </td>
                                                 <td colspan="2">
-                                                    <button
-                                                        class="btn btn-primary">검색</button>
+                                                    <button class="btn btn-primary">검색</button>
                                                 </td>
                                             </tr>
                                         </table>

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

@@ -426,11 +426,11 @@ $( function(){
                                                     <td colspan="3" class="basalDisease">
                                                         <label class="form-check form-check-inline label-readonly-check">
                                                             <input class="form-check-input" name="cancerCheck" type="checkbox" value="Y">
-                                                            <span class="form-check-label">암 ( <input type="text" name="cancerContent" class="form-control form-control-sm w150"> )</span>
+                                                            <span class="form-check-label">암 ( <input type="text" name="cancerName" class="form-control form-control-sm w150"> )</span>
                                                         </label>
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="etcCheckBasal" type="checkbox" value="Y">
-                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentBasal" class="form-control form-control-sm w150"> )</span>
+                                                            <input class="form-check-input" name="etcCheckDisease" type="checkbox" value="Y">
+                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentDisease" class="form-control form-control-sm w150"> )</span>
                                                         </label>
                                                     </td>
                                                 </tr>
@@ -465,7 +465,7 @@ $( function(){
                                                             <span class="form-check-label">오심(구역질)</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" name="chestPagin" type="checkbox" value="Y">
+                                                            <input class="form-check-input" name="chestPain" type="checkbox" value="Y">
                                                             <span class="form-check-label">흉통(가슴 통증)</span>
                                                         </label>
                                                     </td>
@@ -509,8 +509,8 @@ $( function(){
                                                 <tr>
                                                     <td colspan="3">
                                                         <label class="form-check form-check-inline label-readonly-check">
-                                                            <input class="form-check-input" name="etcCheckDisease" type="checkbox" value="option1">
-                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentDisease" class="form-control form-control-sm w150"> )</span>
+                                                            <input class="form-check-input" name="etcCheckSymptom" type="checkbox" value="Y">
+                                                            <span class="form-check-label">기타 ( <input type="text" name="etcContentSymptom" class="form-control form-control-sm w150"> )</span>
                                                         </label>
                                                     </td>
                                                 </tr>
@@ -545,7 +545,7 @@ $( function(){
                                             <div class="row mt-3">
                                                 <div class="col-12">
                                                     <div class="text-right">
-                                                        <button class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
+                                                        <button type="button" class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
                                                         <button type="submit" class="btn btn-primary w100">등록</button>
                                                     </div>
                                                 </div>

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

@@ -172,12 +172,8 @@
                                     <div class="row mt-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <button
-                                                    class="btn btn-outline-primary w100"
-                                                    onclick="history.go(-1);">취소</button>
-                                                <button
-                                                    class="btn btn-primary w100"
-                                                    onclick="location.href='info';">수정</button>
+                                                <button type="button" class="btn btn-outline-primary w100" onclick="history.go(-1);">취소</button>
+                                                <button type="button" class="btn btn-primary w100" onclick="location.href='info';">수정</button>
                                             </div>
                                         </div>
                                     </div>

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

@@ -130,8 +130,8 @@
                                     <div class="row mt-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <button class="btn btn-outline-primary w100" onclick="location.href='./list';">취소</button>
-                                                <button class="btn btn-primary w100">수정</button>
+                                                <button type="button" class="btn btn-outline-primary w100" onclick="location.href='./list';">취소</button>
+                                                <button type="submit" class="btn btn-primary w100">수정</button>
                                             </div>
                                         </div>
                                     </div>

src/main/webapp/WEB-INF/jsp/staff/myinfo.jsp

@@ -119,7 +119,7 @@ $( function(){
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div class="text-right">
-                                                    <button class="btn btn-outline-primary w100">취소</button>
+                                                    <button type="button" class="btn btn-outline-primary w100">취소</button>
                                                     <button type="submit" class="btn btn-primary w100">수정</button>
                                                 </div>
                                             </div>

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

@@ -170,8 +170,8 @@ $( function(){
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div class="text-right">
-                                                    <button class="btn btn-outline-primary w100">취소</button>
-                                                    <button class="btn btn-primary w100">등록</button>
+                                                    <button type="button" class="btn btn-outline-primary w100">취소</button>
+                                                    <button type="submit" class="btn btn-primary w100">등록</button>
                                                 </div>
                                             </div>
                                         </div>