Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
===================================================================
diff -u -r13416 -r14268
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 13416)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 14268)
@@ -41,7 +41,9 @@
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.json.JsonPropertyFilter;
 
 import java.text.SimpleDateFormat;
@@ -138,6 +140,7 @@
 	 * 保存Sterilizer
 	 */
 	public String saveRinser() {
+		JSONObject outputJson = JSONUtil.buildJsonObject(false,"保存失败");
 		try {
 			if (rinser != null) {
 				Set<CleanMethod> cleanMethods = null;
@@ -178,6 +181,10 @@
 					for (String consumable : consumableArray) {
 						String [] items = consumable.split("#&");
 						if(items[0].equals("-1")){
+							if(items.length <=1){
+								JSONUtil.addMessage(outputJson, "请输入耗材名称");
+								throw new RuntimeException();
+							}
 							ConsumptiveConfig config = new ConsumptiveConfig();
 							config.setMaterialName(items[1]);
 							consumableConfigList.add(config);
@@ -198,6 +205,10 @@
 					for (String testItem : testItemArray) {
 						String [] items = testItem.split("#&");
 						if(items[0].equals("-1")){
+							if(items.length <=1){
+								JSONUtil.addMessage(outputJson, "请输入检测项名称");
+								throw new RuntimeException();
+							}
 							DetectionItem item = new DetectionItem();
 							item.setDetectionItemName(items[1]);
 							detectionItemList.add(item);
@@ -229,16 +240,13 @@
 				}
 				
 				//返回条码、供页面打印
-				HttpServletResponse httpServletResponse = StrutsParamUtils
-						.getResponse();
-				try {
-					httpServletResponse.getWriter().print("{success:true,barcode:'"+barcode+"'}");
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
+				outputJson = JSONUtil.buildJsonObject(true, "保存成功");
+				JSONUtil.addProperty(outputJson, "barcode", barcode);
+				StrutsResponseUtils.output(outputJson);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
+			StrutsResponseUtils.output(outputJson);
 		}
 		return null;
 	}