Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r16375 -r16392 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16375) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16392) @@ -1186,10 +1186,10 @@ if(dataJSON != null){ String barcode = dataJSON.get("barcode").getAsString(); JSONObject jroutine = invoiceManager.getBiologicalMonitoringInfo(barcode); - String noBiologicalMonitoring = jroutine.getString("noBiologicalMonitoring"); + String noBiologicalMonitoring = jroutine.optString("noBiologicalMonitoring"); // String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult"); - String biologicalMonitoringFail = jroutine.getString("biologicalMonitoringFail"); - String urgentDelivery = jroutine.getString("urgentDelivery"); + String biologicalMonitoringFail = jroutine.optString("biologicalMonitoringFail"); + String urgentDelivery = jroutine.optString("urgentDelivery"); dataJSON.addProperty("noBiologicalMonitoring",StringTools.isNotBlank(noBiologicalMonitoring)); dataJSON.addProperty("unconventional", StringTools.isNotBlank(urgentDelivery)); @@ -1207,10 +1207,10 @@ } } JSONObject jroutine = invoiceManager.getBiologicalMonitoringInfo(StringTools.join(barcodes, ";")); - String noBiologicalMonitoring = jroutine.getString("noBiologicalMonitoring"); + String noBiologicalMonitoring = jroutine.optString("noBiologicalMonitoring"); // String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult"); - String biologicalMonitoringFail = jroutine.getString("biologicalMonitoringFail"); - String urgentDelivery = jroutine.getString("urgentDelivery"); + String biologicalMonitoringFail = jroutine.optString("biologicalMonitoringFail"); + String urgentDelivery = jroutine.optString("urgentDelivery"); for(int i = 0;i < dataJArray.size();++i){ JsonElement je = dataJArray.get(i);