Merge remote-tracking branch 'origin/simplatform'

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

@@ -156,13 +156,65 @@ $(document).ready(function() {
       "bloodSugarMax" : parseInt($("#bloodSugarThresholdMax").val(), 10)
     }
 
-    for (const [key, value] of Object.entries(checkValue)) {
-      var errorMessage = (checkValidForPhrData(key, value));
-      if (errorMessage != null) {
-        alert(errorMessage);
-        return;
-      }
+    var errorMessage = (checkValidForPhrData("temperature", parseFloat($("#temperatureThreshold").val())));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("bloodPressureSystolicMin", parseInt($("#systolicBloodPressureThresholdMin").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("bloodPressureSystolicMax", parseInt($("#systolicBloodPressureThresholdMax").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("bloodPressureDiastolicMin", parseInt($("#diastolicBloodPressureThresholdMin").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("bloodPressureDiastolicMax", parseInt($("#diastolicBloodPressureThresholdMax").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("pulseRateMin", parseInt($("#pulseRateThresholdMin").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("pulseRateMax", parseInt($("#pulseRateThresholdMax").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("oxygenSaturation", parseInt($("#oxygenSaturationThreshold").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
     }
+    errorMessage = (checkValidForPhrData("bloodSugarMin", parseInt($("#bloodSugarThresholdMin").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    errorMessage = (checkValidForPhrData("bloodSugarMax", parseInt($("#bloodSugarThresholdMax").val(), 10)));
+    if (errorMessage != null) {
+      alert(errorMessage);
+      return;
+    }
+    
+
+    // for (const [key, value] of Object.entries(checkValue)) {
+    //   var errorMessage = (checkValidForPhrData(key, value));
+    //   if (errorMessage != null) {
+    //     alert(errorMessage);
+    //     return;
+    //   }
+    // }
 
 
     const result = confirm("알람 표시 설정을 변경하신 값으로 설정합니다.\n\n설정값의 알람 적용은 현재시간 이후로 수집되는 데이터에 한하여 적용되오니 참고하시기 바랍니다.");