Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r17148 -r17221 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17148) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17221) @@ -1198,6 +1198,7 @@ if(!json.get(JSONUtil.JSON_KEY_SUCCESS).getAsBoolean()){ return json; } + boolean isNeedRoutineMonitoringWarming = false; boolean enabled = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("biologicalMonitoringEnable"),"false")); json.addProperty("biologicalMonitoringEnable", enabled); // if(!enabled){ @@ -1209,6 +1210,7 @@ JsonObject dataJSON = json.getAsJsonObject("data"); if(dataJSON != null){ String barcode = dataJSON.get("barcode").getAsString(); + isNeedRoutineMonitoringWarming = tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode); JSONObject jbarcodeObject = invoiceManager.getBiologicalMonitoringInfo(barcode); if(jbarcodeObject != null){ JSONObject jroutine = jbarcodeObject.optJSONObject(barcode); @@ -1243,6 +1245,7 @@ if(je != null){ JsonObject jobj = je.getAsJsonObject(); String barcode = jobj.get("barcode").getAsString(); + isNeedRoutineMonitoringWarming |= tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode); if(jbarcodeObject != null){ JSONObject jroutine = jbarcodeObject.optJSONObject(barcode); if(jroutine != null){ @@ -1261,6 +1264,7 @@ } } } + json.addProperty("isNeedRoutineMonitoringWarming", isNeedRoutineMonitoringWarming); } return json; }