Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r16671 -r16915
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16671)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16915)
@@ -464,6 +464,92 @@
 	}
 	return true;
 }
+//名字到数量的map
+function getComboTousseNameToAmountMap(tousseInstancesBelongToThisComboTousse){
+	var map = {};
+	for(var i=0;i<tousseInstancesBelongToThisComboTousse.length;i++){
+		var tousse = tousseInstancesBelongToThisComboTousse[i];
+		var tousseName = tousse.name;
+		var amount = 0;
+		if(map.hasOwnProperty(tousseName)){
+			amount = map[tousseName];
+		}
+		++amount;
+		map[tousseName] = amount;
+	 }
+	return map;
+}
+// 聚合包是否超过待发数量
+function isComboTousseExceedAmount(data){
+	var comboTousseNameToAmountMap = getComboTousseNameToAmountMap(data.tousseInstancesBelongToThisComboTousse);
+	for ( var i = 0; i < recyclingapplicationStore.getCount(); i++) {
+		 var record = recyclingapplicationStore.getAt(i);
+		 var name1 =record.get('name');
+		 var count =record.get('count');
+		 var tempAmount = record.get('tempAmount');
+		 var totalAmount = 0;
+		 if(comboTousseNameToAmountMap.hasOwnProperty(name1)){
+			 totalAmount = comboTousseNameToAmountMap[name1];
+		 }
+		 //待发数量是否大于篮筐内该物品的数量
+		 var sendAmount = Number(count) - Number(tempAmount);// 待发数量
+		 if(sendAmount < Number(totalAmount)){
+			 showResult(name1+'超过待发数量!');
+			 return true;
+		 }
+	}
+	return false;
+}
+// 聚合包是否都在发货计划内
+function isComboTousseAllInPlan(data){
+	var tousseInstancesBelongToThisComboTousse = data.tousseInstancesBelongToThisComboTousse;
+	for(var i=0;i<tousseInstancesBelongToThisComboTousse.length;i++){
+		var tousse = tousseInstancesBelongToThisComboTousse[i];
+		var tousseName = tousse.name;
+		var record = findRecordByGoodsVOFromRecyclingApplication(tousse);
+		// 如果未找到，继续找下一个
+		if (record == undefined){
+			var msg = '['+tousseName+']不在发货计划中！';
+			showResult(msg);
+			return false;
+		}
+	 }
+	return true;
+}
+// 聚合包的处理
+function processComboTousse(data,speakBasket){
+	var tousseInstancesBelongToThisComboTousse = data.tousseInstancesBelongToThisComboTousse;
+	if(isUndefinedOrNull(tousseInstancesBelongToThisComboTousse)){
+		showResult("数据错误，聚合包包含的实例为空!");
+		return ;
+	}
+	// 聚合包是否都在发货计划内
+	if(!isComboTousseAllInPlan(data)){
+		return ;
+	}
+	// 是否超过待发数量
+	if(isComboTousseExceedAmount(data)){
+		return ;
+	}
+	for(var x=0;x<tousseInstancesBelongToThisComboTousse.length;x++){
+		var goods = tousseInstancesBelongToThisComboTousse[x];
+		var record = findRecordByGoodsVOFromRecyclingApplication(goods);
+		//申请数量
+		var appAmount1 = record.data['count'];
+		var sendAmount1 = record.data['tempAmount'];
+		
+	    if(!isUndefinedOrNullOrEmpty(goods.showResult)){
+	    	showResult(goods.showResult);
+	    }
+	    var existingGoods = getSendOutGoodsByBarcode(goods.barcode);
+	    if(existingGoods){
+	    	continue;
+	    }
+		var goodsName = goods.name;
+		// TODO 生物监测
+		addGoods(goods,speakBasket);
+	  }
+}
 //扫描发货物品
 function loadGoodsByBarcode(orgUnitCoding) {
 	var barcode = top.Ext.getCmp("scanText").getValue().Trim();
@@ -537,6 +623,11 @@
 			for(var x=0;x<result.data.length;x++){
 				var goods = result.data[x];
 				
+				// 聚合包的处理
+				if(goods.tousseType == '聚合包'){
+					processComboTousse(goods,speakBasket);
+					continue;
+				}
 				// 扫描多个包时，固定条码包直接忽略
 				if((result.data.length > 1) && goods.tousseFixedBarcode){// 扫单个包才提示
 					continue;
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r16848 -r16915
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16848)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16915)
@@ -1804,10 +1804,73 @@
 		invoiceManager.updateInvoiceTousseAmount();
 	}
 	
