Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r41485 -r41490 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41485) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41490) @@ -9730,17 +9730,18 @@ } /** - * 灭菌炉的的炉次 + * 灭菌炉基本信息及炉次 * @param params * @return */ - public String getMaxFrequency(JSONObject params){ + public String getSterilizerAndMaxFrequency(JSONObject params){ String sterilizerName = params.optString("sterilizerName"); Sterilizer sterilizer = sterilizerManager.getSterilizerByName(sterilizerName); Long sterilizationRecordId = params.optLong("sterilizationRecordId",0L); int maxFrequency = sterilizationRecordManager.getMaxFrequency(sterilizer, sterilizationRecordId); JSONObject result = JSONUtil.buildJsonObject(true); JSONUtil.addProperty(result , "maxFrequency", maxFrequency); + JSONUtil.addProperty(result , "sterilizer", JSONUtil.toJsonObjecttWithSimpleProperty(sterilizer)); return result.toString(); }