Revert "Revert "[진료관리] 대시보드 표시 항목 추가 (맥박, 혈당)""

This reverts commit dd8c400aacb5c0209cbe7c0b6e102dd59724a386.

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

@@ -259,9 +259,15 @@ public class PatientPHRLatestDTO {
 	public boolean getNeedBloodPressCheck() {
 		return needCheckValue(this.systolicBloodPressureCreateDate) || needCheckValue(this.diastolicBloodPressureCreateDate);
 	}
+  public boolean getNeedPulseRateCheck() {
+		return needCheckValue(this.pulseRateCreateDate);
+	}
 	public boolean getNeedOxygenSaturationCheck() {
 		return needCheckValue(this.oxygenSaturationCreateDate);
 	}
+  public boolean getNeedBloodSugarCheck() {
+		return needCheckValue(this.bloodSugarCreateDate);
+	}
 	public boolean getIsTemperatureWarning() {
 		if (this.temperature == null) return false;
 		
@@ -275,11 +281,21 @@ public class PatientPHRLatestDTO {
 		
 		return highBP || lowBP;
 	}
+  public boolean getIsPulseRateWarning() {
+		if (this.pulseRate == null) return false;
+		
+		return this.pulseRate <= 55 || this.pulseRate >= 110;
+	}
 	public boolean getIsOxygenSaturationeWarning() {
 		if (this.oxygenSaturation == null) return false;
 		
 		return this.oxygenSaturation <= 94;
 	}
+  public boolean getIsBloodSugarWarning() {
+		if (this.bloodSugar == null) return false;
+		
+		return this.bloodSugar <= 70 || this.bloodSugar >= 200;
+	}
 	public boolean getHasTodaySymptom() {
 		boolean ret = false;
 		Calendar todayCalendar = Calendar.getInstance();

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

@@ -165,18 +165,28 @@ function retrieveStateData(page, needInitPagination) {
 							html = "";
 							result.items.forEach(function(d) {
 								var danger = (d.isTemperatureWarning || d.isBloodPressureWarning || d.isOxygenSaturationeWarning) ? "danger" : "";
-								var temperatureStep = d.isTemperatureWarning ? "step_two" : "step_one";
-								var bloodPressureStep = d.isBloodPressureWarning ? "step_two" : "step_one";
-								var oxygenSaturationStep = d.isOxygenSaturationeWarning ? "step_two" : "step_one";
-								var temperatureCheck = d.needTemperatureCheck ? "timeover" : "";
-								var bloodPressureCheck = d.needBloodPressCheck ? "timeover" : "";
+                
+                var temperatureStep = d.isTemperatureWarning ? "step_two" : "step_one";
+                var bloodPressureStep = d.isBloodPressureWarning ? "step_two" : "step_one";
+                var pulseRateStep = d.isPulseRateWarning ? "step_two" : "step_one";
+                var oxygenSaturationStep = d.isOxygenSaturationeWarning ? "step_two" : "step_one";
+                var bloodSugarStep = d.isBloodSugarWarning ? "step_two" : "step_one";
+                
+                var temperatureCheck = d.needTemperatureCheck ? "timeover" : "";
+                var bloodPressureCheck = d.needBloodPressCheck ? "timeover" : "";
+                var pulseRateCheck = d.needPulseRateCheck ? "timeover" : "";
                 var oxygenSaturationCheck = d.needOxygenSaturationCheck ? "timeover" : "";
+                var bloodSugarCheck = d.needBloodSugarCheck ? "timeover" : "";
+                
                 var todayIn = d.todayHospitalizationYN === "Y" ? "new" : "";
 								
 								var temperature = d.temperature ? parseFloat(d.temperature).toFixed(1) : "--";
 								temperature += ' ℃ ';
-								var bloodPressure = (d.bloodPressureDisplay) + " ";
-								var oxygenSaturation = (d.oxygenSaturation || "--") + " % ";
+                var bloodPressure = (d.bloodPressureDisplay) + " ";
+                var pulseRate = (d.pulseRate || "--") + " ";
+                var oxygenSaturation = (d.oxygenSaturation || "--") + " % ";
+                var bloodSugar = (d.bloodSugar || "--") + " ";
+                
 								html += '<li class="col-lg-2 col-md-6 mb-4">';
 								html += '	<div class="patients-stats '+todayIn+'" data-url="./info?patientIdx='+d.patientIdx+'">';
 								html += '		<div class="name">';
@@ -196,7 +206,9 @@ function retrieveStateData(page, needInitPagination) {
 								html += '			<ul>';
 								html += '				<li class="fever '+temperatureStep+' '+temperatureCheck+'">'+temperature+'</li>';
 								html += '				<li class="bloodPressure '+bloodPressureStep+' '+bloodPressureCheck+'">'+bloodPressure+'</li>';
-								html += '				<li class="oxygen '+oxygenSaturationStep+' '+oxygenSaturationCheck+'">'+oxygenSaturation+'</li>';
+                html += '				<li class="pulse '+pulseRateStep+' '+pulseRateCheck+'">'+pulseRate+'</li>';
+                html += '				<li class="oxygen '+oxygenSaturationStep+' '+oxygenSaturationCheck+'">'+oxygenSaturation+'</li>';
+								html += '				<li class="sugar '+bloodSugarStep+' '+bloodSugarCheck+'">'+bloodSugar+'</li>';
 								html += '			</ul>';
 								html += '		</div>';
 								html += '	</div>';
@@ -578,12 +590,19 @@ $(document).ready(function() {
 										<c:forEach var="patient" items="${items}" varStatus="status">
 											<c:set var="title" value="${patient.wardNumber != '' ? patient.wardNumber : ''}${patient.wardNumber != '' ? '/' : ''}${patient.roomNumber}(${patient.patientName})" />
 											<c:set var="viewLink" value="./info?patientIdx=${patient.patientIdx}" />
-											<c:set var="temperatureStep" value="${patient.isTemperatureWarning ? 'step_two' : 'step_one'}" />
+											
+                      <c:set var="temperatureStep" value="${patient.isTemperatureWarning ? 'step_two' : 'step_one'}" />
 											<c:set var="bloodPressureStep" value="${patient.isBloodPressureWarning ? 'step_two' : 'step_one'}" />
+                      <c:set var="pulseRateStep" value="${patient.isPulseRateWarning ? 'step_two' : 'step_one'}" />
 											<c:set var="oxygenSaturationStep" value="${patient.isOxygenSaturationeWarning ? 'step_two' : 'step_one'}" />
-											<c:set var="temperatureCheck" value="${patient.needTemperatureCheck ? 'timeover' : ''}" />
+                      <c:set var="bloddSugarStep" value="${patient.isBloodSugarWarning ? 'step_two' : 'step_one'}" />
+											
+                      <c:set var="temperatureCheck" value="${patient.needTemperatureCheck ? 'timeover' : ''}" />
 											<c:set var="bloodPressureCheck" value="${patient.needBloodPressCheck ? 'timeover' : ''}" />
+                      <c:set var="pulseRateCheck" value="${patient.needPulseRateCheck ? 'timeover' : ''}" />
 											<c:set var="oxygenSaturationCheck" value="${patient.needOxygenSaturationCheck ? 'timeover' : ''}" />
+                      <c:set var="bloodSugarCheck" value="${patient.needBloodSugarCheck ? 'timeover' : ''}" />
+                      
                       <c:set var="todayIn" value='${patient.todayHospitalizationYN == "Y" ? "new" : ""}' />
 											<li class="col-lg-2 col-md-4 mb-4">
 												<div class="patients-stats ${todayIn}" data-url="${viewLink}">
@@ -604,7 +623,9 @@ $(document).ready(function() {
 														<ul>
 															<li class="fever ${temperatureStep} ${temperatureCheck}"><c:out value="${patient.temperature != null ? patient.temperature : '--'} ℃ " /></li>
 															<li class="bloodPressure ${bloodPressureStep} ${bloodPressureCheck}"><c:out value='${patient.bloodPressureDisplay} ' /></li>
+                              <li class="pulse ${pulseRateStep} ${pulseRateCheck}"><c:out value="${patient.pulseRate != null ? patient.pulseRate : '--'}" /></li>
 															<li class="oxygen ${oxygenSaturationStep} ${oxygenSaturationCheck}"><c:out value="${patient.oxygenSaturation != null ? patient.oxygenSaturation : '--'} %" />
+                              <li class="sugar ${bloddSugarStep} ${bloodSugarCheck}"><c:out value="${patient.bloodSugar != null ? patient.bloodSugar : '--'}" /></li>
 														</ul>
 													</div>
 												</div>