+	
+	private void updateTousseInstances(
+			JsonArray tousseInstancesBelongToThisComboTousse) {
+		String voBarcodes = "";
+		for (int i = 0; i < tousseInstancesBelongToThisComboTousse.size(); ++i) {
+			JsonObject vo = tousseInstancesBelongToThisComboTousse.get(i)
+					.getAsJsonObject();
+
+			String barcode = vo.get("barcode").getAsString();
+			if (i == tousseInstancesBelongToThisComboTousse.size() - 1) {
+				voBarcodes += barcode;
+			} else {
+				voBarcodes += barcode + ";";
+			}
+
+		}
+		JSONObject jsonObj = invoiceManager
+				.getBiologicalMonitoringInfo(voBarcodes);
+
+		for (int i = 0; i < tousseInstancesBelongToThisComboTousse.size(); ++i) {
+			JsonObject vo = tousseInstancesBelongToThisComboTousse.get(i)
+					.getAsJsonObject();
+
+			String barcode = vo.get("barcode").getAsString();
+			JSONObject jsonVo = (JSONObject) jsonObj.get(barcode);
+			Boolean noBiologicalMonitoring = false;
+
+			Boolean biologicalMonitoringNoResult = false;
+
+			Boolean biologicalMonitoringFail = false;
+
+			String isRoutine = TousseInstance.ROUTINE_YES;
+			if (jsonVo != null) { // 不为空说明，都是含有植入物的器械包
+				String noBiologicalMonitoringStr = jsonVo
+						.optString("noBiologicalMonitoring");
+				String biologicalMonitoringNoResultStr = jsonVo
+						.optString("biologicalMonitoringNoResult");
+				String biologicalMonitoringFailStr = jsonVo
+						.optString("biologicalMonitoringFail");
+				String urgentDelivery = jsonVo.optString("urgentDelivery");
+
+				noBiologicalMonitoring = StringTools
+						.isNotBlank(noBiologicalMonitoringStr);
+				biologicalMonitoringNoResult = StringTools
+						.isNotBlank(biologicalMonitoringNoResultStr);
+				biologicalMonitoringFail = StringTools
+						.isNotBlank(biologicalMonitoringFailStr);
+
+				if (StringTools.isNotBlank(urgentDelivery)) { // 紧急发货
+					isRoutine = TousseInstance.ROUTINE_NO;// 生物监测结果是不合格
+				}
+			}
+			vo.addProperty("noBiologicalMonitoring", noBiologicalMonitoring);// 没做生物监测
+			vo.addProperty("biologicalMonitoringNoResult",
+					biologicalMonitoringNoResult);// 生物监测结果是无
+			vo.addProperty("biologicalMonitoringFail", biologicalMonitoringFail);// 生物监测结果是不合格
+
+			vo.addProperty("isRoutine", isRoutine);// 生物监测结果是不合格
+		}
+
+	}
+
 	private void setTousseInstancesBelongToThisComboTousse(JsonObject data,InvoiceGoodsVo vo) {
 		Collection<InvoiceGoodsVo> vos = new ArrayList<InvoiceGoodsVo>();
 		if(data.has("tousseInstancesBelongToThisComboTousse")){
 			JsonArray tousseInstancesBelongToThisComboTousse = data.getAsJsonArray("tousseInstancesBelongToThisComboTousse");
+			updateTousseInstances(tousseInstancesBelongToThisComboTousse);
 			vo.setTousseInstancesBelongToThisComboTousse(tousseInstancesBelongToThisComboTousse);
 		}
 	}