|
|
@@ -79,7 +79,7 @@ function retrieveStateData(page) {
|
|
|
html += '<div class="col-lg-2 col-md-6 mb-4">';
|
|
|
html += ' <div class="patients-stats" data-url="./info?patientIdx='+d.patientIdx+'">';
|
|
|
html += ' <div class="name">';
|
|
|
- html += ' '+d.wardNumber+'/'+d.roomNumber+'('+d.patientName+')';
|
|
|
+ html += ' '+(d.wardNumber !== "" ? d.wardNumber+'/' : '')+d.roomNumber+'('+d.patientName+')';
|
|
|
html += ' <div class="check">';
|
|
|
html += ' <ul>';
|
|
|
if (d.memoCount > 0) {
|
|
|
@@ -318,7 +318,7 @@ $(document).ready(function() {
|
|
|
</c:when>
|
|
|
<c:otherwise>
|
|
|
<c:forEach var="patient" items="${items}" varStatus="status">
|
|
|
- <c:set var="title" value="${patient.wardNumber}/${patient.roomNumber}(${patient.patientName})" />
|
|
|
+ <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="bloodPressureStep" value="${patient.isBloodPressureWarning ? 'step_two' : 'step_one'}" />
|
sjpark