Merge remote-tracking branch 'origin/databank'

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

@@ -53,6 +53,13 @@ public class MobileHealthController extends LifeCenterController {
         String referer  = request.getHeader( "Referer" );
         String path = new URL( referer ).getPath();
         
+        System.err.println( pdto.getPhrType() );
+        System.err.println( pdto.getPhrValue() );
+        System.err.println( pdto.getPhrValue2() );
+        System.err.println( phrTypeAnother );
+        System.err.println( phrValueAnother );
+        System.err.println( phrValueAnother2 );
+        
         if( pdto.getPhrType().equals( "symptom" ) ) {
             
             sdto.setPatientIdx( patientIdx );
@@ -60,10 +67,12 @@ public class MobileHealthController extends LifeCenterController {
             phrService.insertSymptom( sdto );
             
         } else {
-            
             pdto.setPatientIdx( patientIdx );
-            pdto.setRecordedByName( patientName + "(환자)" );
-            phrService.insertPHR( pdto );
+            
+            if( !pdto.getPhrType().equals( "" ) ) {
+                pdto.setRecordedByName( patientName + "(환자)" );
+                phrService.insertPHR( pdto );
+            }
             
             if( !phrTypeAnother.trim().equals( "" ) ) {
                 pdto.setPhrType( phrTypeAnother );

src/main/webapp/WEB-INF/jsp/mobile/health/health2.jsp

@@ -41,16 +41,20 @@ $( function(){
         },
         onkeyup: function( element, event ) {
 //             $( "div.error-msg" ).text( "" );
-        	$( element ).valid();
+            $( element ).valid();
         },
         onfocusout: function (element) {
 //             $( "div.error-msg" ).text( "" );
-        	$( element ).valid();
+            $( element ).valid();
         },
         errorPlacement: function(error, element) {
             $( "div.error-msg" ).empty().append( error );
         },
         submitHandler: function(form) {
+            /*
+             * 혈압과 맥박은 둘중 하나만 입력하면 입력한 항목은 입력되도록 처리 (둘중하나만 입력하거나, 모두입력하거나)
+             */
+             $( "div.error-msg" ).text( "" );
             //맥박수
             var pulseRate = $.trim( $( "input[name='pulseRate']" ).val() );
             
@@ -58,19 +62,56 @@ $( function(){
             var bloodPressure = $.trim( $( "input[name='bloodPressure']" ).val() );
             var bloodPressure2 = $.trim( $( "input[name='bloodPressure2']" ).val() );
             
+            var flag = true;
+            
             //혈압
-            if( pulseRate.length == 0 ) {
-                $( "div.error-msg" ).text( "맥박수를 입력해주세요 (Please enter your heart rate)" );
-            } else if( bloodPressure.length == 0 ) {
-                $( "div.error-msg" ).text( "수축기 혈압을 입력해주세요 (Please enter your systolic blood pressure)" );
-            } else if( bloodPressure2.length == 0 ) {
-                $( "div.error-msg" ).text( "이완기 혈압을  입력해주세요  (Please enter your diastole blood pressure)" );
-            } else {
+            if( pulseRate.length == 0 &&  bloodPressure.length == 0 &&  bloodPressure.length == 0 ) {
+                $( "div.error-msg" ).text( "혈압과 맥박수를 입력해주세요 (Please enter your blood pressure and heart rate)" );
+                flag = false;
+            }
+            
+//             if( pulseRate.length == 0 ) {
+//                 $( "div.error-msg" ).text( "맥박수를 입력해주세요 (Please enter your heart rate)" );
+//             } else if( bloodPressure.length == 0 ) {
+//                 $( "div.error-msg" ).text( "수축기 혈압을 입력해주세요 (Please enter your systolic blood pressure)" );
+//             } else if( bloodPressure2.length == 0 ) {
+//                 $( "div.error-msg" ).text( "이완기 혈압을  입력해주세요  (Please enter your diastole blood pressure)" );
+//             }
+            $( "#phrValue" ).val( "" );
+            $( "#phrValueAnother1" ).val( "" );
+            $( "#phrValueAnother2" ).val( "" );
+            
+            if( pulseRate.length > 0 ) {
+                $( "#phrType" ).val( "pulseRate" );
                 $( "#phrValue" ).val( pulseRate );
-                $( "#phrValueAnother" ).val( bloodPressure );
-                $( "#phrValueAnother2" ).val( bloodPressure2 );
+            } 
+            
+            if( bloodPressure.length > 0 ) {
+                if( bloodPressure2.length == 0 ){
+                    $( "div.error-msg" ).text( "이완기 혈압을  입력해주세요  (Please enter your diastole blood pressure)" );
+                    flag = false;
+                } else {
+                    $( "#phrValueAnother" ).val( bloodPressure );
+                }
+            }
+            
+            if( bloodPressure2.length > 0 ) {
+                if( bloodPressure.length == 0 ) {
+                    $( "div.error-msg" ).text( "수축기 혈압을 입력해주세요 (Please enter your systolic blood pressure)" );
+                    flag = false;
+                } else {
+                    $( "#phrValueAnother2" ).val( bloodPressure2 );
+                }
+            }
+            
+            if( bloodPressure.length > 0 && bloodPressure2.length > 0 ){
+                $( "#phrTypeAnother" ).val( "bloodPressure" );
+            }
+            
+            if( flag ){
                 form.submit();
             }
+            
         }
     });
 })
@@ -158,12 +199,13 @@ $( function(){
                 
                 <div class="btn_group">
                     <ul>
-                        <li>
-                            <input type="hidden" name="phrType" value="pulseRate">
+                        <li> 
+                            <!-- 맥박 pulseRate -->
+                            <input type="hidden" id="phrType" name="phrType" value="">
                             <input type="hidden" id="phrValue" name="phrValue" value="">
-                            <input type="hidden" id="phrValue2" name="phrValue2" value="">
                             
-                            <input type="hidden" name="phrTypeAnother" value="bloodPressure">
+                            <!-- 혈압 bloodPressure -->
+                            <input type="hidden" id="phrTypeAnother" name="phrTypeAnother" value="">
                             <input type="hidden" id="phrValueAnother" name="phrValueAnother" value="">
                             <input type="hidden" id="phrValueAnother2" name="phrValueAnother2" value="">