瀏覽代碼

[진료관리] 대시보드 알람 표시 로직 변경.

sjpark 4 年之前
父節點
當前提交
fc3679c141
共有 1 個文件被更改,包括 17 次插入12 次删除
  1. 17 12
      src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

+ 17 - 12
src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

@@ -269,32 +269,37 @@ public class PatientPHRLatestDTO {
 		return needCheckValue(this.bloodSugarCreateDate);
 	}
 	public boolean getIsTemperatureWarning() {
-		if (this.temperature == null) return false;
+		// if (this.temperature == null) return false;
 		
-		return this.temperature >= 37.5;
+		// return this.temperature >= 37.5;
+    return this.temperatureAlarmYN == "Y";
 	}
 	public boolean getIsBloodPressureWarning() {
-		if (this.systolicBloodPressure == null || this.diastolicBloodPressure == null) return false;
+		// if (this.systolicBloodPressure == null || this.diastolicBloodPressure == null) return false;
 		
-		boolean highBP = this.systolicBloodPressure >= 149 || this.diastolicBloodPressure >= 99;
-		boolean lowBP = this.systolicBloodPressure <= 90 || this.diastolicBloodPressure <= 60;
+		// boolean highBP = this.systolicBloodPressure >= 149 || this.diastolicBloodPressure >= 99;
+		// boolean lowBP = this.systolicBloodPressure <= 90 || this.diastolicBloodPressure <= 60;
 		
-		return highBP || lowBP;
+		// return highBP || lowBP;
+    return this.systolicBloodPressureAlarmYN == "Y" || this.diastolicBloodPressureAlarmYN == "Y";
 	}
   public boolean getIsPulseRateWarning() {
-		if (this.pulseRate == null) return false;
+		// if (this.pulseRate == null) return false;
 		
-		return this.pulseRate <= 55 || this.pulseRate >= 110;
+		// return this.pulseRate <= 55 || this.pulseRate >= 110;
+    return this.pulseRateAlarmYN == "Y";
 	}
 	public boolean getIsOxygenSaturationeWarning() {
-		if (this.oxygenSaturation == null) return false;
+		// if (this.oxygenSaturation == null) return false;
 		
-		return this.oxygenSaturation <= 94;
+		// return this.oxygenSaturation <= 94;
+    return this.oxygenSaturationAlarmYN == "Y";
 	}
   public boolean getIsBloodSugarWarning() {
-		if (this.bloodSugar == null) return false;
+		// if (this.bloodSugar == null) return false;
 		
-		return this.bloodSugar <= 70 || this.bloodSugar >= 200;
+		// return this.bloodSugar <= 70 || this.bloodSugar >= 200;
+    return this.bloodSugarAlarmYN == "Y";
 	}
 	public boolean getHasTodaySymptom() {
 		boolean ret = false;