Index: ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js
===================================================================
diff -u -r38015 -r38411
--- ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js	(.../config.js)	(revision 38015)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js	(.../config.js)	(revision 38411)
@@ -209,6 +209,8 @@
   enableDepartPackingDetailSummaryReport:true,
   //添加退货记录前需要先添加质量监测记录
   addQualityMonitoringBeforeAddReturnGoodsRecord:true,
+  //启用根据病人信息合并打印外来器械发货单的功能
+  enablePrintForeignTousseInvoiceBasedOnThePatientInformationFunction:2,
   //只允许选择已存在的手术间
  onlySelectExistedOperationRoom:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r38317 -r38411
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 38317)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 38411)
@@ -901,44 +901,95 @@
 		var goodsArray = printSummaryObj.goods;
 		for (var k = 0; k < goodsArray.length; k++) {
 			var row = goodsArray[k];
-			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
-			for (var i = 0; i < columnCount; i++) {
-				var item = myObj.goodsTable.columns[i];
-				var value = row[item.dataIndex];
-				//广州中药附一消毒物品显示包的数量和材料的数量
-				if (item.dataIndex == "goodsAmount" && sstsConfig.printDisinfectionGoodsAmountByPackage && goodsArray[k].tousseType == "消毒物品") {
-					value = goodsArray[k].packageAmount + "(" + goodsArray[k].materialsAmount + ")";
-				}
-				if (item.dataIndex.toLowerCase().indexOf("price") >= 0) {
-					value = formatMoney(value);
-				}
-				if (isUndefinedOrNullOrEmpty(value)) {
-					if (value === 0) {
-						//类型和值都相等,不处理，直接打印0
-					} else {
-						value = '&nbsp;';
+			if(row.vos && row.vos.length > 0){
+				for(var z=0;z<row.vos.length;z++){
+					var childRow = row.vos[z];
+					tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
+					for (var i = 0; i < columnCount; i++) {
+						var item = myObj.goodsTable.columns[i];
+						var value = childRow[item.dataIndex];
+						//广州中药附一消毒物品显示包的数量和材料的数量
+						if (item.dataIndex == "goodsAmount" && sstsConfig.printDisinfectionGoodsAmountByPackage && goodsArray[k].tousseType == "消毒物品") {
+							value = goodsArray[k].packageAmount + "(" + goodsArray[k].materialsAmount + ")";
+						}
+						if (item.dataIndex.toLowerCase().indexOf("price") >= 0) {
+							value = formatMoney(value);
+						}
+						if (isUndefinedOrNullOrEmpty(value)) {
+							if (value === 0) {
+								//类型和值都相等,不处理，直接打印0
+							} else {
+								value = '&nbsp;';
+							}
+						}
+						var tdContent = value;
+						if (myObj.nowrap) {
+							//不换行.如果直接将样式应用到td标签,效果出不来,在td里加一个div是可以的
+							tdContent = "<div style='overflow:hidden;white-space:nowrap;";
+							if (myObj.fixed) {
+								tdContent += "width:" + item.width + ";";
+							}
+							if (myObj.ellipsis) {
+								tdContent += "text-overflow:ellipsis;'>"
+							} else {
+								tdContent += "'>";
+							}
+							tdContent += value;
+							tdContent += "</div>";
+						}
+						var style = getTableTdStyle(myObj.goodsTable, i);
+						var tdWidth = myObj.fixed ? 'width=' + item.width : '';
+						if(item.dataIndex == 'patientNames' || item.dataIndex == 'hospitalNumber' || item.dataIndex == 'amount'){
+							if(z == 0){
+								tableHtml += "<td rowspan="+row.vos.length+" align='" + item.align + "' " + tdWidth + " style=" + style + ">" + row[item.dataIndex] + "</td>";
+							}
+						}else {
+							tableHtml += "<td align='" + item.align + "' " + tdWidth + " style=" + style + ">" + tdContent + "</td>";
+						}
+						
 					}
+					tableHtml += "</tr>";
 				}
-				var tdContent = value;
-				if (myObj.nowrap) {
-					//不换行.如果直接将样式应用到td标签,效果出不来,在td里加一个div是可以的
-					tdContent = "<div style='overflow:hidden;white-space:nowrap;";
-					if (myObj.fixed) {
-						tdContent += "width:" + item.width + ";";
+			}else {
+				tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
+				for (var i = 0; i < columnCount; i++) {
+					var item = myObj.goodsTable.columns[i];
+					var value = row[item.dataIndex];
+					//广州中药附一消毒物品显示包的数量和材料的数量
+					if (item.dataIndex == "goodsAmount" && sstsConfig.printDisinfectionGoodsAmountByPackage && goodsArray[k].tousseType == "消毒物品") {
+						value = goodsArray[k].packageAmount + "(" + goodsArray[k].materialsAmount + ")";
 					}
-					if (myObj.ellipsis) {
-						tdContent += "text-overflow:ellipsis;'>"
-					} else {
-						tdContent += "'>";
+					if (item.dataIndex.toLowerCase().indexOf("price") >= 0) {
+						value = formatMoney(value);
 					}
-					tdContent += value;
-					tdContent += "</div>";
+					if (isUndefinedOrNullOrEmpty(value)) {
+						if (value === 0) {
+							//类型和值都相等,不处理，直接打印0
+						} else {
+							value = '&nbsp;';
+						}
+					}
+					var tdContent = value;
+					if (myObj.nowrap) {
+						//不换行.如果直接将样式应用到td标签,效果出不来,在td里加一个div是可以的
+						tdContent = "<div style='overflow:hidden;white-space:nowrap;";
+						if (myObj.fixed) {
+							tdContent += "width:" + item.width + ";";
+						}
+						if (myObj.ellipsis) {
+							tdContent += "text-overflow:ellipsis;'>"
+						} else {
+							tdContent += "'>";
+						}
+						tdContent += value;
+						tdContent += "</div>";
+					}
+					var style = getTableTdStyle(myObj.goodsTable, i);
+					var tdWidth = myObj.fixed ? 'width=' + item.width : '';
+					tableHtml += "<td align='" + item.align + "' " + tdWidth + " style=" + style + ">" + tdContent + "</td>";
 				}
-				var style = getTableTdStyle(myObj.goodsTable, i);
-				var tdWidth = myObj.fixed ? 'width=' + item.width : '';
-				tableHtml += "<td align='" + item.align + "' " + tdWidth + " style=" + style + ">" + tdContent + "</td>";
+				tableHtml += "</tr>";
 			}
-			tableHtml += "</tr>";
 		}
 		//打印表格表尾的统计信息
 		if (myObj.goodsTable.footer) {
Index: ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/print/printConfig.js
===================================================================
diff -u -r38402 -r38411
--- ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/print/printConfig.js	(.../printConfig.js)	(revision 38402)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/print/printConfig.js	(.../printConfig.js)	(revision 38411)
@@ -286,8 +286,6 @@
 						{header : "医生", dataIndex : 'doctor', width : '8%', align : 'left', fontSize : 11},
     	                {header : "规格", dataIndex : 'specification', width : '13%', align : 'center', fontSize : 11},
     	                {header : "包装规格", dataIndex : 'packageSpec', width : '13%', align : 'center', fontSize : 11},
-						{header : "患者姓名", dataIndex : 'patientNames', width : '7%', align : 'center', fontSize : 11},
-						{header : "住院号", dataIndex : 'hospitalNumber', width : '7%', align : 'center', fontSize : 11},
     	                {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11},
     	                {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11},
     	                {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11},
@@ -1181,7 +1179,7 @@
     batchPrintInvoices: batchPrintInvoicesConfig,
     batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig,
 	//BJ309YY-31:打印发货单 - 外来器械包
-	batchPrintInvoice_Tousse:batchPrintInvoicesOfForeignTousseConfig,
+	batchPrintInvoice_foreignTousse:batchPrintInvoicesOfForeignTousseConfig,
     // 发货单（通用发货单）
     invoiceCombo : invoiceComboPrintConfig,
     // 发货单（一次性物品）