Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
===================================================================
diff -u -r32394 -r32397
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 32394)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 32397)
@@ -1237,125 +1237,120 @@
 	public JSONObject bathSaveQualityMonitoringInstance(QualityMonitoringInstance qualityMonitoringInstance, Map<String, String> map) {
 		boolean success = true;
 		String message = "保存成功！";
-		try {
-			// 抽检器械包和抽检器械，以及和抽检器械包和抽检器械关联的检测项
-			String tousseMaterialInstanceInfo = map.get("tousseMaterialInstanceInfo");
-			JSONObject tousseMaterialInstanceJSON = JSONObject.fromObject(tousseMaterialInstanceInfo);
-			if(tousseMaterialInstanceJSON == null){
-				throw new RuntimeException("抽检器械和监测项不能都为空");
+		// 抽检器械包和抽检器械，以及和抽检器械包和抽检器械关联的检测项
+		String tousseMaterialInstanceInfo = map.get("tousseMaterialInstanceInfo");
+		JSONObject tousseMaterialInstanceJSON = JSONObject.fromObject(tousseMaterialInstanceInfo);
+		if(tousseMaterialInstanceJSON == null){
+			throw new RuntimeException("抽检器械和监测项不能都为空");
+		}
+		JSONArray tousseInstanceInfos = tousseMaterialInstanceJSON.optJSONArray("tousseInstanceInfos");
+		if(tousseInstanceInfos == null || tousseInstanceInfos.size() == 0){
+			throw new RuntimeException("抽检器械和监测项不能都为空");
+		}
+
+		// 填写了多少个监测元素信息(抽检器械和监测项)，就要保存多少条质量监测监测记录
+		for(int i=0 ; i<tousseInstanceInfos.size(); i++){
+			int orderNumber = 1;
+			QualityMonitoringInstance tempInstance = new QualityMonitoringInstance();
+			Map<String,String> tempMap = new HashMap<String, String>();
+			if(DatabaseUtil.isPoIdValid(qualityMonitoringInstance.getId())){
+				tempInstance = qualityMonitoringInstance;
+			} else {
+				BeanUtils.copyProperties(qualityMonitoringInstance, tempInstance);
 			}
-			JSONArray tousseInstanceInfos = tousseMaterialInstanceJSON.optJSONArray("tousseInstanceInfos");
-			if(tousseInstanceInfos == null || tousseInstanceInfos.size() == 0){
-				throw new RuntimeException("抽检器械和监测项不能都为空");
-			}
-			
-			// 填写了多少个监测元素信息(抽检器械和监测项)，就要保存多少条质量监测监测记录
-			for(int i=0 ; i<tousseInstanceInfos.size(); i++){
-				int orderNumber = 1;
-				QualityMonitoringInstance tempInstance = new QualityMonitoringInstance();
-				Map<String,String> tempMap = new HashMap<String, String>();
-				if(DatabaseUtil.isPoIdValid(qualityMonitoringInstance.getId())){
-					tempInstance = qualityMonitoringInstance;
-				} else {
-					BeanUtils.copyProperties(qualityMonitoringInstance, tempInstance);
-				}
-				// tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + tousseAmount + "@" + tousseRecycle+ "@" + tousseRePacking+ "@" + order + "@" + tousseDefinitionID + "@" + haveMaterial;"
-				String tousseInstanceInfo = "";
-				// material +"@"+ amount + "@" + position + "@" + order + "@" + tousseDefinitionID;
-				String materialInfo = "";
-				
-				JSONArray tousseBags = tousseInstanceInfos.optJSONObject(i).optJSONArray("tousseBags");
-				if(tousseBags != null && tousseBags.size() > 0){
-					for(int j=0;j<tousseBags.size();j++){
-						JSONObject tousseBag = tousseBags.optJSONObject(j);
-						String tousseBarcode = tousseBag.optString("tousseBarcode");
-						// 处理抽检器械包参数
-						String tousseInstanceId = tousseBag.optString("tousseInstanceId");
-						String tousseName = tousseBag.optString("tousseName");
-						String tousseDefinitionID = tousseBag.optString("tousseDefinitionId");
-						String tousseAmount = tousseBag.optString("tousseAmount");
-						String tousseRecycle = tousseBag.optString("tousseRecycle");
-						String tousseRePacking = tousseBag.optString("tousseRePacking");
-						String haveMaterial = Constants.STR_NO;
-						// 处理抽检器械参数
-						JSONArray materialInfos = tousseBag.optJSONArray("materialInfos");
-						if(StringUtils.isNotBlank(tousseName) && StringUtils.isNotBlank(tousseAmount)
-								&& StringUtils.isNotBlank(tousseRecycle) && StringUtils.isNotBlank(tousseRePacking)){
-							if(materialInfos != null && materialInfos.size() > 0){
-								for(int k=0;k<materialInfos.size();k++){
-									JSONObject materialInfoJSON = materialInfos.optJSONObject(k);
-									String material = materialInfoJSON.optString("material");
-									String amount = materialInfoJSON.optString("amount");
-									if(StringUtils.isNotBlank(material) && StringUtils.isNotBlank(amount)){
-										haveMaterial = Constants.STR_YES;
-										break;
-									}
-								}
-							}
-							tousseInstanceInfo = tousseInstanceInfo + tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + 
-									tousseAmount + "@" + tousseRecycle + "@" + tousseRePacking + "@" + orderNumber++ + "@" + tousseDefinitionID + "@" + haveMaterial + ";";
-						}
-						if(j == 0){
-							// 抽检器械扫的第一个包实例id， 监测记录如果录了器械包，页面的“炉次”和“炉号”，取自第一个包实例
-							if(map.get("tousseInstanceId")!=null){
-								map.put("tousseInstanceId", tousseInstanceId);
-							}
-							if(StringUtils.isNotBlank(tousseInstanceInfo)){
-								map.put("isRecycle", tousseRecycle);
-								map.put("isRepacking", tousseRePacking);
-							}
-						}
+			// tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + tousseAmount + "@" + tousseRecycle+ "@" + tousseRePacking+ "@" + order + "@" + tousseDefinitionID + "@" + haveMaterial;"
+			String tousseInstanceInfo = "";
+			// material +"@"+ amount + "@" + position + "@" + order + "@" + tousseDefinitionID;
+			String materialInfo = "";
+
+			JSONArray tousseBags = tousseInstanceInfos.optJSONObject(i).optJSONArray("tousseBags");
+			if(tousseBags != null && tousseBags.size() > 0){
+				for(int j=0;j<tousseBags.size();j++){
+					JSONObject tousseBag = tousseBags.optJSONObject(j);
+					String tousseBarcode = tousseBag.optString("tousseBarcode");
+					// 处理抽检器械包参数
+					String tousseInstanceId = tousseBag.optString("tousseInstanceId");
+					String tousseName = tousseBag.optString("tousseName");
+					String tousseDefinitionID = tousseBag.optString("tousseDefinitionId");
+					String tousseAmount = tousseBag.optString("tousseAmount");
+					String tousseRecycle = tousseBag.optString("tousseRecycle");
+					String tousseRePacking = tousseBag.optString("tousseRePacking");
+					String haveMaterial = Constants.STR_NO;
+					// 处理抽检器械参数
+					JSONArray materialInfos = tousseBag.optJSONArray("materialInfos");
+					if(StringUtils.isNotBlank(tousseName) && StringUtils.isNotBlank(tousseAmount)
+							&& StringUtils.isNotBlank(tousseRecycle) && StringUtils.isNotBlank(tousseRePacking)){
 						if(materialInfos != null && materialInfos.size() > 0){
 							for(int k=0;k<materialInfos.size();k++){
 								JSONObject materialInfoJSON = materialInfos.optJSONObject(k);
 								String material = materialInfoJSON.optString("material");
 								String amount = materialInfoJSON.optString("amount");
-								String position = materialInfoJSON.optString("position");
 								if(StringUtils.isNotBlank(material) && StringUtils.isNotBlank(amount)){
-									if(StringUtils.isBlank(tousseDefinitionID)){
-										tousseDefinitionID = " ";
-									}
-									materialInfo = materialInfo + material + "@" + amount + "@" + position + "@" + orderNumber++ + "@" + tousseDefinitionID + ";";
+									haveMaterial = Constants.STR_YES;
+									break;
 								}
 							}
 						}
+						tousseInstanceInfo = tousseInstanceInfo + tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + 
+								tousseAmount + "@" + tousseRecycle + "@" + tousseRePacking + "@" + orderNumber++ + "@" + tousseDefinitionID + "@" + haveMaterial + ";";
 					}
+					if(j == 0){
+						// 抽检器械扫的第一个包实例id， 监测记录如果录了器械包，页面的“炉次”和“炉号”，取自第一个包实例
+						if(map.get("tousseInstanceId")!=null){
+							map.put("tousseInstanceId", tousseInstanceId);
+						}
+						if(StringUtils.isNotBlank(tousseInstanceInfo)){
+							map.put("isRecycle", tousseRecycle);
+							map.put("isRepacking", tousseRePacking);
+						}
+					}
+					if(materialInfos != null && materialInfos.size() > 0){
+						for(int k=0;k<materialInfos.size();k++){
+							JSONObject materialInfoJSON = materialInfos.optJSONObject(k);
+							String material = materialInfoJSON.optString("material");
+							String amount = materialInfoJSON.optString("amount");
+							String position = materialInfoJSON.optString("position");
+							if(StringUtils.isNotBlank(material) && StringUtils.isNotBlank(amount)){
+								if(StringUtils.isBlank(tousseDefinitionID)){
+									tousseDefinitionID = " ";
+								}
+								materialInfo = materialInfo + material + "@" + amount + "@" + position + "@" + orderNumber++ + "@" + tousseDefinitionID + ";";
+							}
+						}
+					}
 				}
-				tempMap.put("tousseInstanceInfo", tousseInstanceInfo);
-				tempMap.put("materialInfo", materialInfo);
+			}
+			tempMap.put("tousseInstanceInfo", tousseInstanceInfo);
+			tempMap.put("materialInfo", materialInfo);
 
-				tempMap.putAll(map);
-				
-				// 监测项元素
-				JSONObject configItemOption = tousseInstanceInfos.optJSONObject(i).optJSONObject("configItemOption");
-				if(configItemOption != null){
-					Iterator<String> it = configItemOption.keys();
-					while(it.hasNext()){
-						String key = String.valueOf(it.next());
-						Object value = configItemOption.get(key);
-						if(StringUtils.equals(key.split("_")[0], "configItemOptionSterName")){
-							// 质量监测记录的炉号(如果抽检器械扫的第一个包实例id为空时，炉号就取这个值)
-							tempMap.put("sterilizerName", (String)value);
-							tempMap.put("configItemOptionSterName", (String)value);
-						} else if (StringUtils.equals(key.split("_")[0], "configItemOptionSterFre")){
-							// 质量监测记录的炉次(如果抽检器械扫的第一个包实例id为空时，炉次就取这个值)
-							tempMap.put("sterilizerFre", (String)value);
-							tempMap.put("configItemOptionSterFre", (String)value);
-						} else if(value instanceof String){
-							tempMap.put(key.split("_")[0], (String) value);
-						} else if(value instanceof Number){
-							Number number = (Number)value;
-							tempMap.put(key.split("_")[0], number.toString());
-						} else {
-							tempMap.put(key.split("_")[0], null);
-						}
+			tempMap.putAll(map);
+
+			// 监测项元素
+			JSONObject configItemOption = tousseInstanceInfos.optJSONObject(i).optJSONObject("configItemOption");
+			if(configItemOption != null){
+				Iterator<String> it = configItemOption.keys();
+				while(it.hasNext()){
+					String key = String.valueOf(it.next());
+					Object value = configItemOption.get(key);
+					if(StringUtils.equals(key.split("_")[0], "configItemOptionSterName")){
+						// 质量监测记录的炉号(如果抽检器械扫的第一个包实例id为空时，炉号就取这个值)
+						tempMap.put("sterilizerName", (String)value);
+						tempMap.put("configItemOptionSterName", (String)value);
+					} else if (StringUtils.equals(key.split("_")[0], "configItemOptionSterFre")){
+						// 质量监测记录的炉次(如果抽检器械扫的第一个包实例id为空时，炉次就取这个值)
+						tempMap.put("sterilizerFre", (String)value);
+						tempMap.put("configItemOptionSterFre", (String)value);
+					} else if(value instanceof String){
+						tempMap.put(key.split("_")[0], (String) value);
+					} else if(value instanceof Number){
+						Number number = (Number)value;
+						tempMap.put(key.split("_")[0], number.toString());
+					} else {
+						tempMap.put(key.split("_")[0], null);
 					}
 				}
-				this.save(tempInstance, tempMap);
 			}
-		} catch (Exception e) {
-			success = false;
-			message = e.getMessage().toString();
+			this.save(tempInstance, tempMap);
 		}
 		JSONObject result = new JSONObject();
 		result.put("success", success);