systolicBloodPressureAlarmYN, diastolicBloodPressureAlarmYN -> highBloodPressureAlarmYN, lowBloodPressureAlarmYN 으로 변경

src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

@@ -25,10 +25,10 @@ public class PatientPHRLatestDTO {
 	private String pulseRateAlarmYN;
 	private Integer systolicBloodPressure;
 	private Date systolicBloodPressureCreateDate;
-	private String systolicBloodPressureAlarmYN;
 	private Integer diastolicBloodPressure;
 	private Date diastolicBloodPressureCreateDate;
-	private String diastolicBloodPressureAlarmYN;
+	private String highBloodPressureAlarmYN;
+	private String lowBloodPressureAlarmYN;
 	private Integer bloodSugar;
 	private Date bloodSugarCreateDate;
 	private String bloodSugarAlarmYN;
@@ -154,13 +154,7 @@ public class PatientPHRLatestDTO {
 	}
 	public Date getSystolicBloodPressureCreateDate() {
 		return systolicBloodPressureCreateDate;
-	}	
-	public String getSystolicBloodPressureAlarmYN() {
-		return systolicBloodPressureAlarmYN;
-	}
-	public void setSystolicBloodPressureAlarmYN(String systolicBloodPressureAlarmYN) {
-		this.systolicBloodPressureAlarmYN = systolicBloodPressureAlarmYN;
-	}
+	}		
 	public Integer getDiastolicBloodPressure() {
 		return diastolicBloodPressure;
 	}
