Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r22651 -r25037
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 22651)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 25037)
@@ -4,6 +4,7 @@
 var continuePacking = false;
 var packing = false;
 var waitAmount = {};
+var fromPortal = false;
 /**
  * 聚合包装配界面
  */
@@ -143,6 +144,105 @@
     resetComboTousseTotolAmount();
 }
 
+// 聚合
+function combo_confirm(){
+	var waitComboTousseGrid = top.Ext4.getCmp("waitComboTousseGrid");
+	var waitComboTousseStore = waitComboTousseGrid.getStore();
+	var comboGridStore = top.Ext4.getCmp("comboGrid").getStore();
+	
+	var records = waitComboTousseGrid.getSelectionModel().getSelection();
+	if (records.length == 0) {
+        showResult("请选择！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+        return false;
+    }
+	var items = [];
+	for(var i = 0 ; i < records.length ; i++){
+		var id = records[i].data["id"];
+		var tousseName = records[i].data["tousseName"];
+		var amount = records[i].data['amount'];//拆分数量
+		var maxAmount = records[i].data["maxAmount"];//总数量
+		var packageType = records[i].data["packageType"];
+		
+		if(amount > maxAmount){
+            showResult("聚合数量不能大于总数量！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+            return false;
+        }
+		var isExist = isExistErrorOrDamage(records[i]);
+		if(!isExist){
+//			addTousseToTousseGrid(comboGridStore,id,tousseName,amount,packageType);
+			var addItem = {
+					id : id,
+					tousseName : tousseName,
+					amount : amount,
+					packageType : packageType
+				};
+			items.push(addItem);
+            if(amount == maxAmount){
+            	waitComboTousseStore.remove(records[i]);
+            }else{
+               var num = Number(maxAmount) - Number(amount);
+               records[i].set('amount', num);
+               records[i].set('maxAmount', num);
+            }
+		}
+	}
+	addToComboTousseGrid(items);
+
+//    resetComboTousseTotolAmount();
+}
+
+function addToComboTousseGrid(items){
+	if(items.length == 0){
+		return;
+	}
+	var comboTousse_name = top.Ext4.getCmp('comboTousseName').getRawValue();
+	var comboTousse_id = top.Ext4.getCmp('comboTousseName').getValue();
+	
+	var tousseDetail = "";
+    var tousseJsonArray = [];
+    
+    for ( var i = 0; i < items.length; i++) {
+        var record = items[i];
+        var id = record.id;
+        var tousseName = record.tousseName;
+        var amount = record.amount;
+        var packageType = record.packageType;
+        
+        var temp = tousseName + "x" +amount;
+        if (tousseDetail == null || tousseDetail.length <= 0) {
+        	tousseDetail = temp;
+        } else {
+        	tousseDetail = tousseDetail + ";" + temp;
+        }
+        
+        var tousseObj = {};
+        tousseObj.id = id;
+        tousseObj.tousseName = tousseName;
+        tousseObj.amount = amount;
+        tousseObj.packageType = packageType;
+        tousseJsonArray.push(tousseObj);
+    }
+    var type = top.Ext4.getCmp("comboToussePackageType").getValue();
+    
+    var comboTousseDataGridStore = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+    
+    
+    if(tousseDetail != ""){
+        var item = [{
+        	comboId : comboTousse_id,
+            tousseName : comboTousse_name,
+            printAmount: 1,
+            amount: 1,
+            includeTousseDetail : tousseDetail,
+            includeTousseJsonArray : tousseJsonArray,
+            packageType : type
+        }];
+        comboTousseDataGridStore.add(item);
+    }else{
+        showResult("请选择聚合的器械包!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+    }
+}
+
 /**
  *<< 或 <<<<
  */
@@ -358,6 +458,28 @@
 		  ]
 	})
     
+    comboTousseStore.on("beforeload", function(thiz, options) {
+    	comboTousseStore.proxy.extraParams["comboTousseOrgUnitCoding"] = top.Ext4.getCmp("comboToussePacking_orgUnit").getValue();
+    	
+	});
+    
+  //申请科室Store
+    var allComboTousseDefinitionDepartStoreExt2 = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllComboTousseDefinitionDepart.do',
+			reader : {
+				type : 'json',
+                totalProperty : 'totalCount',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'id',mapping : 'id'}, 
+		    {name : 'name',mapping : 'name'}
+		  ]
+	})
+
     var tbar = [{
     	text:'聚合包名称:'
     },{
@@ -466,7 +588,7 @@
     var waitComboTousseGrid = top.Ext4.create('cellEditingGrid', {
     	id : 'waitComboTousseGrid',
     	title : '器械包列表',
-    	height: 250,
+    	height: 328,
     	selModel: selModel,
     	border : false,
     	tbar : tbar,
@@ -548,8 +670,8 @@
     var comboTousseDataGrid = top.Ext4.create('cellEditingGrid', {
 		id : 'comboTousseDataGrid',
 		title : '聚合包列表',
-		width:300,
-    	height: 300,
+//		width:300,
+    	height: 328,
     	border : false,
 		store: new Ext4.data.Store({
         	fields : [
@@ -588,7 +710,7 @@
 	        header : "聚合包名称",
 	        dataIndex : 'tousseName',
 	        sortable:false,
-	        width : 280
+	        width : 200
 	    }, {
             header : "打印数量",
             dataIndex : 'printAmount',
@@ -622,7 +744,7 @@
         },{
 	        header : "包装类型",
 	        dataIndex : 'packageType',
-	        width : 170,
+	        width : 100,
 	        sortable:false,
 	        editor : new top.Ext4.form.field.ComboBox({
 	            typeAhead: true,
@@ -638,6 +760,25 @@
 	        dataIndex : 'includeTousseDetail',
 	        sortable:false,
 	        width : 380
+	    }],
+	    tbar:[{
+	    	xtype:'button',
+	    	text : '删除',
+	    	handler: function(){
+	    		var records = comboTousseDataGrid.getSelectionModel().getSelection();
+	    		if (records.length == 0) {
+	    	        showResult("请选择要删除的聚合包！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	    	        return false;
+	    	    }
+	    		for(var i = 0 ; i < records.length ; i++){
+	    			var record = records[i];
+	    			var amount = record.data['amount'];
+	    			
+	    			addRestAmount(record,amount);
+	    			
+	    			comboTousseDataGrid.getStore().remove(record);
+	    		}
+	    	}
 	    }]
 	});
     
@@ -884,11 +1025,13 @@
     				var comboTousseDataGrid = top.Ext4.getCmp("comboTousseDataGrid").getStore();
     				comboTousseDataGrid.removeAll();
     				
+    				comboTousseStore.reload();
                 }
             }
         }],
         buttons : [{
             text : packingBtnText,
+            hidden :fromPortal,
             handler : function() {
             	continuePacking = false;
             	onPackingBtnClick(this);
@@ -905,8 +1048,8 @@
     var comboTousseWin = new top.Ext4.window.Window( {
     	id : 'comboTousseWin',
         title : '装配聚合包',
-        width : 850,
-        height: 630,
+        width : 1000,
+        height: 500,
         resizable :false,
 		modal : true,
 		border : false,
@@ -924,46 +1067,51 @@
             items : [
             {
                 layout : 'form',
-                columnWidth : 0.47,
+                columnWidth : 0.4,
                 items : [ waitComboTousseGrid ]
             },{
                 layout : 'form',
-                columnWidth : 0.06,
+                columnWidth : 0.05,
                 buttonAlign:'center',
-                height : 250,
+                height : 328,
                 items : [
                 {   height :60,
                     border:false
                 }, {
                     xtype :'button',
+                    hidden: true,
                     text : '>>',
                     minWidth:48,
                     handler : function(){
                     	toComboTousseGrid(false);
                     }
                 }, {
                     xtype :'button',
+                    hidden: true,
                     text : '<<',
                     minWidth:48,
                     handler : function(){
                     	toTousseGrid(false);
                     }
                 }, {
                     xtype :'button',
+                    hidden: true,
                     text : '>>>>',
                     minWidth:48,
                     handler : function(){
                     	toComboTousseGrid(true);
                     }
                 }, {
                     xtype :'button',
+                    hidden: true,
                     text : '<<<<',
                     minWidth:48,
                     handler : function(){
                     	toTousseGrid(true);
                     }
                 },{
                     xtype :'button',
+                    hidden: true,
                     text:'确定',
                     border:false,
                     minWidth:48,
@@ -972,17 +1120,20 @@
                     	var id = top.Ext4.getCmp('comboTousseName').getValue();
                     	comboTousseGrid(id,tousseName);
                     }
+                },{
+                    xtype :'button',
+                    text:'聚合',
+                    border:false,
+                    minWidth:48,
+                    handler : function(){
+                    	combo_confirm();
+                    }
                 } ]
             }, {
                 layout : 'form',
-                columnWidth : 0.47,
-                items : [ comboGrid ]
+                columnWidth : 0.55,
+                items : [ comboTousseDataGrid ]
             } ]
-        }, {
-            region : 'south',
-            height : 220,
-            layout : 'fit',
-            items : [ comboTousseDataGrid ]
         }]
     });
     
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp	(revision 25037)
@@ -0,0 +1,438 @@
+<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%>
+<%@page import="java.util.Map"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
+<%@page import="com.forgon.disinfectsystem.common.Constants"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.util.List"%>
+<%@page import="com.forgon.disinfectsystem.common.*"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+<%@ include file="/common/include_Ext2_Css.jsp"%>
+<%@ include file="/common/include_Ext42_Css.jsp"%>
+
+
+<%
+	LoginUserData loginUser = AcegiHelper.getLoginUser();
+	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+	String orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig();
+	String orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig();
+	double toussePriceFluctuation = supplyRoomConfigManager.getSystemParamsObj().getToussePriceFluctuation();
+	SupplyRoomConfig  syscfg = supplyRoomConfigManager.getSystemParamsObj();
+	
+	request.setAttribute("toussePriceFluctuation",toussePriceFluctuation);
+	request.setAttribute("orgUnitName",orgUnitName);
+	request.setAttribute("orgUnitCoding",orgUnitCoding);
+	request.setAttribute("userName",loginUser.getUserFullName());
+	request.setAttribute("userLoginName",loginUser.getUserName());
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    request.setAttribute("today", dateFormat.format(new Date()));
+    request.setAttribute("hospitalName", loginUser.getHospitalName());
+    request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
+    
+    String projectName = CssdUtils.getConfigProperty("project");
+    request.setAttribute("projectName", projectName);
+%>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"></link>
+
+<title>装配管理</title>
+
+<style type="text/css">
+.formItemMgn{
+	margin:2px,0px;
+}
+.mainTabCls{
+	margin:-12px,0;
+	
+}
+.itemTimeout{
+	background:red
+}
+</style>
+<!-- ImageShow 样式定义开始 -->
+<style type="text/css">
+#box {
+	width: 700px;
+	height: 420px;
+	text-align: center;
+	border: 0px solid #d3d3d3;
+	background: #fff;
+}
+
+#box p {
+	width: 700px;
+	height: 420px;
+	line-height: 420px; /* 行高等于高度 */
+}
+
+/* 兼容标准浏览器 */
+#box p:before {
+	content: ".";
+	margin-left: -5px;
+	font-size: 10px; /* 修复居中的小BUG */
+	visibility: hidden; /*设置成隐藏元素*/
+}
+
+#box p img {
+	margin-top: expression(( 420 - this.height)/2); /* CSS表达式用来兼容IE6/IE7 */
+	vertical-align: middle;
+	position:inherit;
+	border: 0px solid #ccc;
+}
+</style>
+<!-- ImageShow 样式定义结束 -->
+<!-- alertDiv样式 -->
+<style>
+.lightbox{width:155px;height:220px;background:#FFFFFF;border:5px solid #ccc;line-height:20px;display:none; margin:0}
+.lightbox dt{background:#f4f4f4;padding-left:20px;}
+.lightbox dd{ padding:5px; margin:0;word-wrap:break-word}
+</style>
+<!-- alertDiv样式 -->
+</head>
+<body>
+
+<!-- alertDiv样式 -->
+<dl id="idBox2" class="lightbox">
+    <dt>
+        <font><b id="title">配包注意事项</b>
+        &nbsp;&nbsp;&nbsp;&nbsp;
+        <input type="button" value="关闭 " onclick="hide();"/></font>
+    </dt>
+    <dd id="showWord" style="font-size:15px;color:red">
+              <!--  当天回收物品需要在每天6:00AM之前提交申请单。-->
+    </dd>
+</dl>
+<!-- alertDiv样式 -->
+<object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
+    <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
+</object>
+
+<div id="mainPackingView" style="height: 100%;width: 100%;"></div>
+<input type="hidden" id="userName" value="${userName}">
+<input type="hidden" id="userLoginName" value="${userLoginName}">
+<input type="hidden" id="departName" value="${orgUnitName}">
+<input type="hidden" id="departCoding" value="${orgUnitCoding}">
+</body>
+
+<%@ include file="/common/include_Ext2_Js.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@include file="/common/include_UseForgonGrid4_Js.jsp"%>
+<script type="text/javascript" src="${ctx}/js/LAB.js"></script>
+
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js" /></script>
+<script type="text/javascript" src="${ctx}/js/configUtils.js"></script>
+
+<script type="text/javascript" src="${ctx}/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/js/dateFormatAndCheck.js"></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/js/mapObject.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/camera.js" /></script>
+<script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+
+<!-- script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script-->
+<!-- alertDiv弹出框 -->
+<script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/CJL.0.1.min.js"></script>
+<script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js"></script>
+<script src="${ctx}/js/barcodeBtn.js"></script>
+<script>
+var timer, target, current, ab; 
+var isShown = false;
+function updateNote(note){
+	document.getElementById ("showWord").innerHTML = note;
+}
+function alertDiv(note,width){
+    document.getElementById ("showWord").innerHTML = note;
+    if(isShown){
+		return;
+	}
+    isShown = true;
+    ab = new AlertBox("idBox2",{
+        fixed:false,
+        onShow: function(){
+            clearTimeout(timer); 
+            this.box.style.width = width+5;
+            this.box.style.right = 0;
+            this.box.style.bottom = -ab.box.offsetHeight;
+            target = 0;
+            current = -ab.box.offsetHeight;
+            showDiv();
+            
+        },
+        onClose: function(){
+            clearTimeout(timer);
+        }
+    });
+    ab.show();
+}
+
+function showDiv(){
+	ab.box.style.bottom = ++current + "px";
+    if( current >= target ){
+    	clearTimeout(timer);
+    } else {
+        timer = setTimeout(showDiv,5);
+    }
+}
+
+
+function hide(){
+	isShown = false;
+	if(ab){
+	    target = -ab.box.offsetHeight;
+	    current = 0;
+	    hideDiv();
+	}
+}
+function hideDiv(){
+    ab.box.style.bottom = --current + "px";
+    if( current <= target ){
+        ab.close();
+    } else {
+        timer = setTimeout(hideDiv,5);
+    }
+}
+</script>
+
+
+<script type="text/javascript">
+var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
+var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>';
+var today = '<%=request.getAttribute("today")%>';
+var userName = '<%=request.getAttribute("userName")%>';
+var hospitalName = '<%=request.getAttribute("hospitalName")%>';
+var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
+var projectName = '<%=request.getAttribute("projectName")%>';
+var parm_s_type ="质量监测";
+//回收记录
+var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
+//申请单
+var taskType_application = '<%=PackingTask.TASK_APPLICATION%>';
+//退货重装
+var taskType_returnGoods = '<%=PackingTask.TASK_RETURNGOODS%>';
+//质量监测重新装配
+var taskType_qualityMonitor = '<%=PackingTask.TASK_QUALITY_MONITOR%>';
+//扫描篮筐允许的篮筐状态集合
+var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
+// 质量监测责任环节数组
+var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
+// 外来器械包类型
+var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
+var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
+var ERROR_CODE_SUCCESS = <%=Constants.ERROR_CODE_SUCCESS%>;
+var ERROR_CODE_NOT_FOUND = <%=Constants.ERROR_CODE_NOT_FOUND%>;
+var ERROR_CODE_LOST = <%=Constants.ERROR_CODE_LOST%>;
+var ERROR_CODE_OTHER = <%=Constants.ERROR_CODE_OTHER%>;
+
+var SSTS_QualityRecord_Create = true;
+<operation:authorize ifAnyGranted="SSTS_QualityRecord_Create">
+SSTS_QualityRecord_Create = false;
+</operation:authorize>
+var SSTS_Barcode_RePrint = true;
+<operation:authorize ifAnyGranted="SSTS_Barcode_RePrint">
+SSTS_Barcode_RePrint = false;
+</operation:authorize>
+var SSTS_DamageRecord_Create = true;
+<operation:authorize ifAnyGranted="SSTS_DamageRecord_Create">
+SSTS_DamageRecord_Create = false;
+</operation:authorize>
+var SSTS_PackingTask_Delete = true;
+<operation:authorize ifAnyGranted="SSTS_PackingTask_Delete">
+SSTS_PackingTask_Delete = false;
+</operation:authorize>
+var SSTS_QualityRecord_Create = true;
+<operation:authorize ifAnyGranted="SSTS_QualityRecord_Create">
+SSTS_QualityRecord_Create = false;
+</operation:authorize>
+var SSTS_HistoryPacking_Update = true;//历史装配记录修改权限
+<operation:authorize ifAnyGranted="SSTS_HistoryPacking_Update">
+SSTS_HistoryPacking_Update = false;
+</operation:authorize>
+var SSTS_HistoryPacking_Change_Patient = true;//转换病人权限
+<operation:authorize ifAnyGranted="SSTS_HistoryPacking_Change_Patient">
+SSTS_HistoryPacking_Change_Patient = false;
+</operation:authorize>
+var SSTS_RecyclingDetail_Print = true;
+<operation:authorize ifAnyGranted="SSTS_RecyclingDetail_Print">
+SSTS_RecyclingDetail_Print = false;
+</operation:authorize>
+var taskGroup = '${param.taskGroup}';
+
+var SSTS_SystemWarning_TousseGoods_delete = true;//包实例废弃权限
+<operation:authorize ifAnyGranted="SSTS_SystemWarning_TousseGoods_delete">
+SSTS_SystemWarning_TousseGoods_delete = false;
+</operation:authorize>
+
+//回收报损
+var LINKTYPE_RECYCLINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_RECYCLINGRECORD%>';
+//清洗报损
+var LINKTYPE_WASHANDDISINFECTRECORD = '<%=RecyclingDamageItem.LINKTYPE_WASHANDDISINFECTRECORD%>';
+//装配报损
+var LINKTYPE_PACKINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_PACKINGRECORD%>';
+var errorTypeAdd = '<%=RecyclingError.ERRORTYPE_ADD%>';
+var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
+var imageType_tousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
+var imageType_material = '<%=ImageFile.IMAGE_TYPE_MATERIAL%>';
+var imageType_packingTeaching = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
+var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
+var imageType_specification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>';
+var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
+var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
+
+var IMAGE_TYPE_MATERIAL_DETACHABLE = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>';
+var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>';
+var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
+var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
+
+var inspector = "";
+var operator = "";
+var reviewer = "";
+var wrapper = "";
+var sterileUserName = "";
+var inspectorCode = "";
+var operatorCode = "";
+var reviewerCode = "";
+var wrapperCode = "";
+var sterileUserCode = "";
+
+var isPrintUserFullName = '<%=supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName()%>';
+var type_lost = '<%=PackingTask.TYPE_LOST%>';
+var type_damage = '<%=PackingTask.TYPE_DAMAGE%>';
+
+<%
+    Map<String,String> packingConfig = ((Map<String,String>)session.getAttribute("packingConfig"));
+    if (packingConfig != null) {
+%>
+	inspector = '<%=packingConfig.get("inspector")%>';
+	inspectorCode = '<%=packingConfig.get("inspectorCode")%>';
+	operator = '<%=packingConfig.get("operator")%>';
+    operatorCode = '<%=packingConfig.get("operatorCode")%>';
+    reviewer = '<%=packingConfig.get("reviewer")%>';
+    reviewerCode = '<%=packingConfig.get("reviewerCode")%>';
+    sterileUserName = '<%=packingConfig.get("sterilizationUser")%>';
+    sterileUserCode = '<%=packingConfig.get("sterilizationUserCode")%>';
+    wrapper = '<%=packingConfig.get("wrapper")%>';
+    wrapperCode = '<%=packingConfig.get("wrapperCode")%>';
+<%
+    }
+%>
+//装配界面的配包人是否默认为上一次装配的配包人(未配置或配置为false以外的值表示是,为false表示否)
+var packingPageOperatorDefaultLastOperator = sstsConfig.packingPageOperatorDefaultLastOperator;
+//装配界面的审核人是否默认为上一次装配的审核人(未配置或配置为false以外的值表示是,为false表示否)
+var packingPageReviewerDefaultLastReviewer = sstsConfig.packingPageReviewerDefaultLastReviewer;
+
+//未补充丢失、报损是否可以装配
+var allowPackingWhenUnSupplementMaterial = getBoolValueFromJs("sstsConfig.allowPackingWhenUnSupplementMaterial",false);
+
+var jobType_inspector_name = inspector;
+
+var jobType_pack_name = '';
+var jobType_review_name = '';
+var jobType_sterile_name = sterileUserName;
+if(packingPageOperatorDefaultLastOperator != false){
+	jobType_pack_name = operator;
+}
+if(packingPageReviewerDefaultLastReviewer != false){
+	jobType_review_name = reviewer;
+}
+var jobType_wrapper_name = wrapper;
+
+var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
+//教学图片
+var teachingPicture = false;
+if (notInWhiteList(sstsConfig, 'teachingPicture')) {
+	teachingPicture = true;
+}
+// 说明书
+var specificationPicture = false;
+if (notInWhiteList(sstsConfig, 'specificationPicture')) {
+	specificationPicture = true;
+}
+//教学视频
+var teachingVideo = false;
+if (notInWhiteList(sstsConfig, 'teachingVideo')) {
+	teachingVideo = true;
+}
+</script>
+
+<%@ include file="/disinfectsystem/print/print.jsp"%>
+<script type="text/javascript" src="${ctx}/dwr/interface/TaskGroupTableManager.js"></script>	
+<script>
+$LAB
+	
+
+	.script("${ctx}/dwr/interface/TousseInstanceTableManager.js")
+	.script("${ctx}/dwr/interface/SterilizationRecordTableManager.js")
+	.script("${ctx}/dwr/interface/MaterialErrorDamageTableManager.js")
+	.script("${ctx}/dwr/interface/UserTableManager.js")
+	.script("${ctx}/dwr/interface/ExpirationDateInfoTableManager.js")
+	.script("${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js")
+	.script("${ctx}/dwr/interface/PackingTableManager.js")
+	.script("${ctx}/dwr/interface/ContainerTableManager.js")
+	
+	.script("${ctx}/ext/ext_datefield/Datetime.js")
+	
+	
+	.script("${ctx}/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js")
+	.script("${ctx}/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js")
+	.script("${ctx}/dwr/interface/BarcodeTableManager.js")
+	<!-- 引入图片预览显示的js -->
+	.script("${ctx}/imageShow/imageShow.js")
+	
+	.script("${ctx}/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js")
+	<!-- 打印函数 -->
+	.script("${ctx}/disinfectsystem/print/LodopFuncs.js")
+	.script("${ctx}/disinfectsystem/print/print.js")
+
+	.script("${ctx}/disinfectsystem/print/printApplicationGoods.js").wait()//printConfig.js中的代码有依赖于print.js中的代码
+	.script("${ctx}/disinfectsystem/config/${profile}/print/printConfig.js")
+	
+	<!-- 器械报损 -->
+ 	.script("${ctx}/dwr/interface/SupplyRoomConfigTableManager.js")
+ 	.script("${ctx}/dwr/interface/TousseDefinitionTableManager.js")
+ 	.script("${ctx}/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js")
+ 	.script("${ctx}/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js")
+ 	.script("${ctx}/dwr/interface/RecyclingApplicationTableManager.js")
+	
+	<!-- 质量监测 -->
+ 	.script("${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js")
+ 	.script("${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js")
+ 	.script("${ctx}/dwr/interface/IDCardDefinitionTableManager.js")
+	<!-- 重新打印条码windows -->
+	.script("rePrintBarcodeWin.js")
+	
+	<!-- 外来器械拆包 -->
+	.script("splitForeignTousseView.js")
+	.script("${ctx}/disinfectsystem/packing/printRecyclingDetailWin.js")
+	
+	<!-- 聚合包装配  -->
+	.script("comboToussePackingView.js")
+	
+	<!-- 外来器械包转换病人 -->
+	.script("${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js")
+	.script("${ctx}/dwr/interface/DataSynchronizationTableManager.js")
+	
+	.script("tousesPackingTeachingImage.js")
+	.script("tousesPackingNoteWindow.js")
+	
+	.script("comboToussePackingView0.js")
+	
+</script>
+
+
+
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView0.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView0.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView0.js	(revision 25037)
@@ -0,0 +1,64 @@
+
+
+//记住最后选择的器械包图片名称、类型、视频名称、包定义id;用于查看材料图片后再次查询器械包
+var lastSelectTousseName;
+var lastSelectimageTypeTousse;
+var lastSelectVedioName;
+var lastSelectTdId;
+
+var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
+var packedToussesArray = [];// 用于一次打印所有装配的包
+var tousseesToPrint = [];
+var formPanel;
+var deletePackingTask;
+var showTousseDamageMaterial;
+var idCardBarcode = '';
+var idCardInstanceID = '';
+var idCardInfo = null;
+
+var currentIDCardInfo = null;
+var idCardTaskNode = null;
+var MATERIAL_NAME_IDCARD = "器械包标识牌";
+var packingBtnText = "装配并打印标签";
+if (sstsConfig.printLabelWhenReviewing == true){
+	packingBtnText = "装配无菌物品";
+}
+var packingPageAutoSetSterilizationProgramAfterSelectTousse = true;
+var allowForeignToussePartiallyPacking = false;
+var taskGroupObj = null;
+//丢失报损按钮响应函数
+var onErrorDamageBtnClick = null;
+var curSelMaterialName = null;
+var curSelMaterialId = null;
+
+//判断是否ie和ie7
+var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
+var appDepartJsonStore = new Ext4.data.Store({
+	//limit参数，每页显示条数，默认为25
+	pageSize: isIE6OrIE7 ? 15 : 50,
+	autoLoad:false,
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+		reader : {
+			type : 'json',
+			totalProperty : 'totalCount',
+			root : 'data'
+		}
+	},
+	fields : [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'}
+	  ]
+});
+
+
+Ext4.onReady(function() {
+	fromPortal = true;
+	taskGroupObj = getTaskGroupObjByName(taskGroup);
+	packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse',true);
+	allowForeignToussePartiallyPacking = getBoolValueFromJs('sstsConfig.allowForeignToussePartiallyPacking',false);
+	
+	packingComboTousse();
+});
+
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r24805 -r25037
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 24805)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 25037)
@@ -12,6 +12,7 @@
 		<portalItem type="2" system="1" title="回收清点" itemId="recyclingRecordTouchScreen" operationIds="SSTS_RecycRecord_Create,SSTS_RecycRecord_Update,SSTS_RecycRecord_Select,SSTS_RecycRecord_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingRecord.png" itemLinkUrl="/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp" />
 		<portalItem type="1" system="1" title="清洗消毒" itemId="washAndDisinfect" operationIds="SSTS_WashRecord_Create,SSTS_WashRecord_Update,SSTS_WashRecord_Select,SSTS_WashRecord_Delete" imgUrl="/themes/portalPage/img/tabs_washAndDisinfect.png" itemLinkUrl="/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true" itemLinkBootstrapUrl="/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp" />
 		<portalItem type="3" system="1" title="装配管理" contextKey="taskGroup" itemId="packing" operationIds="SSTS_PackingTask_Delete,SSTS_HistoryPacking_Manager,SSTS_HistoryPacking_Update,SSTS_RecyclingDetail_Print" imgUrl="/themes/portalPage/img/tabs_packing.png" itemLinkUrl="/disinfectsystem/packing/packingView.jsp" itemLinkBootstrapUrl="/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp" />
