[진료관리] 버그 수정.

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

@@ -108,21 +108,21 @@ public class PHRService {
 
       List<PatientPHRHistoryDTO> phrList = mapperHistory.selectPHRHistoryList(dto);
       for (PatientPHRHistoryDTO phrData: phrList) {
-        if (phrData.getPhrType() == "temperature") {
+        if (phrData.getPhrType().equals("temperature")) {
           phrData.setIsWarning(phrData.getPhrValue() >= configDto.getTemperatureThreshold());
         }
-        else if (phrData.getPhrType() == "bloodPressure") {
+        else if (phrData.getPhrType().equals("bloodPressure")) {
           boolean highBP = phrData.getPhrValue() >= configDto.getSystolicBloodPressureThresholdMax() || phrData.getPhrValue2() >= configDto.getDiastolicBloodPressureThresholdMax();
           boolean lowBP = phrData.getPhrValue() <= configDto.getSystolicBloodPressureThresholdMin() || phrData.getPhrValue2() <= configDto.getDiastolicBloodPressureThresholdMin();
           phrData.setIsWarning(highBP || lowBP);
         }
-        else if (phrData.getPhrType() == "pulseRate") {
+        else if (phrData.getPhrType().equals("pulseRate")) {
           phrData.setIsWarning(phrData.getPhrValue() <= configDto.getPulseRateThresholdMin() || phrData.getPhrValue() >= configDto.getPulseRateThresholdMax());
         }
-        else if (phrData.getPhrType() == "oxygenSaturation") {
+        else if (phrData.getPhrType().equals("oxygenSaturation")) {
           phrData.setIsWarning(phrData.getPhrValue() <= configDto.getOxygenSaturationThreshold());
         }
-        else if (phrData.getPhrType() == "bloodSugar") {
+        else if (phrData.getPhrType().equals("bloodSugar")) {
           phrData.setIsWarning(phrData.getPhrValue() <= configDto.getBloodSugarThresholdMin() || phrData.getPhrValue() >= configDto.getBloodSugarThresholdMax());
         }
       }

src/main/resources/mybatis/mapper/center/clinicConfiguration.xml

@@ -92,7 +92,7 @@
 				c.blood_sugar_threshold_max					AS bloodSugarThresholdMax
 		FROM clinic_configuration c, patient_care p
 		WHERE 
-			p.patient_idx = #{patientIdx)
+			p.patient_idx = #{patientIdx}
 		AND
 			c.center_code = p.center_code
 	]]>

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

@@ -19,42 +19,32 @@ var PHR_VALUE_DEFAULT = {
 	TEMPERATURE: {
 		VALUE: "",
 		MIN: 20,
-    MAX: 50,
-    THRESHOLD: <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 50
 	},
 	BLOOD_PRESSURE_SYSTOLIC: {
 		VALUE: "",
 		MIN: 50,
-    MAX: 250,
-    THRESHOLDMIN: <c:out value="${config.temperatureThreshold}" default="37.5" />
-    THRESHOLDMAX: <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 250
 	},
 	BLOOD_PRESSURE_DIASTOLIC: {
 		VALUE: "",
 		MIN: 20,
-    MAX: 160,
-    THRESHOLDMIN: <c:out value="${config.temperatureThreshold}" default="37.5" />
-    THRESHOLDMAX: <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 160
 	},
 	OXYGEN_SATURATION: {
 		VALUE: "",
 		MIN: 60,
-    MAX: 100,
-    <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 100
 	},
 	PULSE_RATE: {
 		VALUE: "",
 		MIN: 30,
-    MAX: 200,
-    THRESHOLDMIN: <c:out value="${config.temperatureThreshold}" default="37.5" />
-    THRESHOLDMAX: <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 200
 	},
 	BLOOD_SUGAR: {
 		VALUE: "",
 		MIN: 10,
-    MAX: 600,
-    THRESHOLDMIN: <c:out value="${config.temperatureThreshold}" default="37.5" />
-    THRESHOLDMAX: <c:out value="${config.temperatureThreshold}" default="37.5" />
+    MAX: 600
 	}
 }
 
@@ -1168,31 +1158,31 @@ $(document).ready(function() {
 					<ul class="legend">
 						<li class="row fever">
 							<div class="col-lg-4">체온</div>
-							<div class="col-lg-8">37.5 이상</div>
+							<div class="col-lg-8"><c:out value="${config.temperatureThreshold}" /> 이상</div>
 						</li>
 						<li class="row bloodPressure">
 							<div class="col-lg-4">고혈압</div>
-							<div class="col-lg-8">수축기 149 이상<br>이완기 99 이상</div>
+							<div class="col-lg-8">수축기 <c:out value="${config.systolicBloodPressureThresholdMax}" /> 이상<br>이완기 <c:out value="${config.diastolicBloodPressureThresholdMax}" /> 이상</div>
 						</li>
 						<li class="row bloodPressure">
 							<div class="col-lg-4">저혈압</div>
-							<div class="col-lg-8">수축기 90 이하<br>이완기 60 이하</div>
+							<div class="col-lg-8">수축기 <c:out value="${config.systolicBloodPressureThresholdMin}" /> 이하<br>이완기 <c:out value="${config.diastolicBloodPressureThresholdMin}" /> 이하</div>
 						</li>
-						<li class="row pulse">
+            <li class="row pulse">
 							<div class="col-lg-4">맥박</div>
-							<div class="col-lg-8">최저 55 이하<br>최고 110 이상</div>
+							<div class="col-lg-8">최저 <c:out value="${config.pulseRateThresholdMin}" /> 이하<br>최고 <c:out value="${config.pulseRateThresholdMax}" /> 이상</div>
 						</li>
-            <li class="row oxygen">
+						<li class="row oxygen">
 							<div class="col-lg-4">산소포화도</div>
-							<div class="col-lg-8">94% 이하</div>
+							<div class="col-lg-8"><c:out value="${config.oxygenSaturationThreshold}" />% 이하</div>
 						</li>
 						<li class="row sugar">
 							<div class="col-lg-4">고혈당</div>
-							<div class="col-lg-8">200 이상</div>
+							<div class="col-lg-8"><c:out value="${config.bloodSugarThresholdMax}" /> 이상</div>
 						</li>
 						<li class="row sugar">
 							<div class="col-lg-4">저혈당</div>
-							<div class="col-lg-8">70 이하 </div>
+							<div class="col-lg-8"><c:out value="${config.bloodSugarThresholdMin}" /> 이하</div>
 						</li>
 					</ul>
 				</div>

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

@@ -203,12 +203,22 @@ function retrieveStateData(page, needInitPagination) {
 								html += '			</div>';
 								html += '		</div>';
 								html += '   <div class="stats '+danger+'">';
-								html += '			<ul>';
-								html += '				<li class="fever '+temperatureStep+' '+temperatureCheck+'">'+temperature+'</li>';
-								html += '				<li class="bloodPressure '+bloodPressureStep+' '+bloodPressureCheck+'">'+bloodPressure+'</li>';
+                html += '			<ul>';
+                if ("<c:out value="${config.temperatureDisplayYN}" />" === "Y" ) {
+                html += '				<li class="fever '+temperatureStep+' '+temperatureCheck+'">'+temperature+'</li>';
+                }
+                if ("<c:out value="${config.bloodPressureDisplayYN}" />" === "Y" ) {
+                html += '				<li class="bloodPressure '+bloodPressureStep+' '+bloodPressureCheck+'">'+bloodPressure+'</li>';
+                }
+                if ("<c:out value="${config.pulseRateDisplayYN}" />" === "Y" ) {
                 html += '				<li class="pulse '+pulseRateStep+' '+pulseRateCheck+'">'+pulseRate+'</li>';
+                }
+                if ("<c:out value="${config.oxygenSaturationDisplayYN}" />" === "Y" ) {
                 html += '				<li class="oxygen '+oxygenSaturationStep+' '+oxygenSaturationCheck+'">'+oxygenSaturation+'</li>';
-								html += '				<li class="sugar '+bloodSugarStep+' '+bloodSugarCheck+'">'+bloodSugar+'</li>';
+                }
+                if ("<c:out value="${config.bloodSugarDisplayYN}" />" === "Y" ) {
+                html += '				<li class="sugar '+bloodSugarStep+' '+bloodSugarCheck+'">'+bloodSugar+'</li>';
+                }
 								html += '			</ul>';
 								html += '		</div>';
 								html += '	</div>';