junekeunsong 4 yıl önce
ebeveyn
işleme
5dfaabbf02

+ 6 - 0
src/main/java/com/lemon/lifecenter/controller/MobileHistoryController.java

@@ -43,6 +43,9 @@ public class MobileHistoryController  extends LifeCenterController {
         
         PatientHealthDTO hdto = new PatientHealthDTO();
         PatientHealthDTO historyData = new PatientHealthDTO();
+        PatientDTO dto = new PatientDTO();
+        dto.setPatientIdx(Integer.parseInt(patientIdx));
+        int cnt = patientService.selectMunJinCount(dto);
         
         if( date.equals( "" ) ){
             date = LifeCenterFunction.getNow( "yyyy-MM-dd" );
@@ -88,6 +91,8 @@ public class MobileHistoryController  extends LifeCenterController {
         mv.addObject( "nextDate", LifeCenterFunction.getNextDate( date ) );
         mv.addObject( "nowDate", LifeCenterFunction.getNow( "yyyy-MM-dd" ) );
         
+        mv.addObject("munjinCnt", cnt);
+        
         return mv;
     }
     
@@ -112,6 +117,7 @@ public class MobileHistoryController  extends LifeCenterController {
         dto.setJumin(jumin);
         
         String bloodPress = dto.getBloodPressureLevel();
+        logger.error("bloodPress -- > " + bloodPress);
         if (!bloodPress.equals("")) {
             String[] bloodPressureLevel = dto.getBloodPressureLevel().split("[|]");
             dto.setBloodPressureLevelCon(bloodPressureLevel[0]);

+ 8 - 0
src/main/java/com/lemon/lifecenter/controller/MobileServeyController.java

@@ -42,6 +42,14 @@ public class MobileServeyController extends LifeCenterController {
         
         String bloodPressureLevelCon = dto.getBloodPressureLevelCon();
         String bloodPressureLevelRel = dto.getBloodPressureLevelRel();
+        if (bloodPressureLevelCon.equals("")) {
+            dto.setBloodPressureLevelCon("0");
+        }
+        if (bloodPressureLevelRel.equals("")) {
+            dto.setBloodPressureLevelRel("0");
+        }
+        bloodPressureLevelCon = dto.getBloodPressureLevelCon();
+        bloodPressureLevelRel = dto.getBloodPressureLevelRel();
         dto.setBloodPressureLevel(bloodPressureLevelCon + "|" + bloodPressureLevelRel);
         
         patientService.mobileInsertPatientMunjin(dto);

+ 6 - 1
src/main/webapp/WEB-INF/jsp/mobile/history/history.jsp

@@ -24,7 +24,12 @@
                     </c:if>
                 </div>
                 <div class="history">
-                    <a href="./serveyhistory">문진 내역 보기 ▶</a>
+                    <c:if test="${munjinCnt > 0}">
+                        <a href="./serveyhistory">문진 내역 보기 ▶</a>
+                    </c:if>
+                    <c:if test="${munjinCnt eq 0}">
+                        <a href="./servey">문진 내역 보기 ▶</a>
+                    </c:if>
                 </div>
                 <div class="data">
                     <div class="point">

+ 4 - 2
src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -33,7 +33,8 @@ function alreadyMunjin() {
                             </li>
                             <li>
                                 <c:if test="${munjinCnt > 0}">
-                                    <a onclick="alreadyMunjin();">문진</a>
+<!--                                     <a onclick="alreadyMunjin();">문진</a> -->
+                                    <a href="./serveyhistory">문진</a>
                                 </c:if>
                                 <c:if test="${munjinCnt eq 0}">
                                     <a href="./servey">문진</a>
@@ -94,7 +95,8 @@ function alreadyMunjin() {
                     </li>
                     <li>
                         <c:if test="${munjinCnt > 0}">
-                            <a onclick="alreadyMunjin();">
+<!--                             <a onclick="alreadyMunjin();"> -->
+                            <a href="./serveyhistory">
                         </c:if>
                         <c:if test="${munjinCnt eq 0}">
                             <a href="./servey">

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

@@ -77,7 +77,7 @@ function setEventHandler() {
         <div class="container">
             <div class="header">
                 <div class="previous">
-                    <a href="javascript:;">이전</a>
+                    <a href="./menu">이전</a>
                 </div>
                 <div class="title">
                     문진