+		<portalItem type="3" system="1" title="装配聚合包" contextKey="taskGroup" itemId="comboToussePacking" operationIds="SSTS_PackingTask_Delete,SSTS_HistoryPacking_Manager,SSTS_HistoryPacking_Update,SSTS_RecyclingDetail_Print" imgUrl="/themes/portalPage/img/tabs_packing.png" itemLinkUrl="/disinfectsystem/packing/comboToussePackingView.jsp" itemLinkBootstrapUrl="/disinfectsystem/packing/comboToussePackingView.jsp" />
 		<portalItem type="3" system="1" title="审核打包" contextKey="taskGroup" itemId="reviewPacking" operationIds="SSTS_Tousse_Review" imgUrl="/themes/portalPage/img/tabs_reviewPacking.png" itemLinkUrl="/disinfectsystem/packing/reviewView.jsp" itemLinkBootstrapUrl="/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp" />
 		<portalItem type="1" system="1" title="灭菌装载" itemId="sterilizationLoading" operationIds="SSTS_Sterilization_Loading" imgUrl="/themes/portalPage/img/tabs_sterilizationLoading.png" itemLinkUrl="/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp" itemLinkBootstrapUrl="/dx-disinfectsystem/pages/disinfectsystem/sterilizationLoad/sterilizationLoad.jsp" />
 		<portalItem type="1" system="1" title="外部代理灭菌" itemId="foreignProxySterilizationManage" operationIds="SSTS_ForeignProxyDisinfection_Create,SSTS_ForeignProxyDisinfection_Update,SSTS_ForeignProxyDisinfection_Select,SSTS_ForeignProxyDisinfection_Delete,SSTS_ForeignProxyDisinfection_Apply" imgUrl="/themes/portalPage/img/tabs_foreignProxySterilizationManage.png" itemLinkUrl="/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp?editMode=true" />
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js
===================================================================
diff -u -r24913 -r25037
--- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js	(.../config.js)	(revision 24913)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js	(.../config.js)	(revision 25037)
@@ -137,5 +137,7 @@
   //发货单是否合并打印，如果为true,则把一次性物品、消毒物品、器械包打印到一张单,false或者不配置，都是分三张单打印
   mergePrintInvoiceGoods : false,
   //审核器械包是否必须入篮筐（一级供应室用户进行审核时）
-  mustScanBasketForTousseReview : true
+  mustScanBasketForTousseReview : true,
+  //首页是否显示装配聚合包
+  portal_showComboToussePackingIcon: true
 }
\ No newline at end of file