[진료관리 - 상세] 혈압/맥박 둘 중 하나만 추가하더라도 입력 가능하게 수정.

(cherry picked from commit b7d392c21cb92025c41afe16acb72c82ec1e5170)

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

@@ -175,38 +175,65 @@ function handlePhrData() {
   var phrType = $('#healthInfo').attr("data-phr-type");
 	var phrValue = "";
 	if (phrType === "bloodPressure") {
-		phrValueSystolic = $("#phrValueSystolic").val();
-		phrValueDiastolic = $("#phrValueDiastolic").val();
-    phrValuePulseRate = $("#phrValuePulseRate").val();
+		var phrValueSystolic = $("#phrValueSystolic").val();
+		var phrValueDiastolic = $("#phrValueDiastolic").val();
+    var phrValuePulseRate = $("#phrValuePulseRate").val();
+    const recordedDate = $("#eventDateTime1").val() === "" ? null : $("#eventDateTime1").val();
 
 		// 유효성 체크
-		var errorMessage = checkValidForPhrData("bloodPressureSystolic", phrValueSystolic);
-		if (errorMessage) {
-			alert(errorMessage);
+		var errorMessage1 = checkValidForPhrData("bloodPressureSystolic", phrValueSystolic);
+
+		var errorMessage2 = checkValidForPhrData("bloodPressureDiastolic", phrValueDiastolic);
+    
+    var errorMessage3 = checkValidForPhrData("pulseRate", phrValuePulseRate);
+
+    // 수축기 F 이완기 S
+    if (errorMessage1 && !errorMessage2) {
+      alert(errorMessage1);
 			$("#phrValueSystolic").focus();
 			return;
-		}
-
-		errorMessage = checkValidForPhrData("bloodPressureDiastolic", phrValueDiastolic);
-		if (errorMessage) {
-			alert(errorMessage);
+    }
+    // 수축기 S 이완기 F
+    else if (!errorMessage1 && errorMessage2) {
+      alert(errorMessage2);
 			$("#phrValueDiastolic").focus();
 			return;
     }
-    
-    errorMessage = checkValidForPhrData("pulseRate", phrValuePulseRate);
-		if (errorMessage) {
-			alert(errorMessage);
-			$("#phrValuePulseRate").focus();
-			return;
-		}
-
-    // 저장 진행
-    const recordedDate = $("#eventDateTime1").val() === "" ? null : $("#eventDateTime1").val();
-    createPhrData(mPatientIdx, "bloodPressure", recordedDate, phrValueSystolic, phrValueDiastolic, phrValuePulseRate);
+    // 수축기 F 이완기 F
+    else if (errorMessage1 && errorMessage2) {
+      // 맥박 F
+      if (errorMessage3) {
+        alert(errorMessage1);
+			  $("#phrValueSystolic").focus();
+			  return;
+      }
+      // 맥박 S
+      else {
+        // 맥박만 저장
+        createPhrData(mPatientIdx, "pulseRate", recordedDate, phrValuePulseRate);
+      }
+    }
+    // 수축기 S 이완기 S
+    else if (!errorMessage1 && !errorMessage2) {
+      // 맥박 F
+      if (errorMessage3) {
+        // alert(errorMessage3);
+			  // $("#phrValuePulseRate").focus();
+			  // return;
+
+        // 혈압만 저장
+        createPhrData(mPatientIdx, "bloodPressure", recordedDate, phrValueSystolic, phrValueDiastolic);
+      }
+      // 맥박 S
+      else {
+        // 혈압, 매박 모두 저장
+        createPhrData(mPatientIdx, "bloodPressure", recordedDate, phrValueSystolic, phrValueDiastolic, phrValuePulseRate);
+      }
+    }
 
 		$("#phrValueSystolic").val(PHR_VALUE_DEFAULT.BLOOD_PRESSURE_SYSTOLIC.VALUE);
 		$("#phrValueDiastolic").val(PHR_VALUE_DEFAULT.BLOOD_PRESSURE_DIASTOLIC.VALUE);
+    $("#phrValuePulseRate").val(PHR_VALUE_DEFAULT.PULSE_RATE.VALUE);
 	}
 	else {
 		phrValue = $("#phrValue").val();
@@ -251,7 +278,7 @@ function createPhrData(patientIdx, phrType, recordedDate, phrValue, phrValue2, p
         dataType : "json",
         success  : function( datas ){
 
-            retrievePhrData(phrType);
+            retrievePhrData(phrType === "pulseRate" ? "bloodPressure" : phrType);
         },
         error : ajaxErrorHandler
     }).done( function(){