Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java =================================================================== diff -u -r30920 -r30929 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java (.../SterisAMSCO3052DataManagerImpl.java) (revision 30920) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java (.../SterisAMSCO3052DataManagerImpl.java) (revision 30929) @@ -288,7 +288,7 @@ // 重复行,不解析 continue; } - line = line.replace("℃", ""); + //line = line.replace("℃", ""); preLine = line; if(line.contains("CYCLE NAME:")){ // 程序名称 @@ -442,9 +442,13 @@ } Map translateMap = new HashMap(); translateMap.put("Instrument", "器械"); + translateMap.put("HIGH", "高速"); String cycleName = washDataOfSteris.getCycleName(); String tCycleName = translateMap.get(cycleName); + String pumpSpeed = washDataOfSteris.getPumpSpeed(); + String tPumpSpeed = translateMap.get(pumpSpeed); washDataOfSteris.setCycleName(tCycleName == null ? cycleName : tCycleName); + washDataOfSteris.setPumpSpeed(tPumpSpeed == null ? pumpSpeed : tPumpSpeed); } /** @@ -469,8 +473,8 @@ translateMap.put("CHEMICAL USED", "耗品泵:"); translateMap.put("THERMAL RINSE TYPE", "热漂洗类型:"); - translateMap.put("Ao BASED", "AO值:"); - translateMap.put("Ao VALUE", "AO值:"); + translateMap.put("Ao BASED", "Ao值"); + translateMap.put("Ao VALUE", "Ao值:"); translateMap.put("ENZYME RINSE 1 START", "酶漂洗1开始:"); translateMap.put("WASH 1 START", "清洗1开始:"); @@ -488,6 +492,7 @@ translateMap.put("PURE WATER", "纯水"); translateMap.put("Instrument", "器械"); + translateMap.put("Pump", "泵"); for (WashDataItemOfSteris washDataItemOfSteris : washDataItemOfSterisList) { String proces = washDataItemOfSteris.getProces(); @@ -501,7 +506,10 @@ String tKey = translateMap.get(key); String value = (String) pJson.get(key); String tValue = translateMap.get(value); - json.put(tKey, tValue == null ? value : tValue); + if(value != null && value.contains("Pump")){ + value = value.replace("Pump", "泵"); + } + json.put(tKey == null ? key : tKey, tValue == null ? value : tValue); } washDataItemOfSteris.setParameter(json.toString()); }