Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r36179 -r36189
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 36179)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 36189)
@@ -1737,10 +1737,12 @@
  * @param {条码} barcodeStr (器械包、灭菌篮筐、虚拟篮筐)
  * @param {灭菌记录id} sterilizationRecordId 
  */
-function loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout) {
-    if (barcodeStr == '' || barcodeStr.length <= 0) {
-        showMultipleResult("请输入条码！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
-        return;
+function loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout, setCode) {
+    if(!setCode){
+        if (barcodeStr == '' || barcodeStr.length <= 0) {
+            showMultipleResult("请输入条码！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+            return;
+        }
     }
     if (checkRepeat(barcodeStr)) {//已有，并且不是固定条码
         showMultipleResult("输入的条码已存在！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
@@ -1754,16 +1756,20 @@
     }
     var position = top.Ext.getCmp('position').getValue();
     sterilizationRecordWin.getEl().mask("正在加载中.请稍等...", "x-mask-loading");
+    var params = {
+        sterilizationRecordId: top.Ext.getCmp('id').getValue(),
+        barcode: barcodeStr,
+        loadTousseNamesInBasket: true,  //是否要加载篮筐里的器械包名称
+        sterilizationRecordId: sterilizationRecordId,  //灭菌记录id
+        checkProxyDisinfection: 'yes',  //是否需要检查代理灭菌是否已录入代理灭菌单
+        saveBarcode: getAlreadyScanBarcodes()  //此次扫描之前已经扫描的条码集合,通过节点获取
+    }
+    if(setCode){
+        params.setCode = setCode;
+    }
     Ext.Ajax.request({
         url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadTousseInstanceInfo.do',
-        params: {
-            sterilizationRecordId: top.Ext.getCmp('id').getValue(),
-            barcode: barcodeStr,
-            loadTousseNamesInBasket: true,  //是否要加载篮筐里的器械包名称
-            sterilizationRecordId: sterilizationRecordId,  //灭菌记录id
-            checkProxyDisinfection: 'yes',  //是否需要检查代理灭菌是否已录入代理灭菌单
-            saveBarcode: getAlreadyScanBarcodes()  //此次扫描之前已经扫描的条码集合,通过节点获取
-        },
+        params: params,
         success: function (response, options) {
             var result = response.responseText;
             var speakContent = null;
@@ -1777,7 +1783,9 @@
                 }
                 var resultData = Ext.decode(result);
                 var success = resultData.success;
-                reloadRightGrid(resultData.tousseBarcode, 'delete');
+                if(resultData.tousseBarcode){
+                    reloadRightGrid(resultData.tousseBarcode, 'delete');
+                }
                 if (success == 0) {
                     if (resultData.message) {
                         showMultipleResult(resultData.message);
@@ -2296,6 +2304,88 @@
                 } else if (success == -1) {
                     sterilizationRecordWin.getEl().unmask();
                     showMultipleResult(resultData.failureCause, null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
+                } else if(resultData.length && resultData.length > 0){
+                    for(var i=0;i<resultData.length;i++){
+                        reloadRightGrid(resultData[i].tousseBarcode, 'delete');
+                        var sterilingType = resultData[i].SterilingType;  //灭菌程序
+                        var department = resultData[i].department;  //科室
+                        var tousseName = resultData[i].tousseName;  //器械包名称
+                        var typeForSterilizationStatistics = resultData[i].typeForSterilizationStatistics;  //器械包类型（用于分类统计）
+                        var includeImplant = resultData[i].includeImplant;  //是否为含有植入物的外来器械包
+                        var tdIncludeImplant = resultData[i].tdIncludeImplant;//是否为含有植入物的普通器械包
+                        var reviewTime = resultData[i].reviewTime;  //审核时间
+                        var tousseBarcode = resultData[i].tousseBarcode;
+                        var sterilingMode = resultData[i].sterilingMode || '';  //灭菌方式
+                        var isUrgentTousse = resultData[i].isUrgentTousse;//是否加急
+                        var urgentLevel = resultData[i].urgentLevel;//加急对象
+                        if (top.Ext.getCmp('sterilizationType').getValue() != sterilingType) {
+                            showMultipleResult("器械包[" + tousseName + "]的灭菌程序和所选的灭菌程序不同!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage, true);
+                        }
+
+                        if (includeImplant == "是") {
+                            showMultipleResult("此外来器械包含有植入物，需要做生物监测！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage, true);
+                        }
+
+                        if (tdIncludeImplant == "是") {
+                            showMultipleResult("此器械包含有植入物，需要做生物监测！", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage, true);
+                        }
+
+                        if (sterilingModeFromSterilingGoodsDetailGrid.length == 1 && sterilingModeFromSterilingGoodsDetailGrid[0] != sterilingMode) {
+                            //showMultipleResult("【"+ tousseName +"】属于【"+ sterilingMode +"】物品与原有【"+ sterilingModeFromSterilingGoodsDetailGrid[0] +"】物品不一致，不能入框");
+                            noticeDiffSterilingMessage(top.Ext, getDiffSterilingModeMessage(tousseName, sterilingMode, sterilingModeFromSterilingGoodsDetailGrid[0]), function () {
+                                top.Ext.getCmp('inputBarcode').focus();
+                            });
+                            sterilizationRecordWin.getEl().unmask();
+                            return;
+                        } else if (sterilingModeFromSterilingGoodsDetailGrid.length == 0) {
+                            var hiddenSterilingMode2 = top.Ext.getCmp('hiddenSterilingMode2').getValue();
+                            if (hiddenSterilingMode2 !== sterilingMode) {
+                                noticeDiffSterilingMessage(top.Ext, getDiffSterilingModeMessage(tousseName, sterilingMode, hiddenSterilingMode2), function () {
+                                    top.Ext.getCmp('inputBarcode').focus();
+                                });
+                                sterilizationRecordWin.getEl().unmask();
+                                return;
+                            }
+                        }
+
+                        var newIncludeImplant = '否';
+
+                        if (typeForSterilizationStatistics == '器械包') {
+                            newIncludeImplant = tdIncludeImplant;
+                        } else {
+                            newIncludeImplant = includeImplant;
+                        }
+
+                        //添加到灭菌物品视图列表的第一行
+                        var rootNode = sterilizationColumnTree.getRootNode();
+                        var params = {
+                            isParentNode: true,
+                            barcode: tousseBarcode,
+                            name: tousseName,
+                            typeForSterilizationStatistics: typeForSterilizationStatistics,
+                            depart: department,
+                            type: '器械包',
+                            position: position,
+                            amount: 1,
+                            reviewTime: reviewTime,
+                            stockAmount: 0,
+                            sterilingMode: sterilingMode,
+                            isUrgentTousse: isUrgentTousse,
+                            urgentLevel: urgentLevel,
+                            includeImplant: newIncludeImplant,
+                            cls: isTimeout ? 'itemTimeout' : ''
+                        }
+                        var parentNode = createNodeForUrgent(params);
+                        var firstChildNode = rootNode.item(0);
+                        if (firstChildNode == null || firstChildNode == undefined) {
+                            rootNode.appendChild(parentNode);
+                        } else {
+                            rootNode.insertBefore(parentNode, firstChildNode);
+                        }
+                        speakBasket.addGoods('', tousseName, 1);
+                        removePendingSterilizationGoods(tousseBarcode)
+                    }
+                    sterilizationRecordWin.getEl().unmask();
                 }
 
                 newAddAudioTips("sterilizationRecordAudio", "", speakBasket);
@@ -3386,7 +3476,7 @@
                                         var isTrue = false;
                                         var oldSterilingMode;
                                         for (var j = 0; j < result.datas[i].dataList.length; j++) {
-                                            var sterilingMode = result.datas[i].dataList[j].sterilingMode  || '';
+                                            var sterilingMode = result.datas[i].dataList[j].sterilingMode || '';
                                             var sterilingType = result.datas[i].dataList[j].sterilingType;
                                             if (top.Ext.getCmp('sterilizationType').getValue() != sterilingType) {
                                                 showMultipleResult("[" + name + "]中物品的灭菌程序和所选的灭菌程序不同!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage, true);
@@ -4164,6 +4254,8 @@
                                                                 } else {
                                                                     top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点
                                                                 }
+                                                            } else if(TOUSSEINSTANCESETCODE == result){ //器械包集合码
+                                                                loadTousseInstance('', recordID,null,barcode);
                                                             } else if ("notFixedBarcode" == result) {
                                                                 showMultipleResult("该器械包为可追溯的包，不能扫描固定条码!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
 
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r36124 -r36189
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 36124)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 36189)
@@ -1146,6 +1146,7 @@
 		{header : "器械包名称",width : 180,dataIndex : 'tousseDefinition.name',renderer : renderCallTousseInstanceInfoShowFun},
 		{header : "来源科室",width : 80,dataIndex : 'depart'},
 		{header : "条码",width : 70,dataIndex : 'barcode'},
+		{header : "器械包集合码",width : 90,dataIndex : 'setCode',hidden: !sstsConfig.enableTousseNumberCollectionCodeFunction,},
 		{header : "标识牌条码",width : 70,dataIndex : 'idCardInstanceBarcode'},
 		{header : "禁用标识牌",width : 70,dataIndex : 'tousseDefinition.isDisableIDCard',hidden:disableIdCard},
 		{header : "状态",width : 80,dataIndex : 'status',renderer : statusFun},
@@ -1221,6 +1222,7 @@
 	    {name : 'tousseDefinition.name'},
 	    {name : 'tousseDefinition.tousseType'},  //器械包类型
 	    {name : 'barcode'},
+		{name : 'setCode'},
 	    {name : 'depart'},
 	    {name : 'idCardInstanceBarcode'},
 	    {name : 'tousseDefinition.isDisableIDCard'},
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r35503 -r36189
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 35503)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 36189)
@@ -97,6 +97,7 @@
 		var CHEMISTRYMONITORTOUSSE = '<%=BarcodeDevice.BARCODE_TYPE_CHEMISTRYMONITORTOUSSE%>';  //化学监测包
 		var BIOLOGICALMONITORTOUSSE = '<%=BarcodeDevice.BARCODE_TYPE_BIOLOGICALMONITORTOUSSE%>';  //生物监测包
 
+		var TOUSSEINSTANCESETCODE = '<%=BarcodeDevice.BARCODE_TYPE_TOUSSEINSTANCESETCODE%>';  //器械包集合码
 		var MONITORTOUSSEDISPLAY_EVERYTHING = '<%=Sterilizer.MONITORTOUSSEDISPLAY_EVERYTHING%>';  //每炉
 		var MONITORTOUSSEDISPLAY_FIRST = '<%=Sterilizer.MONITORTOUSSEDISPLAY_FIRST%>';  //每天第一炉
 		var MONITORTOUSSEDISPLAY_IMPLANT = '<%=Sterilizer.MONITORTOUSSEDISPLAY_IMPLANT%>';  //有植入物时
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r36146 -r36189
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 36146)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 36189)
@@ -34,7 +34,9 @@
 if (sstsConfig.aliasNameOfInspectorField) {
 	inspectorName = sstsConfig.aliasNameOfInspectorField;
 }
-
+var packingForCode = false;
+var noCreateSetCode = '';
+var oldTousseInstanceIds = '';
 var reviewViewText;
 if (sstsConfig.nameSchemeOfReviewModule == 2) {
 	reviewViewText = "包装";
@@ -2631,8 +2633,19 @@
 					id: "save_print",
 					text: '<span style="font-weight: bold;">' + packingBtnText + '</span>',
 					handler: function () {
+						packingForCode = false;
 						packingTousseBtnClick0(this, true);
 					}
+				},{
+					xtype: 'button',
+					margin: '0 0 0 10',
+					id: "save_print2",
+					hidden: !sstsConfig.enableTousseNumberCollectionCodeFunction,
+					text: '<span style="font-weight: bold;">' + packingBtnText + '(含集合码)</span>',
+					handler: function () {
+						packingForCode = true;
+						packingTousseBtnClick0(this, true);
+					}
 				},
 				{
 					xtype: 'button',
@@ -3285,6 +3298,7 @@
 	function showPackButton(isPrint, isReview, tousseType, showOrHidePrintBtn) {
 		var packButton = Ext4.getCmp('save_print');
 		packButton.show();
+		Ext4.getCmp('save_print2').show();
 
 		if (sstsConfig.showPackingGoodsBtn) {
 			var packingLableBtn = Ext4.getCmp('packingLableBtn');
@@ -4035,11 +4049,13 @@
 		if (sstsConfig.autoPackingAfterScanIdCard) {
 			packing = true;
 			Ext4.getCmp('save_print').disable();
+			Ext4.getCmp('save_print2').disable();
 			packingTousseBtnClick();
 		}
 	}
 	function onPackingTousseBtnClickComplete() {
 		Ext4.getCmp('save_print').enable();
+		Ext4.getCmp('save_print2').enable();
 		Ext4.getCmp('packingLableBtn').enable();
 
 		hidePackingTousseBtnClick_mask();
@@ -4185,10 +4201,12 @@
 		if (selLength > 0) {
 			var delBasketItems = new Array();
 			var map = {}, dest = [];
+			var departmentArr = [];
 			Ext4.each(selNodes, function (pNode) {
 				if (pNode.childNodes.length == 0) {
 					var ai = pNode;
 					var tousseName = ai.get('tousseName')
+					var department = ai.get('department');
 					if (!map[tousseName]) {
 						if (ai.get('idCardBarcode') !== '') {
 							dest.push(ai);
@@ -4197,8 +4215,16 @@
 						}
 						map[tousseName] = ai;
 					}
+					if(departmentArr.indexOf(department) == -1){
+						departmentArr.push(department);
+					}
 				}
 			});
+			if(departmentArr.length > 1){
+				onPackingTousseBtnClickComplete();
+				showMultipleResult('只支持同科室物品合并生成器械包集合码，请检查物品后重新操作。');
+				return
+			}
 			if (dest.length == 1 && isConfirm == '否') {
 				var sterilingType = Ext4.getCmp('sterilingType').getValue();
 				if (packingPageAutoSetSterilizationProgramAfterSelectTousse || !sstsConfig.hideSterilingType) {
@@ -4813,6 +4839,7 @@
 			websocketSessionId: getWebsocketSessionId(),
 			tousseName: tousseName,
 			tousseType: tousseType,
+			department:department,
 			printImmediately: printImmediately,
 			tousseID: tousseID
 		}
@@ -4826,6 +4853,24 @@
 	//装配调接口
 	function requestPackingTousse(params, index, isTrue) {
 		var par = params[index];
+		if(packingForCode){
+			var createSetCode = false;
+			var lastTime = false;
+			var tousseInstanceIds = '';
+			if(noCreateSetCode !== ''){
+				createSetCode = false;
+				tousseInstanceIds = '';
+			}else {
+				createSetCode = true;
+				tousseInstanceIds = oldTousseInstanceIds;
+			}
+			par.createSetCode = createSetCode;
+			par.tousseInstanceIds = tousseInstanceIds;
+			if(index == (params.length - 1)){
+				lastTime = true;
+			}
+			par.lastTime = lastTime;
+		}
 		Ext4.Ajax.request({
 			async: false,
 			dataType: "json",
@@ -4838,6 +4883,14 @@
 					getPackingMaterialsForCheck.remove(par.tousseID);
 					materialStore.reload();
 				}
+				noCreateSetCode = result.noCreateSetCode || '';
+				oldTousseInstanceIds = result.tousseInstanceIds || '';
+				var errorOfCreateSetCode = result.errorOfCreateSetCode || '';
+				if(errorOfCreateSetCode !== ''){
+					showMultipleResult(errorOfCreateSetCode);
+					uncheck();
+					return
+				}
 				if (result.success) {
 					var taskIdToAmountMapInfo = par.taskIdToAmountMapInfo;
 					var obj = JSON.parse(taskIdToAmountMapInfo);
@@ -4857,6 +4910,14 @@
 							setVideoWhenAddPackingRecord(packingRecordIdArray);
 						}
 					}
+					if(packingForCode){
+						var setCode = result.setCode || '';
+						var setCodeSize = result.setCodeSize || '';
+						if(setCode !== ''){
+							var department = result.tousses[0].department;
+							printSetCode(setCode,setCodeSize,department);
+						}
+					}
 				} else {
 					//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
 					if (result.type && (result.type == 'virtualBasketNotEnough')) {
@@ -4927,6 +4988,32 @@
 		});
 	}
 
+	//打印集合码
+	function printSetCode(setCode, setCodeSize, department) {
+		doGetLodop();
+		LODOP.PRINT_INIT("");
+		var tableHtml = "<table border ='0' style=\"width: 77mm; height: 50mm\">";
+		tableHtml += "<tr height='7mm'>";
+		tableHtml += "<td colspan='4' style='font-size: 18px;'><center>" + department + "</center>";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-size: 18px;'><center>";
+		tableHtml += "<img src='" + getPrintBarcodeURL({ barcode: setCode }) + "'/>";
+		tableHtml += "</br>" + setCode;
+		tableHtml += "</center></td></tr>";
+
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-size: 18px;' align='center'>总包数：" + setCodeSize + "</td>";
+		tableHtml += "</tr>";
+	
+		tableHtml += "</table>";
+		LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", "<body leftmargin=0 topmargin=0>" + tableHtml + "</body>");
+		LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
+		LODOP.PRINT();
+	};
+
 	//取消勾选
 	function uncheck() {
 		var basketTree = Ext4.getCmp('basketTreeGrid');
@@ -5678,6 +5765,7 @@
 				showPackButton(isPrint, isReview, tousseType);
 			} else {
 				Ext4.getCmp('save_print').hide();
+				Ext4.getCmp('save_print2').hide();
 				Ext4.getCmp('packingLableBtn').hide();
 			}
 		}
@@ -5827,10 +5915,12 @@
 					showPackButton(isPrint, isReview, tousseType, printBOMwhenPrintLabel);
 				} else {
 					Ext4.getCmp('save_print').hide();
+					Ext4.getCmp('save_print2').hide();
 					Ext4.getCmp('packingLableBtn').hide();
 				}
 			} else {
 				Ext4.getCmp('save_print').hide();
+				Ext4.getCmp('save_print2').hide();
 				Ext4.getCmp('packingLableBtn').hide();
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
===================================================================
diff -u -r35541 -r36189
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 35541)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 36189)
@@ -100,6 +100,8 @@
   enableRealTimeDashboardsForDataFunction:true,
   //是否启用手写签名功能
   enableHandwrittenSignatureFunction:true,
+  //是否启用器械包集合码功能
+  enableTousseNumberCollectionCodeFunction:true,
   //外来器械申请单默认科室配置
   foreignTousseAppliationDefaultDepartment:{
    '0316':{// 登录人所在的科室编码