Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r14965 -r14973 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14965) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14973) @@ -302,18 +302,22 @@ e.printStackTrace(); } } - + /** + * 获取灭菌程序名称,包括灭菌目的 + */ public void getSterilizerTypeAndSterilizationPurpose() { List list = barcodeManager.getSterilizationType(); String sterilizerName = StrutsParamUtils.getPraramValue( "sterilizerName", ""); - StringBuffer buffer = new StringBuffer(); boolean isSterilizationRecordModel = "sterilizationRecord" .equals(StrutsParamUtils.getPraramValue("type", "")); + JSONArray jsonArray = new JSONArray(); if (!isSterilizationRecordModel) { - JSONObject obj = new JSONObject(); - - buffer.append("['0','无',''],"); + JSONArray arryObj = new JSONArray(); + arryObj.add('0'); + arryObj.add('无'); + arryObj.add(""); + jsonArray.add(arryObj); } if (StringUtils.isNotBlank(sterilizerName)) { Sterilizer sterilizer = sterilizerManager @@ -325,12 +329,11 @@ if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ purpose = "("+sterilisation.getSterilizationPurpose()+")"; } - buffer.append("['").append(sterilisation.getId()) - .append("','") - .append(sterilisation.getSterilisation()) - .append("','") - .append(sterilisation.getSterilisation()+purpose) - .append("'],"); + JSONArray arryObj = new JSONArray(); + arryObj.add(sterilisation.getId()); + arryObj.add(sterilisation.getSterilisation()); + arryObj.add(sterilisation.getSterilisation()+purpose); + jsonArray.add(arryObj); } } } else { @@ -343,24 +346,24 @@ if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ purpose = "("+sterilisation.getSterilizationPurpose()+")"; } - buffer.append("['").append(sterilisation.getId()) - .append("','") - .append(sterilisation.getSterilisation()) - .append("','") - .append(sterilisation.getSterilisation()+purpose) - .append("'],"); + JSONArray arryObj = new JSONArray(); + arryObj.add(sterilisation.getId()); + arryObj.add(sterilisation.getSterilisation()); + arryObj.add(sterilisation.getSterilisation()+purpose); + jsonArray.add(arryObj); } } } } + String result = ""; - if (buffer.length() > 0) { - result = buffer.substring(0, buffer.length() - 1); + if(jsonArray.size() > 0){ + result = jsonArray.toString(); } HttpServletResponse response = StrutsParamUtils.getResponse(); try { response.setCharacterEncoding("utf-8"); - response.getWriter().print("[" + result + "]"); + response.getWriter().print(result); } catch (IOException e) { e.printStackTrace(); }