Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r33062 -r33699 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 33062) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 33699) @@ -790,16 +790,21 @@ * @param barcode * @return */ - public boolean isTousseUrgent(String barcode){ + public String isTousseUrgent(String barcode){ BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); + boolean isUrgent = false; + JSONObject result = new JSONObject(); if(barcodeDevice instanceof TousseInstance){ - String isUrgent = ((TousseInstance) barcodeDevice).getIsUrgentTousse(); - if(isUrgent != null && isUrgent.equals(TousseDefinition.STR_YES)){ - return true; + TousseInstance ti = (TousseInstance) barcodeDevice; + String isUrgentStr = ti.getIsUrgentTousse(); + if(isUrgentStr != null && isUrgentStr.equals(TousseDefinition.STR_YES)){ + isUrgent = true; } + result.put("urgentLevel", ti.getUrgentLevel()); } - return false; + result.put("isUrgent", isUrgent); + return result.toString(); } /**