1. 환자 정보 조회 오류 수정 (혈압 미입력)

2. 문진 항목 수정

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

@@ -47,110 +47,6 @@ public class ClinicController extends LifeCenterController {
 	
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-	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 etcContent = dto.getEtcContentSymptom() == null ? "" : dto.getEtcContentSymptom();
-        String ectCheckSymptom = dto.getEtcCheckSymptom().equals("Y") ? "기타(" + etcContent + ")" : "";
-        
-        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;
-                strSymptom += ", ";
-            }
-        }
-        
-        strSymptom = strSymptom.trim();
-        if (!strSymptom.equals("")) {
-            strSymptom = strSymptom.substring(0, strSymptom.length() - 1);
-        }
-        
-        
-        return strSymptom;
-    }
-
-	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 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 + ")" : "";
-        
-        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;
-                strDisease += ", ";
-            }
-        }
-        
-        strDisease = strDisease.trim();
-        if (!strDisease.equals("")) {
-            strDisease = strDisease.substring(0, strDisease.length()-1);
-        }
-        
-        return strDisease;
-    }
-
 	@RequestMapping("/state")
 	public ModelAndView clinicState(HttpServletRequest request,
 			@RequestParam(value = "page", required = true, defaultValue = "1") int page,
@@ -201,7 +97,7 @@ public class ClinicController extends LifeCenterController {
 		String bloodPress = patientDto.getBloodPressureLevel();
 		
         if (!bloodPress.equals("") && !bloodPress.equals("|")) {
-            String[] bloodPressureLevel = patientDto.getBloodPressureLevel().split("[|]");
+            String[] bloodPressureLevel = bloodPress.split("[|]");
             patientDto.setBloodPressureLevelCon(bloodPressureLevel[0]);
             patientDto.setBloodPressureLevelRel(bloodPressureLevel[1]);
         }

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

@@ -162,21 +162,12 @@ public class PatientController extends LifeCenterController {
         
         patientService.insertPatientDisease( dto );
         
-        
         //patientSymptom Insert
         dto.setEtcCheck( dto.getEtcCheckSymptom() );
         dto.setEtcContent( dto.getEtcContentSymptom() );
         
-        if (dto.getBloodPressureLevelCon().equals("")) {
-            dto.setBloodPressureLevelCon("0");
-        }
-        
-        if (dto.getBloodPressureLevelRel().equals("")) {
-            dto.setBloodPressureLevelRel("0");
-        }
-        
         dto.setBloodPressureLevel( dto.getBloodPressureLevelCon() + "|" + dto.getBloodPressureLevelRel() );
-        
+//        
         patientService.insertPatientSymptom( dto );
         
         return "redirect:/patient/info?patientIdx=" + patientIdx;
@@ -198,9 +189,8 @@ public class PatientController extends LifeCenterController {
         
         String bloodPress = dto.getBloodPressureLevel();
         
-        logger.error("bloodPress -- > " + bloodPress);
         if (!bloodPress.equals("") && !bloodPress.equals("|")) {
-            String[] bloodPressureLevel = dto.getBloodPressureLevel().split("[|]");
+            String[] bloodPressureLevel = bloodPress.split("[|]");
             dto.setBloodPressureLevelCon(bloodPressureLevel[0]);
             dto.setBloodPressureLevelRel(bloodPressureLevel[1]);
         }
@@ -245,6 +235,14 @@ public class PatientController extends LifeCenterController {
             // return ""; 아직처리안함
         }
         
+        String bloodPress = patientDTO.getBloodPressureLevel();
+        
+        if (!bloodPress.equals("") && !bloodPress.equals("|")) {
+            String[] bloodPressureLevel = bloodPress.split("[|]");
+            patientDTO.setBloodPressureLevelCon(bloodPressureLevel[0]);
+            patientDTO.setBloodPressureLevelRel(bloodPressureLevel[1]);
+        }
+        
         ModelAndView mv = setMV("patient/edit");
         
         mv.addObject( "centerName", centerName );
@@ -289,6 +287,7 @@ public class PatientController extends LifeCenterController {
         //patientSymptom Insert
         dto.setEtcCheck( dto.getEtcCheckSymptom() );
         dto.setEtcContent( dto.getEtcContentSymptom() );
+        
         dto.setBloodPressureLevel( dto.getBloodPressureLevelCon() + "|" + dto.getBloodPressureLevelRel() );
         
         patientService.updatePatientSymptom( dto );

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

@@ -468,38 +468,58 @@ function setEventHandler() {
                     </div>
                     <div class="part">
                         <div class="title">
-                            14. 최근 24시간 이내 약 복용 여부
+                            14. 최근 24시간 이내 약 복용 여부를 체크하세요.
                         </div>
                         <div class="list">
-                            <c:if test="${info.drugYn eq 'Y'}">예</c:if>
-                            <c:if test="${info.drugYn ne 'Y'}">아니오</c:if>
+                            <ul class="circle half">
+                                <li>
+                                    <input type="radio" id="drugYn1" name="drugYn" value="Y">
+                                    <label for="drugYn1"><span></span>예</label>
+                                </li>
+                                <li>
+                                    <input type="radio" id="drugYn2" name="drugYn" value="N">
+                                    <label for="drugYn2"><span></span>아니오</label>
+                                </li>
+                            </ul>
                         </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            15. 약명
-<!--                             <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span> -->
+                            15. 14번의 ”예“인 경우 약명을 입력 하세요
+                            <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span>
                         </div>
                         <div class="data">
-                            <c:out value="${info.drugContent}"></c:out>
+                            <label class="inline">
+                                약명 ( <input type="text" name="drugContent" style="max-width:120px;"> )
+                            </label>
                         </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            16. 임신 여부
+                            16. 임신 여부를 체크하세요.
+                        </div>
+                        <div class="list">
+                            <ul class="circle half">
+                                <li>
+                                    <input type="radio" id="pregnancyStatus1" name="pregnancyStatus" value="Y" />
+                                    <label for="pregnancyStatus1"><span></span>예</label>
+                                </li>
+                                <li>
+                                    <input type="radio" id="pregnancyStatus2" name="pregnancyStatus" value="N" />
+                                    <label for="pregnancyStatus2"><span></span>아니오</label>
+                                </li>
+                            </ul>
                         </div>
-                            <div class="list">
-                                <c:if test="${info.pregnancyStatus eq 'Y'}">예</c:if>
-                                <c:if test="${info.pregnancyStatus ne 'Y'}">아니오</c:if>
-                            </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            17. 임신주차
-<!--                             <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span> -->
+                            17. 16번의 ”예“인 경우 임신 주차를 입력 하세요
+                            <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span>
                         </div>
                         <div class="data">
-                            <c:out value="임신주차 : ${info.pregnancyWeek}주차"></c:out>
+                            <label class="inline">
+                                임신 주차 ( <input type="text" name="pregnancyWeek" onkeypress="onlyNumber();"> ) 주
+                            </label>
                         </div>
                     </div>
                 </div>