@@ -170,11 +164,17 @@ public class PatientPHRLatestDTO {
 	public Date getDiastolicBloodPressureCreateDate() {
 		return diastolicBloodPressureCreateDate;
 	}	
-	public String getDiastolicBloodPressureAlarmYN() {
-		return diastolicBloodPressureAlarmYN;
+	public String getHighBloodPressureAlarmYN() {
+		return highBloodPressureAlarmYN;
+	}
+	public void setHighBloodPressureAlarmYN(String highBloodPressureAlarmYN) {
+		this.highBloodPressureAlarmYN = highBloodPressureAlarmYN;
+	}
+	public String getLowBloodPressureAlarmYN() {
+		return lowBloodPressureAlarmYN;
 	}
-	public void setDiastolicBloodPressureAlarmYN(String diastolicBloodPressureAlarmYN) {
-		this.diastolicBloodPressureAlarmYN = diastolicBloodPressureAlarmYN;
+	public void setLowBloodPressureAlarmYN(String lowBloodPressureAlarmYN) {
+		this.lowBloodPressureAlarmYN = lowBloodPressureAlarmYN;
 	}
 	public Integer getBloodSugar() {
 		return bloodSugar;

src/main/java/com/lemon/lifecenter/service/PHRService.java

@@ -66,19 +66,22 @@ public class PHRService {
 				phrLatestDTO.setPulseRateAlarmYN(pulseRateAlarmYN);
 				break;
 			case "bloodPressure":
-				String systolicBloodPressureAlarmYN = "N";
-				if (dto.getPhrValue().intValue() <= configurationDTO.getSystolicBloodPressureThresholdMin() || dto.getPhrValue().intValue() >= configurationDTO.getSystolicBloodPressureThresholdMax()) {
-					systolicBloodPressureAlarmYN = "Y";
-				}
 				phrLatestDTO.setSystolicBloodPressure(dto.getPhrValue().intValue());
-				phrLatestDTO.setSystolicBloodPressureAlarmYN(systolicBloodPressureAlarmYN);
+				phrLatestDTO.setDiastolicBloodPressure(dto.getPhrValue2().intValue());
 				
-				String diastolicBloodPressureAlarmY = "N";
-				if (dto.getPhrValue().intValue() <= configurationDTO.getDiastolicBloodPressureThresholdMin() || dto.getPhrValue().intValue() >= configurationDTO.getDiastolicBloodPressureThresholdMax()) {
-					diastolicBloodPressureAlarmY = "Y";
+				String highBloodPressureAlarmYN = "N";
+				if (dto.getPhrValue().intValue() <= configurationDTO.getSystolicBloodPressureThresholdMax() || dto.getPhrValue2().intValue() >= configurationDTO.getDiastolicBloodPressureThresholdMax()) {
+					highBloodPressureAlarmYN = "Y";
 				}
-				phrLatestDTO.setDiastolicBloodPressure(dto.getPhrValue2().intValue());
-				phrLatestDTO.setDiastolicBloodPressureAlarmYN(diastolicBloodPressureAlarmY);
+				
+				phrLatestDTO.setHighBloodPressureAlarmYN(highBloodPressureAlarmYN);
+				
+				String lowBloodPressureAlarmYN = "N";
+				if (dto.getPhrValue().intValue() <= configurationDTO.getSystolicBloodPressureThresholdMin() || dto.getPhrValue2().intValue() >= configurationDTO.getDiastolicBloodPressureThresholdMin()) {
+					lowBloodPressureAlarmYN = "Y";
+				}
+				
+				phrLatestDTO.setLowBloodPressureAlarmYN(lowBloodPressureAlarmYN);
 				break;
 			case "bloodSugar":
 				String bloodSugarAlarmYN = "N";

src/main/resources/mybatis/mapper/patient/patientPHRLatest.xml

@@ -24,12 +24,17 @@
 	    </if>
 	    <if test='systolicBloodPressure != null and systolicBloodPressure != ""'>
 	    <![CDATA[
-   			, systolic_blood_pressure, systolic_blood_pressure_create_date, systolic_blood_alarm_yn
+   			, systolic_blood_pressure, systolic_blood_pressure_create_date, high_blood_pressure_alarm_yn, low_blood_pressure_alarm_yn
 	    ]]>
 	    </if>
 	    <if test='diastolicBloodPressure != null and diastolicBloodPressure != ""'>
 	    <![CDATA[
-   			, diastolic_blood_pressure, diastolic_blood_pressure_create_date, diastolic_blood_pressure_alarm_yn
+   			, diastolic_blood_pressure, diastolic_blood_pressure_create_date
+	    ]]>
+	    </if>
+	    <if test='(systolicBloodPressure != null and systolicBloodPressure != "") or (diastolicBloodPressure != null and diastolicBloodPressure != "")'>
+	    <![CDATA[
+   			, high_blood_pressure_alarm_yn, low_blood_pressure_alarm_yn
 	    ]]>
 	    </if>
 	    <if test='bloodSugar != null and bloodSugar != ""'>
@@ -64,12 +69,12 @@
 	    </if>
 	    <if test='systolicBloodPressure != null and systolicBloodPressure != ""'>
 	    <![CDATA[
-   			, #{systolicBloodPressure}, NOW(), #{systolicBloodPressureAlarmYN}
+   			, #{systolicBloodPressure}, NOW(), #{highBloodPressureAlarmYN}, #{lowBloodPressureAlarmYN}
 	    ]]>
 	    </if>
 	    <if test='diastolicBloodPressure != null and diastolicBloodPressure != ""'>
 	    <![CDATA[
-   			, #{diastolicBloodPressure}, NOW(), #{diastolicBloodPressureAlarmYN}
+   			, #{diastolicBloodPressure}, NOW()
 	    ]]>
 	    </if>
 	    <if test='bloodSugar != null and bloodSugar != ""'>
@@ -104,12 +109,17 @@
 	    </if>
 	    <if test='systolicBloodPressure != null and systolicBloodPressure != ""'>
 	    <![CDATA[
-   			, systolic_blood_pressure = #{systolicBloodPressure}, systolic_blood_pressure_create_date = NOW(), systolic_blood_alarm_yn = #{systolicBloodPressureAlarmYN}
+   			, systolic_blood_pressure = #{systolicBloodPressure}, systolic_blood_pressure_create_date = NOW()
 	    ]]>
 	    </if>
 	    <if test='diastolicBloodPressure != null and diastolicBloodPressure != ""'>
 	    <![CDATA[
-   			, diastolic_blood_pressure = #{diastolicBloodPressure}, diastolic_blood_pressure_create_date = NOW(), diastolic_blood_pressure_alarm_yn = #{diastolicBloodPressureAlarmYN}
+   			, diastolic_blood_pressure = #{diastolicBloodPressure}, diastolic_blood_pressure_create_date = NOW()
+	    ]]>
+	    </if>
+	    <if test='(systolicBloodPressure != null and systolicBloodPressure != "") or (diastolicBloodPressure != null and diastolicBloodPressure != "")'>
+	    <![CDATA[
+   			, high_blood_alarm_yn = #{highBloodPressureAlarmYN}, low_blood_pressure_alarm_yn = #{lowBloodPressureAlarmYN}
 	    ]]>
 	    </if>
 	    <if test='bloodSugar != null and bloodSugar != ""'>
@@ -155,11 +165,11 @@
 	    		p.pulse_rate_create_date				AS pulseRateCreateDate,
 	    		p.pulse_rate_alarm_yn					AS pulseRateAlarmYN,
 	    		p.systolic_blood_pressure				AS systolicBloodPressure,
-	    		p.systolic_blood_pressure_create_date	AS systolicBloodPressureCreateDate,	    	
-    			p.systolic_blood_pressure_alarm_yn		AS systolicBloodPressureAlarmYN,
+	    		p.systolic_blood_pressure_create_date	AS systolicBloodPressureCreateDate,	    
    				p.diastolic_blood_pressure				AS diastolicBloodPressure,
     			p.diastolic_blood_pressure_create_date	AS diastolicBloodPressureCreateDate,
-    			p.diastolic_blood_pressure_alarm_yn		AS diastolicBloodPressureAlarmYN,
+    			p.high_blood_pressure_alarm_yn			AS highBloodPressureAlarmYN,
+    			p.low_blood_pressure_alarm_yn			AS lowBloodPressureAlarmYN,
     			p.blood_sugar							AS bloodSugar,
 	    		p.blood_sugar_create_date				AS bloodSugarCreateDate,
 	    		p.blood_sugar_alarm_yn					AS bloodSugarAlarmYN,
@@ -181,7 +191,7 @@
 	                </when>
 	         		<when test="filter == 'alarm'" >
 	         		<![CDATA[
-	         			p.temperature_alarm_yn = 'Y' OR oxygen_saturation_alarm_yn = 'Y' OR pulse_rate_alarm_yn = 'Y' OR systolic_blood_pressure_alarm_yn = 'Y' OR diastolic_blood_pressure_alarm_yn = 'Y' OR blood_sugar_alarm_yn = 'Y'
+	         			p.temperature_alarm_yn = 'Y' OR oxygen_saturation_alarm_yn = 'Y' OR pulse_rate_alarm_yn = 'Y' OR high_blood_pressure_alarm_yn = 'Y' OR low_blood_pressure_alarm_yn = 'Y' OR blood_sugar_alarm_yn = 'Y'
 	                ]]>
 	                </when>
 	                <when test="filter == 'temperatureBlank' and timeCriterion == 'AM'" >