Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/addTousseByExpress.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r40651 -r41611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 40651)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 41611)
@@ -108,13 +108,22 @@
 	   };
 	   
 	   if(sstsConfig.enableUserManuallyCloseAddTousseWindow){
+			if(window.parent.updateToussItem && window.parent.updateToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
+				return
+			}else {
+				alertDiv(tousseName + "，回收列表已存在！");
+			}
 			if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
 				window.parent.highlightExistTousseItem(row);
 				window.parent.updateTousseIndex();
 			}else {
 				alertDiv(tousseName + "，回收列表已存在！");
 			}
 	   }else {
+			if(window.parent.updateToussItem && window.parent.updateToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
+				closeLayer();
+				return
+			}
 			if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
 				window.parent.highlightExistTousseItem(row);
 				window.parent.updateTousseIndex();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
===================================================================
diff -u -r37639 -r41611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 37639)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 41611)
@@ -54,10 +54,17 @@
 	function submit() {
 		var itemJson = sessionStorage.getItem('itemJson');
 		var itemArray = $.parseJSON(itemJson);
+		var firstRow = $('#row_0').val();
 		for(var i=0;i<itemArray.length;i++){
 			var urgentAmount = parseInt($('#urgentAmount_'+i).html(),10);
-			var urgentLevel = $('#urgentLevelTd_'+i+' select').val()
+			var urgentLevelValue = $('#urgentLevelTd_'+i+' select').val()
 			var urgentLevelSelectVal = $('#urgentLevelTd_'+i+' select option:selected').val();
+			var grade = 0;
+			var urgentLevel = '';
+			if(urgentLevelValue !== ''){
+				urgentLevel = urgentLevelValue.split(';')[0]
+				grade = urgentLevelValue.split(';')[1] || 0;
+			}
 			var ulObj = getUrgentLevel(urgentLevel);
 			var row = $('#row_'+i).val();
 			var checkbox = $('#checkbox_'+i).is(':checked');
@@ -82,10 +89,16 @@
 						}
 					}
 				}
-				window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel,colorCode);
+				window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel,colorCode,grade);
 			}
-			
 		}
+		try{
+			if(window.parent.reloadFirstUrgent){
+				window.parent.reloadFirstUrgent(firstRow.split('_')[0]+'_'+firstRow.split('_')[1])
+			}
+		}catch{
+
+		}
 		closeLayer();
 	}
 
@@ -202,19 +215,19 @@
 						if(urgentLevels[j].additionalInfo == '是' && urgentLevels[j].name !== urgentName){
 							continue;
 						}else if(urgentLevels[j].additionalInfo == '是' && urgentLevels[j].name == urgentName){
-							el += '<option value="'+urgentLevels[j].name+'"';
+							el += '<option value="'+urgentLevels[j].name+';'+urgentLevels[j].grade+'"';
 							el += ' selected="selected"';
 							el += ' disabled hidden>'+urgentLevels[j].name+'</option>';
 							$('#additionalInfo').show();
 							continue;
 						}
 					}
-					el += '<option value="'+urgentLevels[j].name+'"';
+					el += '<option value="'+urgentLevels[j].name+';'+urgentLevels[j].grade+'"';
 					if(urgentLevels[j].name == urgentName){
 						el += ' selected="selected"';
 					}
 					el += '>'+urgentLevels[j].name+'</option>';
-					urgentOptionHtml += '<option value="'+urgentLevels[j].name+'">'+urgentLevels[j].name+'</option>';
+					urgentOptionHtml += '<option value="'+urgentLevels[j].name+';'+urgentLevels[j].grade+'">'+urgentLevels[j].name+'</option>';
 				}
 				el += '</select></td>';
 				$("#changeUrgentAll").html(urgentOptionHtml);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/allIntoBasketByExpress.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js
===================================================================
diff -u -r41448 -r41611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js	(.../expressRecycleForTouchScreen.js)	(revision 41448)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js	(.../expressRecycleForTouchScreen.js)	(revision 41611)
@@ -115,114 +115,44 @@
 }
 
 function add(row) {
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        if (row.split('_').length == 1) {
-            var loadedAmount = parseInt($('#loadedAmount' + row + '_0').val(), 10);
-            if (parseInt(loadedAmount) > 0) {
-                alertDiv("已经放入篮筐，不能再修改！");
-                return;
-            }
-        }
-    } else {
-        var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
-        if (parseInt(loadedAmount) > 0) {
-            alertDiv("已经放入篮筐，不能再修改！");
-            return;
-        }
+    var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+    if (parseInt(loadedAmount) > 0) {
+        alertDiv("已经放入篮筐，不能再修改！");
+        return;
     }
     var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) + 1;
     if (recycleAmount <= 9999) {
         $('#recycleAmount' + row).val(recycleAmount);
-        if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-            if (row.split('_').length == 1) {
-                var newRecycleAmount = $('#recycleAmount' + row + '_0').val() == '' ? 0 : parseInt($('#recycleAmount' + row + '_0').val(), 10) + 1;
-                if (newRecycleAmount <= 9999) {
-                    $('#recycleAmount' + row + '_0').val(newRecycleAmount);
-                } else {
-                    alertDiv("最大回收数量为9999，不能大于该数量！");
-                }
-            } else {
-                valiAmount(row.split('_')[0]);
-            }
-        }
     } else {
         alertDiv("最大回收数量为9999，不能大于该数量！");
     }
 }
 
 function reduce(row) {
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        if (row.split('_').length == 1) {
-            var loadedAmount = parseInt($('#loadedAmount' + row + '_0').val(), 10);
-            if (parseInt(loadedAmount) > 0) {
-                alertDiv("已经放入篮筐，不能再修改！");
-                return;
-            }
-        }
-    } else {
-        var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
-        if (parseInt(loadedAmount) > 0) {
-            alertDiv("已经放入篮筐，不能再修改！");
-            return;
-        }
+    var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+    if (parseInt(loadedAmount) > 0) {
+        alertDiv("已经放入篮筐，不能再修改！");
+        return;
     }
     var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) - 1;
     if (recycleAmount >= 0) {
         $('#recycleAmount' + row).val(recycleAmount);
-        if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-            if (row.split('_').length == 1) {
-                var childCount = parseInt($('#childCount' + row).val(), 10);
-                if (childCount > 0) {
-                    for (var i = 0; i < childCount; i++) {
-                        var recycleAmount2 = $('#recycleAmount' + row + '_' + i).val() == '' ? 0 : parseInt($('#recycleAmount' + row + '_' + i).val(), 10);
-                        if (recycleAmount2 > 0) {
-                            var newRecycleAmount2 = recycleAmount2 - 1;
-                            $('#recycleAmount' + row + '_' + i).val(newRecycleAmount2);
-                            break;
-                        }
-                    }
-                }
-            } else {
-                valiAmount(row.split('_')[0]);
-            }
-        }
     }
 }
 
 function unloadStaff(name, amount, applicationId) {
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#tousseItemTbody').children().first().children().each(function (row, element) {
-            var childCount = $('#childCount' + row).val();
-            var parentLoadedAmount = $('#loadedAmount' + row).val();
-            for (var i = 0; i < childCount; i++) {
-                if ($('#tousseName' + row + '_' + i).val() == name && applicationId == $('#applicationId' + row + '_' + i).val()) {
-                    var newLoadedAmount = parseInt($('#loadedAmount' + row + '_' + i).val(), 10) - parseInt(amount, 10);
-                    $('#loadedAmount' + row + '_' + i).val(newLoadedAmount);
-                    var parentLoadedAmount = parseInt($('#loadedAmount' + row).val(), 10) - parseInt(amount, 10);
-                    $('#loadedAmount' + row).val(parentLoadedAmount);
-                    if (newLoadedAmount > 0) {
-                        document.getElementById('showTousseName' + row + '_' + i).className = 'input-a-yellow3';
-                    } else {
-                        document.getElementById('showTousseName' + row + '_' + i).className = 'input-a';
-                    }
-                    return false;
-                }
+    $('#tousseItemTbody').children().first().children().each(function (i, element) {
+        if ($('#tousseName' + i).val() == name && applicationId == $('#applicationId' + i).val()) {
+            var newLoadedAmount = parseInt($('#loadedAmount' + i).val(), 10) - parseInt(amount, 10);
+            $('#loadedAmount' + i).val(newLoadedAmount);
+            if (newLoadedAmount > 0) {
+                document.getElementById('showTousseName' + i).className = 'input-a-yellow3';
+            } else {
+                document.getElementById('showTousseName' + i).className = 'input-a';
             }
-        });
-    } else {
-        $('#tousseItemTbody').children().first().children().each(function (i, element) {
-            if ($('#tousseName' + i).val() == name && applicationId == $('#applicationId' + i).val()) {
-                var newLoadedAmount = parseInt($('#loadedAmount' + i).val(), 10) - parseInt(amount, 10);
-                $('#loadedAmount' + i).val(newLoadedAmount);
-                if (newLoadedAmount > 0) {
-                    document.getElementById('showTousseName' + i).className = 'input-a-yellow3';
-                } else {
-                    document.getElementById('showTousseName' + i).className = 'input-a';
-                }
-                return false;
-            }
-        });
-    }
+            return false;
+        }
+    });
 }
 
 function delBasketItem(liElement) {
@@ -626,48 +556,39 @@
             layer.close(index);
             return
         }
-        if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-            for (var row = 0; row < length; row++) {
-                var childCount = $('#childCount' + row).val();
-                if (childCount && childCount > 0) {
-                    putTousseInTheBasketForChild(row);
-                }
-            }
-        } else {
-            for (var i = 0, k = 0; i < length; i++) {
-                var that = $('#tousseItemsTr' + i).find('td').find('a');
-                var amount = parseInt($('#recycleAmount' + i).val(), 10) - parseInt($('#loadedAmount' + i).val(), 10);
-                var tousseName = $('#tousseName' + i).val();
-                var showTousseName = $('#showTousseName' + i).val();
-                var isCleanedEntirely = $('#isCleanedEntirely' + i).val();
-                var tousseDefinitionID = $('#tousseDefinitionID' + i).val();
-                var app_id = $('#applicationId' + i).val();
-                var invoicePlanVersion = $('#invoicePlanVersion' + i).val();
-                var orgUnitName = $('#depart').val();
+        for (var i = 0, k = 0; i < length; i++) {
+            var that = $('#tousseItemsTr' + i).find('td').find('a');
+            var amount = parseInt($('#recycleAmount' + i).val(), 10) - parseInt($('#loadedAmount' + i).val(), 10);
+            var tousseName = $('#tousseName' + i).val();
+            var showTousseName = $('#showTousseName' + i).val();
+            var isCleanedEntirely = $('#isCleanedEntirely' + i).val();
+            var tousseDefinitionID = $('#tousseDefinitionID' + i).val();
+            var app_id = $('#applicationId' + i).val();
+            var invoicePlanVersion = $('#invoicePlanVersion' + i).val();
+            var orgUnitName = $('#depart').val();
 
-                if (amount > 0 && that.is(":visible")) {
-                    if (amount <= 9999) {
-                        amountArray[k] = {
-                            amount: amount,
-                            tousseName: tousseName,
-                            showTousseName: showTousseName,
-                            isCleanedEntirely: isCleanedEntirely,
-                            tousseDefinitionID: tousseDefinitionID,
-                            app_id: app_id,
-                            invoicePlanVersion: invoicePlanVersion,
-                            orgUnitName: orgUnitName || '',
-                            index: i
-                        };
-                        k++
-                    }
+            if (amount > 0 && that.is(":visible")) {
+                if (amount <= 9999) {
+                    amountArray[k] = {
+                        amount: amount,
+                        tousseName: tousseName,
+                        showTousseName: showTousseName,
+                        isCleanedEntirely: isCleanedEntirely,
+                        tousseDefinitionID: tousseDefinitionID,
+                        app_id: app_id,
+                        invoicePlanVersion: invoicePlanVersion,
+                        orgUnitName: orgUnitName || '',
+                        index: i
+                    };
+                    k++
                 }
             }
-            if (amountArray.length == 0) {
-                alertDiv('没有可以放入篮筐的器械包。');
-            } else {
-                putTousseInTheBasketAll(amountArray);
-            }
         }
+        if (amountArray.length == 0) {
+            alertDiv('没有可以放入篮筐的器械包。');
+        } else {
+            putTousseInTheBasketAll(amountArray);
+        }
 
         layer.close(index);
     }, 100);
@@ -780,9 +701,6 @@
 
 var openElement;
 function openUpdateAmount(obj, row) {
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        return
-    }
     obj.blur();
     var width = 900;
     var height = 500;
@@ -896,7 +814,7 @@
     }
     html += '</td>';
     if (itemLevel !== 1) {
-        if (!applyTimeHidden && departExpressRecycling == '') {
+        if (!applyTimeHidden) {
             html += '<td width="' + td0 + '">' + applicationDate + '</td>';
         }
         html += '<td width="' + td1 + '"><input id="showTousseName' + row + '" name="showTousseName' + row + '" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="' + showTousseName + '"/></td>';
@@ -963,53 +881,26 @@
         alertDiv('该科室没有申请回收。');
         return false;
     }
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#tousseItemTbody').children().first().children().each(function (row, element) {
-            var childCount = $('#childCount' + row).val();
-            for (var i = 0; i < childCount; i++) {
-                var deleted = $('#deleted' + row + '_' + i).val();
-                var recycleAmount = parseInt($('#recycleAmount' + row + '_' + i).val(), 10);
-                var loadedAmount = parseInt($('#loadedAmount' + row + '_' + i).val(), 10);
-                var depart = $('#depart' + row + '_' + i).val();
-                var showTousseName = $('#showTousseName' + row + '_' + i).val();
-                if (deleted == '0') {
-                    if (loadedAmount != 0) {
-                        isThereTousseItems = true;
-                        if (recycleAmount == '' || recycleAmount == 0) {
-                            isThereRecycleAmountEmpty = true;
-                            return false;
-                        }
-                    }
-                    if (loadedAmount > 0 && recycleAmount > loadedAmount) {
-                        submitCheckFaildMsg = (depart + " 的  " + showTousseName + " 还有 " + (recycleAmount - loadedAmount) + " 个未放入篮筐。");
-                        return false;
-                    }
-                }
-
-            }
-        });
-    } else {
-        $('#tousseItemTbody').children().first().children().each(function (index, element) {
-            var deleted = $('#deleted' + index).val()
-            var recycleAmount = parseInt($('#recycleAmount' + index).val(), 10);
-            var loadedAmount = parseInt($('#loadedAmount' + index).val(), 10);
-            var depart = $('#depart' + index).val();
-            var showTousseName = $('#showTousseName' + index).val();
-            if (deleted == '0') {
-                if (loadedAmount != 0) {
-                    isThereTousseItems = true;
-                    if (recycleAmount == '' || recycleAmount == 0) {
-                        isThereRecycleAmountEmpty = true;
-                        return false;
-                    }
-                }
-                if (loadedAmount > 0 && recycleAmount > loadedAmount) {
-                    submitCheckFaildMsg = (depart + " 的  " + showTousseName + " 还有 " + (recycleAmount - loadedAmount) + " 个未放入篮筐。");
+    $('#tousseItemTbody').children().first().children().each(function (index, element) {
+        var deleted = $('#deleted' + index).val()
+        var recycleAmount = parseInt($('#recycleAmount' + index).val(), 10);
+        var loadedAmount = parseInt($('#loadedAmount' + index).val(), 10);
+        var depart = $('#depart' + index).val();
+        var showTousseName = $('#showTousseName' + index).val();
+        if (deleted == '0') {
+            if (loadedAmount != 0) {
+                isThereTousseItems = true;
+                if (recycleAmount == '' || recycleAmount == 0) {
+                    isThereRecycleAmountEmpty = true;
                     return false;
                 }
             }
-        });
-    }
+            if (loadedAmount > 0 && recycleAmount > loadedAmount) {
+                submitCheckFaildMsg = (depart + " 的  " + showTousseName + " 还有 " + (recycleAmount - loadedAmount) + " 个未放入篮筐。");
+                return false;
+            }
+        }
+    });
     if (!isThereTousseItems) {
         alertDiv('回收记录中至少要有一条所回收器械包信息。');
         return false;
@@ -1545,89 +1436,29 @@
 
     var params = {}
 
-    //GDSFYBJY-29：科室快速回收
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        params.type = departExpressRecycling;
-        params.departCoding = departCoding;
-    } else {
-        var selectDepartGroupId = $("#inputselect").val(); //科室分组过滤 
-        var tousseGroupSelect = $('#tousseGroupSelect').val();  //器械包分组过滤
-        params.tousseGroupId = tousseGroupSelect;
-        params.departmentGroupId = selectDepartGroupId;
-    }
+    var selectDepartGroupId = $("#inputselect").val(); //科室分组过滤 
+    var tousseGroupSelect = $('#tousseGroupSelect').val();  //器械包分组过滤
+    params.tousseGroupId = tousseGroupSelect;
+    params.departmentGroupId = selectDepartGroupId;
 
     $.ajax({
         type: 'post',
         url: WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForQuickRecyclingTousse.do',
         dataType: 'json',
         data: params,
         success: function (msg) {
-            if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-                for (var i = 0; i < msg.length; i++) {
-                    var item = msg[i];
-                    var m = 0;
-                    for (var itemDate in item) {
-                        var date = itemDate;
-                        var paramsItem = {
-                            isThereIdentificationCard: '否',
-                            depart: date,
-                            itemLevel: 1
-                        };
-                        addToussItem(paramsItem);
-                        for (var tousse in item[date]) {
-                            var tousseName = tousse;
-                            var paramsItem = {
-                                row: m,
-                                depart: '展开',
-                                tousseName: tousseName,
-                                applicationAmount: 1,
-                                isThereIdentificationCard: '否',
-                                recycleAmount: 1,
-                                itemLevel: 2,
-                                childCount: item[date][tousseName].length
-                            };
-                            addToussItem(paramsItem);
-                            var sumApplicationAmount = 0;
-                            var sumRecycleAmount = 0;
-                            for (var k = 0; k < item[date][tousseName].length; k++) {
-                                var lastTousseItem = item[date][tousseName][k];
-                                var paramsItem = lastTousseItem;
-                                var recycleAmount = lastTousseItem.prepareRecycleAmount;
-                                if (recycleAmount == null || recycleAmount == 0) {
-                                    recycleAmount = lastTousseItem.amount;
-                                }
-                                paramsItem.row = m + '_' + k;
-                                paramsItem.isThereIdentificationCard = '否';
-                                paramsItem.applicationAmount = lastTousseItem.amount;
-                                paramsItem.recycleAmount = recycleAmount;
-                                paramsItem.itemLevel = 3;
-                                paramsItem.childRow = m;
-                                paramsItem.depart = paramsItem.serialNumber;
-                                addToussItem(paramsItem);
-
-                                sumApplicationAmount += parseInt(lastTousseItem.amount)
-                                sumRecycleAmount += parseInt(lastTousseItem.amount)
-                            }
-                            $('#applicationAmount' + m).val(sumApplicationAmount);
-                            $('#recycleAmount' + m).val(sumRecycleAmount);
-                            m++;
-                        }
-                    }
+            for (var i = 0; i < msg.length; i++) {
+                var recycleAmount = msg[i].prepareRecycleAmount;
+                if (recycleAmount == null || recycleAmount == 0) {
+                    recycleAmount = msg[i].amount;
                 }
-            } else {
-                for (var i = 0; i < msg.length; i++) {
-                    var recycleAmount = msg[i].prepareRecycleAmount;
-                    if (recycleAmount == null || recycleAmount == 0) {
-                        recycleAmount = msg[i].amount;
-                    }
-                    var paramsItem = msg[i];
-                    paramsItem.row = i;
-                    paramsItem.isThereIdentificationCard = '否';
-                    paramsItem.applicationAmount = msg[i].amount;
-                    paramsItem.recycleAmount = recycleAmount;
+                var paramsItem = msg[i];
+                paramsItem.row = i;
+                paramsItem.isThereIdentificationCard = '否';
+                paramsItem.applicationAmount = msg[i].amount;
+                paramsItem.recycleAmount = recycleAmount;
 
-                    addToussItem(paramsItem);
-                }
+                addToussItem(paramsItem);
             }
             layer.close(index);
         },
@@ -1831,11 +1662,9 @@
             }
         }
     }
-    if (departExpressRecycling == '') {
-        if (!applyTimeHidden) {
-            $('#theadNameByApplyTimeName').show();
-            $('#theadNameByApplyTimeName').text(applyTimeText);
-        }
+    if (!applyTimeHidden) {
+        $('#theadNameByApplyTimeName').show();
+        $('#theadNameByApplyTimeName').text(applyTimeText);
     }
 }
 
@@ -1859,14 +1688,7 @@
     if (!sstsConfig.showBlankPageWhenOpenExpressRecyclePage) {
         loadItem();
     }
-    if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#currentDepart').show();
-        $('#changeDepart').show();
-        openSelectDepart(3);
-        $('#theadNameByDepartName').text('日期/流水号')
-    } else {
-        $('#divTousseGroup').show();
-        $('#divselect').show();
-        $('#theadNameByDepartName').text('科室名称')
-    }
+    $('#divTousseGroup').show();
+    $('#divselect').show();
+    $('#theadNameByDepartName').text('科室名称')
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.js	(revision 41611)
@@ -0,0 +1,2515 @@
+var progressbar = null;
+var progressLabel = null;
+var ab;
+var lock = false;
+var msgObj;
+var barcodeTemp = '';
+var basketBarcode = null;
+var tempBasketBarcode = "";
+var array = new Array();
+
+var isSecondSupplyRoom = false;
+if (supplyRoomType_val == '2') {
+    isSecondSupplyRoom = true;
+}
+
+var applyTimeHidden = true;
+var applyTimeText = '申请时间';
+
+layer.config({
+    extend: 'myskin/style.css', //加载您的扩展样式
+    skin: 'layer-ext-myskin'
+});
+
+function progress(i) {
+    progressbar.progressbar("option", { value: i });
+}
+
+//锁定键盘
+function lockup(e) { e.preventDefault(); }
+//高亮层不锁定
+function lockout(e) { e.stopPropagation(); }
+
+//SSZXYY-19：加急按钮的背景色更改为跟随加急等级变化
+function getUrgentColorName(urgentColorVal) {
+    if (urgentColorVal == "#ff0000") {
+        return 'urgent_red_color';
+    } else if (urgentColorVal == "#ff3300") {
+        return 'urgent_orange_red_color';
+    } else if (urgentColorVal == "#ff6600") {
+        return 'urgent_orange_color';
+    } else if (urgentColorVal == "#ff9900") {
+        return 'urgent_orange_yellow_color';
+    } else if (urgentColorVal == "#ffff00") {
+        return 'urgent_yellow_color';
+    } else if (urgentColorVal == "#99ff00") {
+        return 'urgent_yellow_green_color';
+    } else if (urgentColorVal == "#00ff00") {
+        return 'urgent_green_color';
+    } else if (urgentColorVal == "#00ffff") {
+        return 'urgent_blue_green_color';
+    } else if (urgentColorVal == "#0000ff") {
+        return 'urgent_blue_color';
+    } else if (urgentColorVal == "#6600ff") {
+        return 'urgent_blue_purple_color';
+    } else if (urgentColorVal == "#ff00ff") {
+        return 'urgent_purple_color';
+    } else if (urgentColorVal == "#ff0066") {
+        return 'urgent_purple_red_color';
+    } else {
+        return 'unUrgentBg'
+    }
+}
+
+function alertDiv(alertWord, hideCloseButton) {
+    lock = true;
+    document.getElementById("showWord").innerHTML = alertWord;
+    if (typeof (hideCloseButton) != 'undefined' && hideCloseButton) {
+        $('#idBoxClose').hide();
+        $("#progressbar").show();
+    }
+    else {
+        $('#idBoxClose').show();
+        $("#progressbar").hide();
+    }
+    ab = new AlertBox("idBox");
+    ab.onShow = function () {
+        if (lock) {
+            $$E.addEvent(document, "keydown", lockup);
+            $$E.addEvent(this.box, "keydown", lockout);
+            OverLay.show();
+        }
+    };
+    ab.onClose = function () {
+        $$E.removeEvent(document, "keydown", lockup);
+        $$E.removeEvent(this.box, "keydown", lockout);
+        OverLay.close();
+    };
+
+    ab.center = true;
+    ab.show();
+}
+
+function closeDiv() {
+    ab.close();
+}
+
+function filterApplication() {
+    loadItem();
+}
+
+function showMessage(message) {
+    if (document.getElementById('messageDiv') == null || !$('#messageDiv').dialog('isOpen')) {
+        $("<div id=\"messageDiv\"><font size=7>" + message + "</font></div>").dialog({
+            title: '提示',
+            width: 520,
+            modal: true,
+            show: {
+                effect: "explode",
+                duration: 1000
+            },
+            hide: {
+                effect: "explode",
+                duration: 1000
+            },
+            buttons: {
+                '关闭': function () {
+                    $(this).dialog("close");
+                }
+            }
+        });
+    }
+}
+
+function validateNumber(thiz) {
+    if (thiz.value.length == 1) {
+        thiz.value = thiz.value.replace(/[^1-9]/g, '');
+    } else {
+        thiz.value = thiz.value.replace(/\D/g, '');
+    }
+}
+
+function valiAmount(index) {
+    var childCount = parseInt($('#childCount' + index).val(), 10);
+    if (childCount > 0) {
+        var sumAmount = 0;
+        var sumLoadAmount = 0;
+        for (var i = 0; i < childCount; i++) {
+            var deleted = $('#deleted' + index + '_' + i).val();
+            if (parseInt(deleted) == 0) {
+                var recycleAmount = parseInt($('#recycleAmount' + index + '_' + i).val(), 10)
+                var loadedAmount = parseInt($('#loadedAmount' + index + '_' + i).val(), 10)
+                sumAmount += recycleAmount;
+                sumLoadAmount += loadedAmount;
+            }
+        }
+        $('#recycleAmount' + index).val(sumAmount);
+        $('#loadedAmount' + index).val(sumLoadAmount);
+    }
+}
+
+function add(row) {
+    if (row.split('_').length == 2) {
+        var loadedAmount = parseInt($('#loadedAmount' + row + '_0').val(), 10);
+        if (parseInt(loadedAmount) > 0) {
+            alertDiv("已经放入篮筐，不能再修改！");
+            return;
+        }
+    }
+    var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) + 1;
+    if (recycleAmount <= 9999) {
+        $('#recycleAmount' + row).val(recycleAmount);
+        if (row.split('_').length == 2) {
+            var newRecycleAmount = $('#recycleAmount' + row + '_0').val() == '' ? 0 : parseInt($('#recycleAmount' + row + '_0').val(), 10) + 1;
+            if (newRecycleAmount <= 9999) {
+                $('#recycleAmount' + row + '_0').val(newRecycleAmount);
+            } else {
+                alertDiv("最大回收数量为9999，不能大于该数量！");
+            }
+        } else {
+            valiAmount(row.split('_')[0] + '_' + row.split('_')[1]);
+        }
+    } else {
+        alertDiv("最大回收数量为9999，不能大于该数量！");
+    }
+}
+
+function reduce(row) {
+    if (row.split('_').length == 2) {
+        var loadedAmount = parseInt($('#loadedAmount' + row + '_0').val(), 10);
+        if (parseInt(loadedAmount) > 0) {
+            alertDiv("已经放入篮筐，不能再修改！");
+            return;
+        }
+    }
+    var recycleAmount = $('#recycleAmount' + row).val() == '' ? 0 : parseInt($('#recycleAmount' + row).val(), 10) - 1;
+    if (recycleAmount >= 0) {
+        $('#recycleAmount' + row).val(recycleAmount);
+        if (row.split('_').length == 2) {
+            var childCount = parseInt($('#childCount' + row).val(), 10);
+            if (childCount > 0) {
+                for (var i = 0; i < childCount; i++) {
+                    var recycleAmount2 = $('#recycleAmount' + row + '_' + i).val() == '' ? 0 : parseInt($('#recycleAmount' + row + '_' + i).val(), 10);
+                    var deleted = $('#deleted' + row + '_' + i).val();
+                    if (parseInt(deleted) == 0) {
+                        if (recycleAmount2 > 0) {
+                            var newRecycleAmount2 = recycleAmount2 - 1;
+                            $('#recycleAmount' + row + '_' + i).val(newRecycleAmount2);
+                            break;
+                        }
+                    }
+                }
+            }
+        } else {
+            valiAmount(row.split('_')[0] + '_' + row.split('_')[1]);
+        }
+    }
+}
+
+function unloadStaff(name, amount, applicationId) {
+    $('#tousseItemTbody').children().each(function (row, element) {
+        var id = $(element).attr('id').split('tousseItemsTr')[1];
+        var childCount = $('#childCount' + id).val();
+        var parentLoadedAmount = $('#loadedAmount' + id).val();
+        var deleted = $('#deleted' + id).val();
+        if (parseInt(deleted) == 0) {
+            var arr = id.split('_');
+            var parentId = arr[0] + '_' + arr[1];
+            if ($('#tousseName' + id).val() == name && applicationId == $('#applicationId' + id).val()) {
+                var newLoadedAmount = parseInt($('#loadedAmount' + id).val(), 10) - parseInt(amount, 10);
+                $('#loadedAmount' + id).val(newLoadedAmount);
+                var parentLoadedAmount = parseInt($('#loadedAmount' + parentId).val(), 10) - parseInt(amount, 10);
+                $('#loadedAmount' + parentId).val(parentLoadedAmount);
+                if (newLoadedAmount > 0) {
+                    document.getElementById('showTousseName' + id).className = 'input-a-yellow3';
+                } else {
+                    document.getElementById('showTousseName' + id).className = 'input-a';
+                }
+                setTousseItemLoadedAmountCss(id);
+            }
+        }
+    });
+    setParentTousseItemLoadedAmountCss();
+}
+
+function delBasketItem(liElement) {
+    var name, type, amount, applicationId, tousseNameForMaterial;
+    liElement.find('dl').children().each(function (i, element) {
+        if ($(this).is('input') && $(this).attr('title') == 'type') {
+            type = $(this).val();
+        } else if ($(this).is('input') && $(this).attr('title') == 'applicationId') {
+            applicationId = $(this).val();
+        } else if ($(this).is('input') && $(this).attr('title') == 'applicationId') {
+            applicationId = $(this).val();
+        } else if ($(this).is('input') && $(this).attr('title') == 'tousseName') {
+            tousseNameForMaterial = $(this).val();
+        } else if ($(this).is('dd') && $(this).attr('class') == 'name') {
+            name = $(this).text();
+        } else if ($(this).is('dd') && $(this).attr('class') == 'num') {
+            amount = $(this).text();
+            unloadStaff(name, amount, applicationId);
+        }
+    });
+}
+
+//删除整个篮筐
+function deleteBasket(deleteButton, basketBarcode, basketId) {
+    var liElement = $(deleteButton).parent().parent();
+    var delBasktJsonStr = liElement.find('input').val();
+    var basketJson = JSON.parse(delBasktJsonStr);
+    $("#basketsUl li").each(function () {
+        var hideStr = $(this).find('input').val();
+        var hiddenjson = JSON.parse(hideStr);
+        var actionBasketBarcode = basketJson.barcode;
+        if (hiddenjson.barcode == actionBasketBarcode) {
+            deleteAction(this);
+            $(this).remove();
+        }
+    });
+}
+
+/**
+ * 由于删除篮筐中的一个物品后，数组长度发生变化，继续循环删除其他物品就会报错,所以每次只循环一次就跳出循环，重新获取数组长度继续循环
+ */
+function deleteAction(thiz) {
+    $(thiz).find('dl').children().each(function (i, element) {
+        if ($(this).attr('class') == 'del') {
+            var deleteButton = $(this).find('a');
+            deleteBasketItem(deleteButton);
+            return false;//跳出each循环
+        }
+    });
+    if ($(thiz).find('dl').children().length > 0) {
+        deleteAction(thiz);
+    }
+}
+
+function deleteMaterialItem(deleteButton, containerBarcode, basketId) {
+    var hideElement = $(deleteButton).parent().prev().prev().prev();
+    var nameElement = $(deleteButton).parent().prev().prev();
+    var amountElement = $(deleteButton).parent().prev();
+    var delElement = $(deleteButton).parent();
+    hideElement.remove();
+    nameElement.remove();
+    amountElement.remove();
+    delElement.remove();
+}
+
+/**
+ * 刷新所有篮筐的包与材料总数量
+ */
+function refreshAllBasketTotalNum() {
+    var basketAmount = 0;
+    var tousseAmount = 0;
+    $("#basketsUl li").each(function () {
+        var liElement = $(this);
+        if (liElement) {
+            var total = 0;
+            var sumCount = parseInt(liElement.find('span.hiddenSumCountValue').text() || 0);
+            liElement.find('dd.num').each(function () {
+                var num = parseInt($(this).html());
+                if (num) {
+                    total += num;
+                }
+            });
+            liElement.find('.totalnum').html(total);
+            liElement.find('.sumCount').html(sumCount + parseInt(total));
+            tousseAmount += total;
+        }
+        basketAmount++;
+    });
+    $('#basketsAmount').text(basketAmount);
+    $('#tousseAmount').text(tousseAmount);
+}
+
+//删除篮筐中的物品
+function deleteBasketItem(deleteButton) {
+    var hideElement = $(deleteButton).parent().prev().prev().prev();
+    var nameElement = $(deleteButton).parent().prev().prev();
+    var amountElement = $(deleteButton).parent().prev();
+    var delElement = $(deleteButton).parent();
+
+    var basketElement = $(deleteButton).parent().parent().parent();
+    var basketJSON = basketElement.find('input').eq(0);
+    var basket = JSON.parse(basketJSON.val());
+
+    var item = JSON.parse(hideElement.val());
+    var name = "";
+    var tousseNameForMaterial = "";
+    var type = item.type;
+    var basketGroupBarcodes = item.basketGroupBarcodes;
+    //材料全部删除
+    if (type == "材料") {
+        name = item.materialName;
+        tousseNameForMaterial = item.tousseName;
+        $('dl[class="sed clearfix"]').each(function () {
+            $(this).children().each(function () {
+                if ($(this).attr('type') == 'hidden') {
+                    var hideValue = $(this).val();
+                    if (hideValue != null && hideValue != "") {
+                        var obj = JSON.parse(hideValue);
+                        //alert(obj.type+"--"+obj.tousseName+"--"+obj.basketGroupBarcodes);
+                        if (obj.type == '材料' && obj.tousseName == item.tousseName &&
+                            obj.basketGroupBarcodes == basketGroupBarcodes && obj.app_id == item.app_id) {
+                            var delButton = $(this).next().next().next().find('a');
+                            deleteMaterialItem(delButton, basket.barcode, basket.classifyBasketId);
+                        }
+                    }
+                }
+            });
+        });
+    }
+
+    var amount = item.amount;
+    var tousseAmountForMaterial = item.tousseAmount;
+    if (type == '材料') {
+        name = item.materialName;
+        tousseNameForMaterial = item.tousseName;
+        unloadStaff(item.tousseName, tousseAmountForMaterial, item.app_id);
+    } else {
+        name = item.tousseName;
+        unloadStaff(item.tousseName, amount, item.app_id);
+    }
+    hideElement.remove();
+    nameElement.remove();
+    amountElement.remove();
+    delElement.remove();
+    refreshAllBasketTotalNum();
+}
+
+//清理视图列表
+function cleanTableList() {
+    $("#tousseItemTbody").empty();
+    $("#basketsUl").empty();
+}
+
+function cleanMaterialAndBasketTableList() {
+    $("#basketsUl").empty();
+}
+
+/*---------------------------
+功能:停止事件冒泡
+---------------------------*/
+function stopBubble(e) {
+    //如果提供了事件对象，则这是一个非IE浏览器
+    if (e && e.stopPropagation)
+        //因此它支持W3C的stopPropagation()方法
+        e.stopPropagation();
+    else
+        //否则，我们需要使用IE的方式来取消事件冒泡
+        window.event.cancelBubble = true;
+}
+//阻止浏览器的默认行为
+function stopDefault(e) {
+    //阻止默认浏览器动作(W3C)
+    if (e && e.preventDefault)
+        e.preventDefault();
+    //IE中阻止函数器默认动作的方式
+    else
+        window.event.returnValue = false;
+    return false;
+}
+
+//在页面无需将光标定位在输入框相应全局的扫描枪事件
+function showKeyDown() {
+    if (event.keyCode == 48 || event.keyCode == 96) {
+        barcodeTemp += '0';
+    } else if (event.keyCode == 49 || event.keyCode == 97) {
+        barcodeTemp += '1';
+    } else if (event.keyCode == 50 || event.keyCode == 98) {
+        barcodeTemp += '2';
+    } else if (event.keyCode == 51 || event.keyCode == 99) {
+        barcodeTemp += '3';
+    } else if (event.keyCode == 52 || event.keyCode == 100) {
+        barcodeTemp += '4';
+    } else if (event.keyCode == 53 || event.keyCode == 101) {
+        barcodeTemp += '5';
+    } else if (event.keyCode == 54 || event.keyCode == 102) {
+        barcodeTemp += '6';
+    } else if (event.keyCode == 55 || event.keyCode == 103) {
+        barcodeTemp += '7';
+    } else if (event.keyCode == 56 || event.keyCode == 104) {
+        barcodeTemp += '8';
+    } else if (event.keyCode == 57 || event.keyCode == 105) {
+        barcodeTemp += '9';
+    } else if (event.keyCode == 13) {
+        loadBarcodeDevice();
+    }
+
+    stopBubble(event);
+    stopDefault(event);
+}
+
+// 扫描第二个篮框时，取消合并提示，默认不合并
+function mergedBasket() {
+    return false;
+}
+/**
+ * 刷新当前页面
+ * @returns
+ */
+function refresh() {
+    location.reload();
+}
+// 广州市第八人民医院 篮筐重新置顶作为优先载入篮筐
+function topScannedBasket(event, that, user) {
+    if (event && event.preventDefault) {
+        event.preventDefault();
+    } else {//IE中阻止函数器默认动作的方式
+        window.event.returnValue = false;
+    }
+    if (user) {
+        $("#basketsUl").prepend($(that).parent().parent());
+    } else {
+        $("#basketsUl").prepend($(that).parent());
+    }
+}
+
+// 判断此标识牌条码是否已经入筐
+function idCardIsExist(barcode) {
+    var exist = false;
+    $('dl[class="sed clearfix"]').each(function () {
+        $(this).children().each(function () {
+            if ($(this).attr('type') == 'hidden') {
+                var hideValue = $(this).val();
+                if (!isUndefinedOrNullOrEmpty(hideValue)) {
+                    var hiddenjson = JSON.parse(hideValue);
+                    if (hiddenjson.idCardBarcode == barcode) {
+                        exist = true;
+                        return false;
+                    }
+                }
+            }
+        });
+    });
+    return exist;
+}
+
+// 扫描包实例条码
+function scanTousseInstance(msg) {
+    var barcode = msg.idCardInstance.barcode;
+    // 对于已废弃的包，不检查其位置和所属科室的信息
+    var ti = msg.tousseInstance;
+    var td = ti.tousseDefinition;
+    var tousseDepart = '';
+    var tousseDepartCode = '';
+    if (msg.tousseInstanceOrgUnit) {
+        tousseDepart = msg.tousseInstanceOrgUnit.depart;
+        tousseDepartCode = msg.tousseInstanceOrgUnit.orgUnitCoding;
+    }
+    var exist = idCardIsExist(barcode);
+    if (exist) {
+        alertDiv(barcode + ",已入筐!");
+    } else {
+        if (msg.shareDeparts) {
+            if (msg.shareDeparts.length > 0) {
+                if (msg.shareDeparts.indexOf(currentOrgUnitName) == -1) {
+                    alertDiv('该器械包不属于该科室。');
+                    return;
+                }
+            } else {
+                if (!isUndefinedOrNullOrEmpty(tousseDepart) && currentOrgUnitName != tousseDepart && msg.tousseInstance.status != '已废弃') {
+                    alertDiv('该器械包不属于该科室。');
+                    return;
+                }
+            }
+        } else {
+            if (!isUndefinedOrNullOrEmpty(tousseDepart) && currentOrgUnitName != tousseDepart && msg.tousseInstance.status != '已废弃') {
+                alertDiv('该器械包不属于该科室。');
+                return;
+            }
+        }
+        var orgUnitName = currentOrgUnitName;
+        var addSuccess = false;
+        var idCardClassifyBasket = msg.idCardClassifyBasket;
+        if (idCardClassifyBasket) {
+            if (idCardClassifyBasket.containerStatus == "清洗完成" || idCardClassifyBasket.containerStatus == "清洗中") {
+                alertDiv("【" + idCardClassifyBasket.containerName + "】当前状态为【" + idCardClassifyBasket.containerStatus + "】，还有物品未装配");
+                return false;
+            } else {
+                //addBasketElement(idCardClassifyBasket, true);
+            }
+        }
+        var basketHideStr = $("#basketsUl li:first").find('input').val() || '';
+        if (sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode) {
+            if (basketHideStr == null || basketHideStr == "") {
+                alertDiv("请扫描篮筐条码!");
+                return false;
+            }
+        }
+
+        var itemJson = {
+            tousseDefinitionID: td.id,
+            tousseName: td.name,
+            amount: 1,
+            isCleanedEntirely: td.isCleanedEntirely,
+            orgUnitName: orgUnitName,
+            idCardBarcode: barcode,
+            tousseType: td.tousseType
+        }
+        tousseIntoBasketFunction(itemJson);
+        refreshAllBasketTotalNum();
+        //var loadedAmount = tousseIntoBasketFunction("", td.id, td.name, 1, td.isCleanedEntirely, orgUnitName, barcode, "", td.tousseType, -1, '否', 3, msg);
+
+        //记住扫描的标志牌
+        $('#tousseItemTable').children().first().children().each(function (i, element) {
+            if ($('#tousseName' + i).val() == td.name && $('#deleted' + i).val() == '0') {
+                var barcodesStr = $('#barcodes' + i).val();
+                var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
+                var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + i).val();
+                setTousseItemLoadedAmountCss(i)
+                if (barcodesStr == "") {
+                    var idCardBarcodeArray = new Array();
+                    idCardBarcodeArray[0] = {};
+                    idCardBarcodeArray[0].barcode = barcode;
+                    idCardBarcodeArray[0].addSuccess = addSuccess;
+                    idCardBarcodeArray[0].containerBarcode = (idCardClassifyBasket) ? idCardClassifyBasket.containerBarcode : '';
+                    $('#barcodes' + i).val(JSON.stringify(idCardBarcodeArray));
+
+                } else {
+                    var idCardBarcodeArray = JSON.parse(barcodesStr);
+                    var idCardIsExist = false;
+                    var idCardLen = idCardBarcodeArray.length;
+                    for (var n = 0; n < idCardLen; n++) {
+                        if (idCardBarcodeArray[n].barcode == barcode) {
+                            idCardIsExist = true;
+                            break;
+                        }
+                    }
+                    if (!idCardIsExist) {
+                        idCardBarcodeArray[idCardLen] = {};
+                        idCardBarcodeArray[idCardLen].barcode = barcode;
+                        idCardBarcodeArray[idCardLen].containerBarcode = (idCardClassifyBasket) ? idCardClassifyBasket.containerBarcode : '';
+                        idCardBarcodeArray[idCardLen].addSuccess = addSuccess;
+                        $('#barcodes' + i).val(JSON.stringify(idCardBarcodeArray));
+                    }
+                }
+
+                if (tousseOrIDCardInstanceBarcodes == '') {
+                    $('#tousseOrIDCardInstanceBarcodes' + i).val(barcode);
+                } else {
+                    var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
+                    if (tousseOrIDCardInstanceBarcodes.indexOf(barcode) == -1) {
+                        var str = tousseOrIDCardInstanceBarcodes + ';' + barcode;
+                        $('#tousseOrIDCardInstanceBarcodes' + i).val(str);
+                    }
+                }
+
+                if (idCardInstanceBarcodes == '') {
+                    $('#idCardInstanceBarcodes' + i).val(barcode);
+                } else {
+                    var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + i).val();
+                    if (idCardInstanceBarcodes.indexOf(barcode) == -1) {
+                        var str = idCardInstanceBarcodes + ';' + barcode;
+                        $('#idCardInstanceBarcodes' + i).val(str);
+                    }
+                }
+            }
+        });
+    }
+}
+
+function addBasketElement(msg) {
+    var isBasketLoaded = false;
+    var currentNode;
+    var basketItem = msg.basket;
+    $("#basketsUl li").each(function () {
+        var hide = $(this).find('input');
+        var item = JSON.parse(hide.val());
+        if (item.barcode == basketItem.containerBarcode) {
+            isBasketLoaded = true;
+            currentNode = $(this);
+            return false;
+        }
+    });
+
+    if (isBasketLoaded) {
+        //将篮筐放置在最前面
+        $("#basketsUl").prepend(currentNode);
+        //toggleItems(currentNode.find('span')[0]);
+    } else {
+        var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+        var imageButton = '';
+        if (showBasketLoadMaterialAmount == true) {
+            imageButton = '<img src="/images/btn_query.png" onclick = "basketLoadGoods(\'' + basketItem.containerName + '\',\'' + basketItem.containerBarcode + '\',\'' + basketItem.id + '\');" >';
+        }
+        var containerColorCode = basketItem.containerColorCode || '';
+        var containerFontColor = setFontColor(containerColorCode)
+        var basketElement = '';
+        if (containerColorCode !== '') {
+            basketElement += '<li style="background:' + containerColorCode + ';color:' + containerFontColor + '">';
+        } else {
+            basketElement += '<li>';
+        }
+        basketElement += '<input type="hidden">';
+        basketElement += '<i>';
+        basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\'' + basketItem.containerBarcode + '\',\'' + basketItem.id + '\');refreshAllBasketTotalNum();">删除</a>';
+        basketElement += '</i>';
+        basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
+        basketElement += '<font onclick="topScannedBasket(event,this);">' + basketItem.containerName + '</font>' + '<font>' + imageButton + '</font>';
+        if (basketItem.sumCount) {
+            basketElement += '<font class="totalAmount"><font class="totalnum">0</font>/<span class="sumCount">' + basketItem.sumCount + '</span></font>';
+            basketElement += '<span style="display:none" class="hiddenSumCountValue">' + basketItem.sumCount + '</span>';
+        } else {
+            basketElement += '<font class="totalAmount"><font class="totalnum">0</font></font>';
+        }
+        basketElement += '<dl class="sed clearfix"></dl>';
+        basketElement += '</li>';
+        var obj = $(basketElement);
+        $("#basketsUl").prepend(obj);
+        var json = {
+            classifyBasketId: basketItem.id,
+            barcode: basketItem.containerBarcode,
+            washClassifyType: basketItem.washClassifyType
+        };
+        $("#basketsUl li:first").find('input').val(JSON.stringify(json));
+        toggleItems(obj.find('span')[0]);
+        var basketsAmount = $('#basketsAmount').text() || 0;
+        $('#basketsAmount').text(parseInt(basketsAmount) + 1);
+    }
+}
+function loadBarcodeDevice() {
+    if (barcodeTemp.length >= 9) {
+        var barcode = barcodeTemp;
+        barcodeTemp = '';
+        $.ajax({
+            type: 'get',
+            url: encodeURI(WWWROOT + '/disinfectSystem/recyclingRecordAction!getBarcodeInfo.do?time=' + new Date().getTime() + '&barcode=' + barcode),
+            dataType: 'json',
+            success: function (msg) {
+                if (msg.errorMessage != null) {
+                    alertDiv(msg.errorMessage);
+                } else if (msg.basket != null) {
+                    //不装配的篮筐不能回收扫描
+                    var containerStatus = msg.basketStatus;
+                    //GDSKQYY-30：篮筐颜色
+                    var containerColorCode = msg.containerColorCode;
+                    msg.basket.containerColorCode = containerColorCode;
+                    if (containerStatus == "清洗完成" || containerStatus == "清洗中") {
+                        $("#dialogConfirm").dialog({
+                            resizable: false,
+                            height: 310,
+                            width: 600,
+                            modal: true,
+                            open: function () {
+                                $("#confirmMsg").text("【" + msg.basket.containerName + "】当前状态为【" + containerStatus + "】，还有物品未装配，是否继续使用该篮筐？");
+                            },
+                            close: function () {
+                                $("#confirmMsg").text("");
+                            },
+                            buttons: {
+                                "是": function () {
+                                    addBasketElement(msg);
+                                    $(this).dialog("close");
+                                },
+                                "否": function () {
+                                    $(this).dialog("close");
+                                }
+                            }
+                        });
+                    } else {
+                        addBasketElement(msg);
+                    }
+                } else {
+                    alertDiv('没有找到该条码所对应的信息。');
+                }
+                $("#codeScan").val("");
+            },
+            error: function () { }
+        });
+    } else {
+        alertDiv('条码长度不符合规范。');
+        barcodeTemp = '';
+    }
+}
+
+//创建物品入筐
+function addBasketItemElement(paramsItem) {
+    var basketElement = $('dl[class="sed clearfix"]:eq(0)');
+    var ci_id = paramsItem.ci_id || '';
+    var type = paramsItem.type || '';
+    var showName = paramsItem.showName || '';
+    var amount = paramsItem.amount || '';
+    var basketBarcode = paramsItem.basketBarcode || '';
+    var idCardBarcode = paramsItem.idCardBarcode || '';
+
+    if (type == '材料') {
+        $("#basketsUl li").each(function () {
+            var hideStr = $(this).find('input').val();
+            var json = JSON.parse(hideStr);
+            if (json.barcode == basketBarcode) {
+                basketElement = $(this).find("dl");
+                basketHidenValue = hideStr;
+                return false;
+            }
+        });
+    }
+
+    var str = showName;
+    if (showName.length > 12) {
+        str = showName.substring(0, 12) + "...";
+    }
+    if (idCardBarcode !== '') {
+        str += '(' + idCardBarcode + ')';
+    }
+    var nameWidth = 'auto';
+    var numWidth = 'auto';
+    var element = '<input type="hidden" value="">';
+    element += '<dd class="name" style="' + nameWidth + '">' + str + '</dd>';
+    element += '<dd class="num" style="' + numWidth + '">' + amount + '</dd>';
+    element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);">删除</a></dd>';
+    var json = paramsItem;
+    json.classifiedItemId = ci_id;
+    basketElement.prepend($(element));
+    basketElement.find("input:first").val(JSON.stringify(json));
+}
+//一键入筐
+function allInputBasket() {
+    var index = layer.load(1, {
+        content: '入筐中,请稍后...',
+        shade: [0.6, '#fff'], //0.1透明度的白色背景
+        success: function (layero) {
+            layero.find('.layui-layer-content').css({
+                'width': '300px',
+                "font-weight": "bold",
+                "font-size": "26px",
+                "text-align": "center",
+                "line-height": "37px"
+            });
+        }
+    });
+
+    setTimeout(function () {
+        if ($('#basketsUl').children().length == 0) {
+            alertDiv('请先扫描篮筐条码。');
+            layer.close(index);
+            return
+        }
+        $('#tousseItemTbody').children().each(function (row, element) {
+            var id = $(element).attr('id').split('tousseItemsTr')[1];
+            if (id.split('_').length == 2) {
+                var row = id;
+                putTousseInTheBasketForChild(row);
+            }
+        });
+
+        layer.close(index);
+    }, 100);
+}
+
+//批量将器械包放入篮筐中
+function putTousseInTheBasketAll(amountArray) {
+    if ($('#basketsUl').children().length > 0) {
+        tousseIntoBasketFunctionAll(amountArray);
+    } else {
+        lertDiv('请先扫描篮筐条码。');
+    }
+}
+
+//GDSFYBJY-29：点击父级入筐所有物品
+function putTousseInTheBasketForChild(row) {
+    var childCount = $('#childCount' + row).val();
+    var sumAmount = 0;
+    var loadedAmount = $('#loadedAmount' + row).val();
+    var recycleAmount = $('#recycleAmount' + row).val();
+    if (loadedAmount == recycleAmount) {
+        alertDiv('没有可以放入篮筐的器械包。');
+        return
+    }
+    for (var i = 0; i < childCount; i++) {
+        var loadedAmount = $('#loadedAmount' + row + '_' + i).val();
+        var recycleAmount = $('#recycleAmount' + row + '_' + i).val();
+        var deleted = $('#deleted' + row + '_' + i).val();
+        if (parseInt(deleted) == 0) {
+            if (loadedAmount !== recycleAmount) {
+                putTousseInTheBasket(row + '_' + i);
+                sumAmount += parseInt(recycleAmount);
+            }
+        }
+    }
+    if (sumAmount > 0) {
+        $('#loadedAmount' + row).val(sumAmount);
+    }
+    refreshAllBasketTotalNum();
+}
+
+//将器械包放入篮筐中
+function putTousseInTheBasket(row) {
+    if ($('#basketsUl').children().length > 0) {
+
+        var tousseName = $('#tousseName' + row).val();
+        var isCleanedEntirely = $('#isCleanedEntirely' + row).val();
+        var tousseDefinitionID = $('#tousseDefinitionID' + row).val();
+        var amount = parseInt($('#recycleAmount' + row).val(), 10) - parseInt($('#loadedAmount' + row).val(), 10);
+        var app_id = $('#applicationId' + row).val();
+        var invoicePlanVersion = $('#invoicePlanVersion' + row).val();
+        var urgentAmount = $('#urgentAmount' + row).val();
+        var urgentLevel = $('#urgentLevel' + row).val();
+
+        //回收数量扣减入筐操作 如果已经入筐就不能入筐，只能是手动从篮筐里面删除，因为程序不晓得从哪个篮筐里面扣减
+        var msg = "";
+        if (amount < 0) {
+            $("#basketsUl li").each(function () {
+                $(this).find('dl').children().each(function (i, element) {
+                    if ($(this).attr('type') == 'hidden') {
+                        var hideStr = $(this).val();
+                        var json = JSON.parse(hideStr);
+                        if (json.tousseName == tousseName) {
+                            msg = tousseName + "已入筐，请从篮筐内删除后再入筐！";
+                            return false;
+                        }
+                    }
+                });
+            });
+        }
+        if (amount > 9999) {
+            msg = "入筐数量不能大于9999！";
+        }
+        if (msg != "") {
+            alertDiv(msg);
+            return false;
+        }
+
+        var orgUnitName = $('#depart').val();
+        if (amount == 0) {
+            alertDiv('没有可以放入篮筐的器械包。');
+        } else {
+            var itemJson = {
+                tousseDefinitionID: tousseDefinitionID,
+                tousseName: tousseName,
+                amount: amount,
+                isCleanedEntirely: isCleanedEntirely,
+                orgUnitName: orgUnitName,
+                app_id: app_id,
+                invoicePlanVersion: invoicePlanVersion,
+                urgentAmount: urgentAmount,
+                urgentLevel: urgentLevel
+            }
+            var loadedAmount = tousseIntoBasketFunction(itemJson);
+            if (loadedAmount > 0) {
+                $('#loadedAmount' + row).val(parseInt(loadedAmount, 10) + parseInt($('#loadedAmount' + row).val(), 10));
+                if (parseInt($('#loadedAmount' + row).val(), 10) == parseInt($('#recycleAmount' + row).val(), 10)) {
+                    document.getElementById('showTousseName' + row).className = 'input-a-yellow';
+                } else {
+                    document.getElementById('showTousseName' + row).className = 'input-a-yellow3';
+                }
+            }
+            valiAmount(row.split('_')[0] + '_' + row.split('_')[1]);
+            setTousseItemLoadedAmountCss(row);
+            setParentTousseItemLoadedAmountCss();
+        }
+    } else {
+        alertDiv('请先扫描篮筐条码。');
+    }
+    $('#depart').focus();
+
+}
+
+//删除器械包
+function deleteTousse(row, deleteAction) {
+    $("#dialogConfirm").dialog({
+        resizable: false,
+        height: 310,
+        width: 600,
+        modal: true,
+        open: function () {
+            var msg = '';
+            var showTousseName = $('#showTousseName' + row).val();
+            var serialNumber = $('#serialNumber' + row).text();
+            if (deleteAction == 'deleteTousse') {
+                msg = '是否要删除申请单"' + serialNumber + '"的器械包【' + showTousseName + '】?';
+            }
+            $("#confirmMsg").text(msg);
+        },
+        close: function () {
+            $("#confirmMsg").text("");
+        },
+        buttons: {
+            "是": function () {
+                $('#tousseItemsTr' + row).hide();
+                $('#deleted' + row).val(1);
+                $(this).dialog("close");
+                var applicationId = $('#applicationId' + row).val();
+                $("#basketsUl li").each(function () {
+                    var jsonObj = null;
+                    $(this).find('dl').children().each(function (i, element) {
+                        if ($(this).attr('type') == 'hidden') {
+                            var obj = $(this).val();
+                            jsonObj = JSON.parse(obj);
+                        } else if ($(this).attr('class') == 'del') {
+                            if (jsonObj.app_id == applicationId) {
+                                var deleteButton = $(this).find('a');
+                                deleteBasketItem(deleteButton);
+                            }
+                        }
+                    });
+                });
+                refreshAllBasketTotalNum();
+            },
+            "否": function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+}
+
+//删除器械包
+function deleteTousseForChild(row, deleteAction) {
+    $("#dialogConfirm").dialog({
+        resizable: false,
+        height: 310,
+        width: 600,
+        modal: true,
+        open: function () {
+            var msg = '';
+            var showTousseName = $('#showTousseName' + row).val();
+            if (deleteAction == 'deleteTousse') {
+                msg = '是否要删除所有的器械包【' + showTousseName + '】?';
+            }
+            $("#confirmMsg").text(msg);
+        },
+        close: function () {
+            $("#confirmMsg").text("");
+        },
+        buttons: {
+            "是": function () {
+                var childCount = $('#childCount' + row).val();
+                $('#tousseItemsTr' + row).hide();
+                $('#deleted' + row).val(1);
+                for (var i = 0; i < childCount; i++) {
+                    $('#tousseItemsTr' + row + '_' + i).hide();
+                    $('#deleted' + row + '_' + i).val(1);
+                    var applicationId = $('#applicationId' + row + '_' + i).val();
+                    $("#basketsUl li").each(function () {
+                        var jsonObj = null;
+                        $(this).find('dl').children().each(function (i, element) {
+                            if ($(this).attr('type') == 'hidden') {
+                                var obj = $(this).val();
+                                jsonObj = JSON.parse(obj);
+                            } else if ($(this).attr('class') == 'del') {
+                                if (jsonObj.app_id == applicationId) {
+                                    var deleteButton = $(this).find('a');
+                                    deleteBasketItem(deleteButton);
+                                }
+                            }
+                        });
+                    });
+                }
+                $(this).dialog("close");
+                refreshAllBasketTotalNum();
+            },
+            "否": function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+}
+
+// 设置加载数量的背景颜色
+function setTousseItemLoadedAmountCss(row) {
+    var applicationAmount = parseInt($('#applicationAmount' + row).val(), 10);
+    var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+    if (loadedAmount > 0 && applicationAmount > loadedAmount) {
+        $("#recycleAmount" + row).css("background", "#FFE66F");//黄色
+    } else if (applicationAmount == loadedAmount && loadedAmount !== 0) {
+        $("#recycleAmount" + row).css("background", "#b7d9a5");//绿色
+    } else if (loadedAmount == 0 && applicationAmount > loadedAmount) {
+        $("#recycleAmount" + row).css("background", "#ffffff");//白色
+    }
+}
+
+function setParentTousseItemLoadedAmountCss() {
+    $('#tousseItemTbody').children().each(function (row, element) {
+        var id = $(element).attr('id').split('tousseItemsTr')[1];
+        if (id.split('_').length == 2) {
+            var row = id;
+            var applicationAmount = parseInt($('#applicationAmount' + row).val(), 10);
+            var loadedAmount = parseInt($('#loadedAmount' + row).val(), 10);
+            if (loadedAmount > 0 && applicationAmount > loadedAmount) {
+                $("#recycleAmount" + row).css("background", "#FFE66F");//黄色
+            } else if (applicationAmount == loadedAmount && loadedAmount !== 0) {
+                $("#recycleAmount" + row).css("background", "#b7d9a5");//绿色
+            } else if (loadedAmount == 0 && applicationAmount > loadedAmount) {
+                $("#recycleAmount" + row).css("background", "#ffffff");//白色
+            }
+        }
+    });
+}
+
+var layerIndex;
+function closeLayer() {
+    layer.close(layerIndex);
+    layerIndex = null;
+}
+
+// 器械包高亮闪烁
+function highlightExistTousseItem(row) {
+    //先滑动到对应的行
+    if ($("#tousseItemsTr" + row).offset()) {
+        var scrollTop = $("#tousseItemsTr" + row).offset().top - $('#tousseItemTable').offset().top;
+        $('#tousseItemBox').stop(true, false).animate({
+            scrollTop: scrollTop
+        }, 500);
+    }
+    //闪烁一定的次数
+    for (var i = 0; i < 5; ++i) {
+        $("#tousseItemsTr" + row).animate({
+            backgroundColor: "#7ABD32"
+        }, 300).animate({
+            backgroundColor: "transparent"
+        }, 300)
+    }
+}
+
+//ZSYY-385：更新序号
+function updateTousseIndex() {
+
+}
+
+var openElement;
+function openUpdateAmount(obj, row) {
+    return
+}
+
+//GDSFYBJY-29：展开
+function expandAllTousse(thiz, row) {
+    if ($(thiz).text() == '展开') {
+        var childCount = $('#childCount' + row).val();
+        for (var i = 0; i < childCount; i++) {
+            var deleted = $('#deleted' + row + '_' + i).val();
+            if (parseInt(deleted) == 0) {
+                $('#tousseItemsTr' + row + '_' + i).show();
+            }
+        }
+        $(thiz).text('收回');
+    } else {
+        $('.tousseItemsTr' + row).hide();
+        $(thiz).text('展开');
+    }
+}
+
+// 更新加急数量
+function updateUrgentAmount(row, urgentAmount, urgentLevel, colorCode, grade) {
+    $('#urgentAmount' + row).val(urgentAmount);
+    $('#urgentAmountDiv' + row).find('label').html(urgentAmount);
+    $('#urgentLevel' + row).val(urgentLevel);
+    $('#colorCode' + row).val(colorCode);
+    $('#grade' + row).val(grade);
+    var applicationId = $('#applicationId' + row).val();
+    if (urgentAmount > 0) {
+        var urgentColorVal = getUrgentColorName(colorCode);
+        var urgentBg = './1980/urgentLevelButton/' + urgentColorVal + '.png';
+        $('#urgentAmountDiv' + row).find('img').attr('src', urgentBg)
+        if (sstsConfig.enableUrgentFunction) {
+            $('#urgentAmountDiv' + row).find('label').html(urgentLevel);
+        } else {
+            $('#urgentAmountDiv' + row).find('label').html(urgentAmount);
+        }
+    } else {
+        $('#urgentAmountDiv' + row).find('img').attr('src', 'unUrgentBg.png')
+        $('#urgentAmountDiv' + row).find('label').html("+");
+    }
+    $('dl[class="sed clearfix"]').each(function () {
+        $(this).children().each(function () {
+            if ($(this).attr('type') == 'hidden') {
+                var hideValue = $(this).val();
+                if (hideValue != null && hideValue != "") {
+                    var obj = JSON.parse(hideValue);
+                    if (obj.app_id == applicationId) {
+                        obj.urgentAmount = urgentAmount;
+                        obj.urgentLevel = urgentLevel;
+                        $(this).val(JSON.stringify(obj))
+                    }
+                }
+            }
+        });
+    });
+}
+
+function reloadFirstUrgent(firstRow) {
+    var childCount = $('#childCount' + firstRow).val();
+    var arr = [];
+    for (var i = 0; i < childCount; i++) {
+        var grade = $('#grade' + firstRow + '_' + i).val();
+        var deleted = $('#deleted' + firstRow + '_' + i).val();
+        if (parseInt(deleted) == 0) {
+            arr.push(parseInt(grade));
+        }
+    }
+    var max = Math.max.apply(null, arr);
+    var index = arr.indexOf(max);
+    var urgentAmount = $('#urgentAmount' + firstRow + '_' + index).val();
+    var urgentLevel = $('#urgentLevel' + firstRow + '_' + index).val();
+    var colorCode = $('#colorCode' + firstRow + '_' + index).val();
+    if (urgentAmount > 0) {
+        var urgentColorVal = getUrgentColorName(colorCode);
+        var urgentBg = './1980/urgentLevelButton/' + urgentColorVal + '.png';
+        $('#urgentAmountDiv' + firstRow).find('img').attr('src', urgentBg)
+        if (sstsConfig.enableUrgentFunction) {
+            $('#urgentAmountDiv' + firstRow).find('label').html(urgentLevel);
+        } else {
+            $('#urgentAmountDiv' + firstRow).find('label').html(urgentAmount);
+        }
+    } else {
+        $('#urgentAmountDiv' + firstRow).find('img').attr('src', 'unUrgentBg.png')
+        $('#urgentAmountDiv' + firstRow).find('label').html("+");
+    }
+}
+function updateToussItem(paramsItem) {
+    var tousseName = paramsItem.tousseName || '';
+    var tbody = document.getElementById('tousseItemTbody');
+    var allTrs = Array.from(tbody.getElementsByTagName('tr'));
+    var lastIndex = 0;
+    var lastParentIndex = 0;
+    var tousseIsTrue = false;
+    var fCount = 0;
+    $('#tousseItemTbody').children().each(function (row, element) {
+        var id = $(element).attr('id').split('tousseItemsTr')[1];
+        if (id.split('_').length == 1) {
+            fCount++
+        }
+        if (id.split('_').length == 2) {
+            var row = id;
+            var childCount = $('#childCount' + row).val();
+            var dateStr = $('#dateStr' + row).val();
+            if (dateStr == today.split(' ')[0]) {
+                var showTousseName = $('#showTousseName' + row).val();
+                if (showTousseName == tousseName) {
+                    var isTrue = false;
+                    tousseIsTrue = true;
+                    for (var i = 0; i < childCount; i++) {
+                        var depart = $('#serialNumber' + row + '_' + i).text();
+                        var deleted = $('#deleted' + row + '_' + i).val();
+                        if (parseInt(deleted) == 0 && depart == '本次添加') {
+                            isTrue = true;
+                            break;
+                        }
+                    }
+                    if (!isTrue) {
+                        var targetTr = document.getElementById('tousseItemsTr' + row + '_' + (childCount - 1));
+                        var index = allTrs.indexOf(targetTr);
+                        paramsItem.row = row + '_' + childCount;
+                        paramsItem.isThereIdentificationCard = '否';
+                        paramsItem.applicationAmount = 1;
+                        paramsItem.recycleAmount = 1;
+                        paramsItem.itemLevel = 3;
+                        paramsItem.childRow = childCount;
+                        paramsItem.depart = '本次添加';
+                        paramsItem.rowIndex = index + 1;
+                        paramsItem.parentRow = row;
+                        addToussItem(paramsItem);
+                        $('#childCount' + row).val(parseInt(childCount) + 1);
+                        for (var i = 0; i < childCount; i++) {
+                            var deleted = $('#deleted' + row + '_' + i).val();
+                            if (parseInt(deleted) == 0) {
+                                $('#tousseItemsTr' + row + '_' + i).show();
+                            }
+                        }
+                        $('#expand' + row).text('收回');
+                        highlightExistTousseItem(row + '_' + childCount)
+                    } else {
+                        for (var i = 0; i < childCount; i++) {
+                            var deleted = $('#deleted' + row + '_' + i).val();
+                            if (parseInt(deleted) == 0) {
+                                $('#tousseItemsTr' + row + '_' + i).show();
+                            }
+                        }
+                        $('#expand' + row).text('收回');
+                        highlightExistTousseItem(row + '_' + (childCount - 1))
+                    }
+                }
+                lastIndex = row + '_' + (childCount - 1)
+                lastParentIndex = row;
+            }
+        }
+    });
+    if (!tousseIsTrue) {
+        if (lastIndex !== 0) {
+            var targetTr = document.getElementById('tousseItemsTr' + lastIndex);
+            if (targetTr) {
+                var index = allTrs.indexOf(targetTr);
+                var pIndex = lastParentIndex.split('_');
+                var paramsItem2 = {
+                    row: pIndex[0] + '_' + (parseInt(pIndex[1]) + 1),
+                    depart: '收回',
+                    dateStr: today.split(' ')[0],
+                    tousseName: tousseName,
+                    applicationAmount: 1,
+                    isThereIdentificationCard: '否',
+                    recycleAmount: 0,
+                    itemLevel: 2,
+                    rowIndex: index + 1,
+                    childCount: 1
+                };
+                addToussItem(paramsItem2);
+                var paramsItem3 = paramsItem;
+                paramsItem3.row = pIndex[0] + '_' + (parseInt(pIndex[1]) + 1) + '_0';
+                paramsItem3.isThereIdentificationCard = '否';
+                paramsItem3.applicationAmount = 1;
+                paramsItem3.recycleAmount = 1;
+                paramsItem3.itemLevel = 3;
+                paramsItem3.childRow = 1;
+                paramsItem3.depart = '本次添加';
+                paramsItem3.rowIndex = index + 2;
+                paramsItem3.parentRow = pIndex[0] + '_' + (parseInt(pIndex[1]) + 1);
+                addToussItem(paramsItem3);
+                $('#applicationAmount' + pIndex[0] + '_' + (parseInt(pIndex[1]) + 1)).val(1);
+                $('#recycleAmount' + pIndex[0] + '_' + (parseInt(pIndex[1]) + 1)).val(1);
+            }
+        } else {
+            var date = today.split(' ')[0];
+            var paramsItem1 = {
+                isThereIdentificationCard: '否',
+                depart: date,
+                row: 2,
+                itemLevel: 1,
+                rowIndex: 0,
+                tousseAmount: 1
+            };
+            addToussItem(paramsItem1);
+            var paramsItem2 = {
+                row: fCount + '_0',
+                depart: '收回',
+                dateStr: date,
+                tousseName: tousseName,
+                applicationAmount: 1,
+                isThereIdentificationCard: '否',
+                recycleAmount: 1,
+                itemLevel: 2,
+                tousseAmount: 1,
+                rowIndex: 1,
+                childCount: 1
+            };
+            addToussItem(paramsItem2);
+            var paramsItem3 = paramsItem;
+            paramsItem3.row = fCount + '_0' + '_0';
+            paramsItem3.isThereIdentificationCard = '否';
+            paramsItem3.applicationAmount = 1;
+            paramsItem3.recycleAmount = 1;
+            paramsItem3.itemLevel = 3;
+            paramsItem3.childRow = 1;
+            paramsItem3.depart = '本次添加';
+            paramsItem3.rowIndex = 2;
+            paramsItem3.parentRow = '2_0';
+            addToussItem(paramsItem3);
+            $('#applicationAmount' + fCount + '_0').val(1);
+            $('#recycleAmount' + fCount + '_0').val(1);
+        }
+    }
+
+    return true
+}
+
+function addToussItem(paramsItem) {
+    var row = paramsItem.row;
+    var tousseItemId = paramsItem.tousseItemId || '';
+    var tousseName = paramsItem.tousseName || '';
+    var applicationAmount = paramsItem.applicationAmount || '';
+    var applicationTime = paramsItem.applicationTime || '';
+    var recycleAmount = paramsItem.recycleAmount || '';
+    var loadedAmount = paramsItem.loadedAmount || '';
+    var isApplyEntireTousse = paramsItem.isApplyEntireTousse || '';
+    var isCleanedEntirely = paramsItem.isCleanedEntirely || '';
+    var tousseType = paramsItem.tousseType || '';
+    var isThereIdentificationCard = paramsItem.isThereIdentificationCard || '';
+    var depart = paramsItem.depart || '';
+    var applicationId = paramsItem.applicationId || '';
+    var tousseDefinitionID = paramsItem.tousseDefinitionID || '';
+    var invoicePlanVersion = paramsItem.invoicePlanVersion || '';
+    var itemLevel = paramsItem.itemLevel;
+    var childRow = paramsItem.childRow || 0;
+    var childCount = paramsItem.childCount || 0;
+    var applicationDate = new Date(applicationTime.time).Format("yyyy-M-d h:m");
+    var showTousseName = tousseName;
+    var colorCode = paramsItem.colorCode;
+    var urgentColorVal = getUrgentColorName(colorCode);
+    var packed = paramsItem.packed || false;
+    var urgentAmount = paramsItem.urgentAmount || 0;
+    var urgentLevel = paramsItem.urgentLevel || '';
+    var grade = paramsItem.grade || 0;
+    var dateStr = paramsItem.dateStr || '';
+    var tousseAmount = paramsItem.tousseAmount || 0;
+    var _index = tousseName.indexOf('_');
+    if (_index >= 0) {
+        showTousseName = tousseName.substring(0, _index);
+    }
+
+    var addButton = "";
+    var reduceButton = "";
+    var onclickFun = "";
+    if (tousseType != '消毒物品' || (tousseType == '消毒物品' && '是' == isApplyEntireTousse)) {
+        addButton = '<a href="javascript:void(0);" class="add" onclick="add(\'' + row + '\');">+</a>';
+        reduceButton = '<a href="javascript:void(0);" class="minus" onclick="reduce(\'' + row + '\');">-</a>';
+        onclickFun = 'onclick="openUpdateAmount(this,\'' + row + '\');"';
+    } else {
+        addButton = '<a href="javascript:void(0);" class="add" onclick="">+</a>';
+        reduceButton = '<a href="javascript:void(0);" class="minus" onclick="">-</a>';
+        onclickFun = '';
+    }
+    var td0 = '15%';
+    var td1 = '35%';
+    var td2 = '10%';
+    var td3 = '5%';
+    var td4 = '10%';
+    var td5 = '5%';
+    var td6 = '15%';
+    var html = '';
+    if (itemLevel == 1) {
+        html += '<tr id="tousseItemsTr' + row + '">';
+    } else if (itemLevel == 3) {
+        html += '<tr id="tousseItemsTr' + row + '" class="tousseItemsTr' + childRow + '" style="display:none">';
+    } else {
+        html += '<tr id="tousseItemsTr' + row + '">';
+    }
+    var urgentAmountElement = "";
+    var arr = [];
+    if (itemLevel == 2) {
+        for (var i = 0; i < childCount; i++) {
+            arr.push(row + '_' + i);
+        }
+    } else {
+        arr.push(row);
+    }
+    if (!isUndefinedOrNull(urgentAmount) && urgentAmount > 0) {
+        var msg = urgentAmount;
+        var fontSize = "30px";
+        if (sstsConfig.enableUrgentFunction) {
+            msg = urgentLevel;
+            fontSize = "16px";
+        }
+        var fontColor = '#FFFFFF';
+        if (sstsConfig.tousseNameShowsTheUrgentColor) {
+            fontColor = '#555';
+        }
+        var urgentBg = "<img src='./1980/urgentLevelButton/" + urgentColorVal + ".png' />";
+        urgentAmountElement += '<span id="urgentAmountDiv' + row + '" class="divStyle" style="font-size:' + fontSize + ';color: ' + fontColor + ';overflow: hidden;" onclick="openSetUrgentAmountPage(\'' + arr.join(',') + '\',' + packed + ');">' + urgentBg + '<label>' + msg + '</label></span>';
+    } else {
+        //ZSWY-180
+        packed = false;
+        var urgentBg = "<img src='./1980/urgentLevelButton/unUrgentBg.png' />";
+        var msg = "+";
+        if (packed) {
+            urgentBg = "";
+            msg = "";
+        }
+        var fontSize = "30px";//如果要显示加急等级,字体就要小
+        if (sstsConfig.enableUrgentFunction) {
+            fontSize = "16px";
+        }
+        urgentAmountElement += '<span id="urgentAmountDiv' + row + '" class="divStyle" style="font-size:' + fontSize + ';overflow: hidden;" onclick="openSetUrgentAmountPage(\'' + arr.join(',') + '\',' + packed + ');">' + urgentBg + '<label>' + msg + '</label></span>';
+    }
+    html += '<td width="' + td0 + '" style="font-size: 25px;">';
+    if (itemLevel == 1) {
+        html += '<div style="font-size: 25px;font-weight: bold;">' + depart + '</div>';
+    } else if (itemLevel == 2) {
+        html += urgentAmountElement;
+        html += '<input type="hidden" id="childCount' + row + '" name="childCount' + row + '" value="' + childCount + '"/>';
+        html += '<input type="hidden" id="loadedAmount' + row + '" name="loadedAmount' + row + '" value="0"/>';
+        html += '<input type="hidden" id="depart' + row + '" name="depart' + row + '" value="' + depart + '"/>';
+        html += '<input type="hidden" id="dateStr' + row + '" name="dateStr' + row + '" value="' + dateStr + '"/>';
+        html += '<input type="hidden" id="tousseAmount' + row + '" name="tousseAmount' + row + '" value="' + tousseAmount + '"/>';
+        html += '<span id="expand' + row + '" style="color:blue;font-weight: bold;cursor: pointer;" onclick="expandAllTousse(this,\'' + row + '\')">' + depart + '</span>';
+    } else {
+        html += '<input type="hidden" id="isCleanedEntirely' + row + '" name="isCleanedEntirely' + row + '" value="' + isCleanedEntirely + '"/>' +
+            '<input type="hidden" id="grade' + row + '" name="grade' + row + '" value="' + grade + '"/>' +
+            '<input type="hidden" id="dateStr' + row + '" name="dateStr' + row + '" value="' + dateStr + '"/>' +
+            '<input type="hidden" id="colorCode' + row + '" name="colorCode' + row + '" value="' + colorCode + '"/>' +
+            '<input type="hidden" id="urgentAmount' + row + '" name="urgentAmount' + row + '" value="' + urgentAmount + '"/>' +
+            '<input type="hidden" id="urgentLevel' + row + '" name="urgentLevel' + row + '" value="' + urgentLevel + '"/>' +
+            '<input type="hidden" id="tousseItemId' + row + '" name="tousseItemId' + row + '" value="' + tousseItemId + '"/>' +
+            '<input type="hidden" id="tousseDefinitionID' + row + '" name="tousseDefinitionID' + row + '" value="' + tousseDefinitionID + '"/>' +
+            '<input type="hidden" id="tousseType' + row + '" name="tousseType' + row + '" value="' + tousseType + '"/>' +
+            '<input type="hidden" id="isThereIdentificationCard' + row + '" name="isThereIdentificationCard' + row + '" value="' + isThereIdentificationCard + '"/>' +
+            '<input type="hidden" id="barcodes' + row + '" name="barcodes' + row + '" value=""/>' +
+            '<input type="hidden" id="depart' + row + '" name="depart' + row + '" value="' + depart + '"/>' +
+            '<input type="hidden" id="deleted' + row + '" name="deleted' + row + '" value="0"/>' +
+            '<input type="hidden" id="applicationId' + row + '" name="applicationId' + row + '" value="' + applicationId + '"/>' +
+            '<input type="hidden" id="originalValue' + row + '" name="originalValue' + row + '" value="' + recycleAmount + '"/>' +
+            '<input type="hidden" id="tousseName' + row + '" name="tousseName' + row + '" value="' + tousseName + '"/>' +
+            '<input type="hidden" id="invoicePlanVersion' + row + '" name="invoicePlanVersion' + row + '" value="' + invoicePlanVersion + '"/>' +
+            '<input type="hidden" id="loadedAmount' + row + '" name="loadedAmount' + row + '" value="0"/>';
+        if (itemLevel == 3) {
+            html += '<div style="padding-left: 30px;display: inline;">';
+            html += urgentAmountElement;
+            html += '<span id="serialNumber' + row + '">' + depart + '</span>';
+            html += '</div>';
+        } else {
+            html += depart;
+        }
+    }
+    html += '</td>';
+    if (itemLevel !== 1) {
+        html += '<td width="' + td1 + '"><input id="showTousseName' + row + '" name="showTousseName' + row + '" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="' + showTousseName + '"/></td>';
+        html += '<td width="' + td2 + '"><input id="applicationAmount' + row + '" name="applicationAmount' + row + '" type="text" readonly="readonly" class="input-b" value="' + applicationAmount + '"/></td>';
+        html += '<td width="' + td3 + '">' + addButton + '</td>';
+        html += '<td width="' + td4 + '"><input id="recycleAmount' + row + '" name="recycleAmount' + row + '" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="' + recycleAmount + '"/></td>';
+        html += '<td width="' + td5 + '">' + reduceButton + '</td>';
+        if (itemLevel == 2) {
+            html += '<td width="' + td6 + '">';
+            html += '<a href="javascript:void(0);" class="btn-a" style="display:inline-block;" onclick="putTousseInTheBasketForChild(\'' + row + '\');">入筐</a>';
+            html += '<a href="javascript:void(0);" class="btn-d" style="display:inline-block;margin-left:5px" onclick="deleteTousseForChild(\'' + row + '\',\'deleteTousse\');">删除</a>';
+            html += '</td>';
+        } else {
+            html += '<td width="' + td6 + '">';
+            html += '<a href="javascript:void(0);" class="btn-a" style="display:inline-block;" onclick="putTousseInTheBasket(\'' + row + '\');refreshAllBasketTotalNum();">入筐</a>';
+            html += '<a href="javascript:void(0);" class="btn-d" style="display:inline-block;margin-left:5px" onclick="deleteTousse(\'' + row + '\',\'deleteTousse\');">删除</a>';
+            html += '</td>';
+        }
+    } else {
+        html += '<td width="' + td1 + '"></td>';
+        html += '<td width="' + td2 + '"></td>';
+        html += '<td width="' + td3 + '"></td>';
+        html += '<td width="' + td4 + '"></td>';
+        html += '<td width="' + td5 + '"></td>';
+        html += '<td width="' + td6 + '"></td>';
+    }
+    html += '</tr>';
+    var trElement = $(html);
+    if (paramsItem.rowIndex >= 0) {
+        var tbody = document.getElementById('tousseItemTbody');
+        var newRow = tbody.insertRow(paramsItem.rowIndex);
+        if (itemLevel == 3) {
+            newRow.id = 'tousseItemsTr' + row;
+            newRow.className = 'tousseItemsTr' + paramsItem.parentRow;
+        } else {
+            newRow.id = 'tousseItemsTr' + row;
+        }
+        newRow.innerHTML = html;
+    } else {
+        $("#tousseItemTbody").append(trElement);
+    }
+
+    return true;
+}
+
+//待装载篮筐视图中的树形菜单伸缩的处理
+function toggleItems(spanElement) {
+    $(spanElement).toggleClass("minus");
+    $(spanElement).nextAll('.sed').toggle();
+}
+
+function addItem(array, app_id, itemJson, invoicePlanVersion, urgentTousseItems) {
+    var len = array.length;
+    var isExist = false;
+    for (var i = 0; i < len; i++) {
+        if (array[i].app_id == app_id) {
+            if (array[i].tousseJson == null) {
+                array[i].tousseJson = new Array();
+            }
+            var len2 = array[i].tousseJson.length;
+            array[i].tousseJson[len2] = itemJson;
+            isExist = true;
+        }
+    }
+    if (!isExist) {
+        array[len] = {};
+        array[len].app_id = app_id;
+        array[len].errorDamageDetail = "";
+        array[len].confirmation = "";
+        array[len].invoicePlanVersion = invoicePlanVersion;
+        array[len].tousseJson = new Array();
+        array[len].tousseJson[0] = itemJson;
+        array[len].urgentTousseItems = urgentTousseItems;
+    }
+}
+
+function submitCheck() {
+    var isThereTousseItems = false;
+    var isThereRecycleAmountEmpty = false;
+    var submitCheckFaildMsg = "";
+
+    if (!isSecondSupplyRoom && $('#recyclingApplicationId').val() == "") {
+        alertDiv('该科室没有申请回收。');
+        return false;
+    }
+    $('#tousseItemTbody').children().each(function (rows, element) {
+        var row = $(element).attr('id').split('tousseItemsTr')[1];
+        var childCount = $('#childCount' + row).val();
+        for (var i = 0; i < childCount; i++) {
+            var deleted = $('#deleted' + row + '_' + i).val();
+            var recycleAmount = parseInt($('#recycleAmount' + row + '_' + i).val(), 10);
+            var loadedAmount = parseInt($('#loadedAmount' + row + '_' + i).val(), 10);
+            var depart = $('#depart' + row + '_' + i).val();
+            var showTousseName = $('#showTousseName' + row + '_' + i).val();
+            if (parseInt(deleted) == 0) {
+                if (loadedAmount != 0) {
+                    isThereTousseItems = true;
+                    if (recycleAmount == '' || recycleAmount == 0) {
+                        isThereRecycleAmountEmpty = true;
+                        return false;
+                    }
+                }
+                if (loadedAmount > 0 && recycleAmount > loadedAmount) {
+                    submitCheckFaildMsg = (depart + " 的  " + showTousseName + " 还有 " + (recycleAmount - loadedAmount) + " 个未放入篮筐。");
+                    return false;
+                }
+            }
+
+        }
+    });
+    if (!isThereTousseItems) {
+        alertDiv('回收记录中至少要有一条所回收器械包信息。');
+        return false;
+    }
+
+    if (isThereRecycleAmountEmpty) {
+        alertDiv('回收数量不能为空。');
+        return false;
+    }
+
+    if (submitCheckFaildMsg != "") {
+        alertDiv(submitCheckFaildMsg);
+        return false;
+    }
+
+    var isBasketEmpty = false;
+    $("#basketsUl").children().each(function () {
+        var id = null;
+        var basketBarcode = null;
+        var classifiedItemsInfo = {};
+        $(this).children().each(function () {
+            if ($(this).is('input') && $(this).attr('type') == 'hidden') {
+                var baskethideStr = $(this).val();
+                var basketJson = JSON.parse(baskethideStr);
+                basketBarcode = basketJson.barcode;
+                id = basketJson.classifyBasketId;
+            } else if ($(this).is('dl')) {
+                $(this).children().each(function (i, element) {
+                    if ($(this).attr('type') == 'hidden') {
+                        var itemJson = $(this).val();
+                        var json = JSON.parse(itemJson);
+                        var obj = {};
+                        obj.basketBarcode = basketBarcode;
+                        obj.basketId = id;
+                        var tousseName = json.tousseName;
+                        if (json.type == '材料') {
+                            tousseName = json.materialName;
+                        }
+                        obj.tousseName = tousseName;
+                        obj.amount = json.amount;
+                        obj.itemType = json.type;
+                        obj.tousseNameForMaterial = json.tousseName;
+                        obj.tousseAmountForMaterial = json.tousseAmount;
+                        obj.tousseDefinitionID = json.tousseDefinitionID;
+                        obj.basketGroupBarcodes = json.basketGroupBarcodes;
+                        var urgentTousseItems = [{
+                            tousseDefinitionID: json.tousseDefinitionID,
+                            tousseName: tousseName,
+                            urgentAmount: json.urgentAmount,
+                            urgentLevel: json.urgentLevel
+                        }]
+                        addItem(array, json.app_id, obj, json.invoicePlanVersion, urgentTousseItems);
+                    }
+                });
+            }
+        });
+    });
+
+    if (isBasketEmpty) {
+        return false;
+    }
+    return true;
+}
+
+function getScanedGoods(isCleanedEntirely) {
+    var basketJsonArray = new Array();
+    $("#basketsUl li").each(function () {
+        var hideStr = $(this).find('input').val();
+        var hiddenjson = JSON.parse(hideStr);
+
+        var scanedGoodsArray = new Array();
+
+        $(this).find('dl').children().each(function (i, element) {
+            if ($(this).attr('type') == 'hidden') {
+                var itemJson = $(this).val();
+                var json = JSON.parse(itemJson);
+                if (json.classifiedItemId == "") {
+                    var type = json.type;
+                    var name = json.tousseName;
+                    if (type == '材料') {
+                        name = json.materialName;
+                    }
+                    scanedGoodsArray.push({
+                        name: name,
+                        tousseDefinitionID: json.tousseDefinitionID,
+                        type: json.type,
+                        amount: json.amount,
+                        idCardBarcode: json.idCardBarcode,
+                        putBasketMaxAmount: json.putBasketMaxAmount
+                    });
+                }
+            }
+        });
+
+        basketJsonArray.push({
+            barcode: hiddenjson.barcode,
+            washClassifyType: hiddenjson.washClassifyType,
+            scanedGoods: scanedGoodsArray
+        });
+
+        if (isCleanedEntirely == "是") {
+            return false;
+        }
+    });
+    return basketJsonArray;
+}
+
+function tousseIntoBasketFunctionAll(amountArray) {
+    DWREngine.setAsync(false);
+    var newArr = [];
+    for (var i = 0; i < amountArray.length; i++) {
+        newArr[i] = {
+            tousseDefinitionId: amountArray[i].tousseDefinitionID,
+            amount: amountArray[i].amount,
+            params: getScanedGoods(amountArray[i].isCleanedEntirely),
+            invoicePlanVersion: amountArray[i].invoicePlanVersion,
+            recyclingApplicationId: amountArray[i].app_id
+        }
+    }
+
+    RecyclingRecordTableManager.getTousseIntoBasketAmounts(JSON.stringify(newArr), function (result) {
+        var jsonObj = JSON.parse(result);
+
+        if (jsonObj.success) {
+            var total = parseInt($('#basketsUl').find('li').find('font.totalnum').html());
+
+            for (var i = 0; i < jsonObj.data.length; i++) {
+                var data = jsonObj.data[i].data;
+
+                if (jsonObj.data[i].success) {
+                    if (data.isCleanedEntirely == '否') {
+                        var materials = data.materials;
+                        for (var i = 0; i < materials.length; i++) {
+                            var item = materials[i];
+                            var paramsItem = item;
+                            paramsItem.type = '材料';
+                            paramsItem.tousseName = data.tousseName;
+                            paramsItem.tousseAmount = data.amount;
+                            paramsItem.showName = item.materialName;
+                            paramsItem.amount = item.materialAmount;
+                            paramsItem.app_id = amountArray[0].app_id;
+                            paramsItem.invoicePlanVersion = amountArray[i].invoicePlanVersion;
+                            paramsItem.urgentAmount = amountArray[i].urgentAmount;
+                            paramsItem.urgentLevel = amountArray[i].urgentLevel;
+                            addBasketItemElement(paramsItem);
+                        }
+                    } else {
+                        var paramsItem = data;
+                        paramsItem.type = '器械包';
+                        paramsItem.tousseAmount = data.amount;
+                        paramsItem.showName = data.tousseName;
+                        paramsItem.app_id = amountArray[i].app_id;
+                        paramsItem.invoicePlanVersion = amountArray[i].invoicePlanVersio;
+                        paramsItem.urgentAmount = amountArray[i].urgentAmount;
+                        paramsItem.urgentLevel = amountArray[i].urgentLevel;
+                        addBasketItemElement(paramsItem);
+                    }
+
+                    if (data.amount > 0) {
+                        $('#loadedAmount' + amountArray[i].index).val(parseInt(data.amount, 10) + parseInt($('#loadedAmount' + amountArray[i].index).val(), 10));
+                        if (parseInt($('#loadedAmount' + amountArray[i].index).val(), 10) == parseInt($('#recycleAmount' + amountArray[i].index).val(), 10)) {
+                            document.getElementById('showTousseName' + amountArray[i].index).className = 'input-a-yellow';
+                        } else {
+                            document.getElementById('showTousseName' + amountArray[i].index).className = 'input-a-yellow3';
+                        }
+
+                        total += parseInt(data.amount);
+                    }
+                } else {
+                    alertDiv(jsonObj.data[i].message);
+                }
+            }
+
+            $('#basketsUl').find('li').find('font.totalnum').html(total);
+        }
+    });
+    DWREngine.setAsync(true);
+}
+
+function tousseIntoBasketFunction(itemJson) {
+    var tousseDefinitionID = itemJson.tousseDefinitionID || '';
+    var tousseName = itemJson.tousseName || '';
+    var recycleAmount = itemJson.amount || '';
+    var isCleanedEntirely = itemJson.isCleanedEntirely || '';
+    var orgUnitName = itemJson.orgUnitName || '';
+    var app_id = itemJson.app_id || '';
+    var invoicePlanVersion = itemJson.invoicePlanVersion || '';
+    var urgentAmount = itemJson.urgentAmount || 0;
+    var urgentLevel = itemJson.urgentLevel || '';
+    var idCardBarcode = itemJson.idCardBarcode || '';
+
+    var params = getScanedGoods(isCleanedEntirely);
+    var loadedAmount = 0;
+    DWREngine.setAsync(false);
+    RecyclingRecordTableManager.getTousseIntoBasketAmount("", tousseDefinitionID, recycleAmount, "", JSON.stringify(params), "", app_id, function (result) {
+        var jsonObj = JSON.parse(result);
+        loadedAmount = jsonObj.success;
+
+        if (!jsonObj.success) {
+            alertDiv(jsonObj.message);
+        } else {
+            var data = jsonObj.data;
+            loadedAmount = data.amount;
+            if (isCleanedEntirely == "否") {
+                var materials = data.materials;
+                for (var i = 0; i < materials.length; i++) {
+                    var item = materials[i];
+                    var paramsItem = item;
+                    paramsItem.type = '材料';
+                    paramsItem.orgUnitName = orgUnitName;
+                    paramsItem.tousseName = tousseName;
+                    paramsItem.tousseAmount = loadedAmount;
+                    paramsItem.showName = item.materialName;
+                    paramsItem.amount = item.materialAmount;
+                    paramsItem.app_id = app_id;
+                    paramsItem.tousseDefinitionID = tousseDefinitionID;
+                    paramsItem.invoicePlanVersion = invoicePlanVersion;
+                    paramsItem.urgentAmount = urgentAmount;
+                    paramsItem.urgentLevel = urgentLevel;
+                    paramsItem.idCardBarcode = idCardBarcode;
+                    addBasketItemElement(paramsItem);
+                }
+            } else {
+                var paramsItem = {
+                    type: '器械包',
+                    orgUnitName: orgUnitName,
+                    tousseName: tousseName,
+                    showName: tousseName,
+                    amount: loadedAmount,
+                    tousseAmount: loadedAmount,
+                    app_id: app_id,
+                    tousseDefinitionID: tousseDefinitionID,
+                    putBasketMaxAmount: data.putBasketMaxAmount,
+                    urgentLevel: urgentLevel,
+                    urgentAmount: urgentAmount,
+                    idCardBarcode: idCardBarcode,
+                    invoicePlanVersion: invoicePlanVersion
+                }
+
+                addBasketItemElement(paramsItem);
+            }
+        }
+    });
+    DWREngine.setAsync(true);
+    return loadedAmount;
+}
+
+function getSplitTousseArray(splitTousseArray) {
+    var newTousseArray = [];
+    var length = splitTousseArray.length;
+    if (length > 0) {
+        var k = 0;
+        for (var j = 0; j < length; j++) {
+            var tousseName = splitTousseArray[j].tousseName;
+            var amount = splitTousseArray[j].amount;
+            var depart = splitTousseArray[j].depart;
+            var idCardInstanceBarcode = splitTousseArray[j].splitTousseBarcodes[0].idCardInstanceBarcode || '';
+            for (var i = 0; i < tousseArray.length; i++) {
+                if (tousseArray[i].tousseName == tousseName) {
+                    if (idCardInstanceBarcode !== '') {
+                        if (idCardInstanceBarcode == tousseArray[i].idCardBarcode) {
+                            newTousseArray[k] = {
+                                tousseName: tousseName,
+                                amount: amount,
+                                depart: depart
+                            }
+                            k++
+                        }
+                    } else {
+                        newTousseArray[k] = {
+                            tousseName: tousseName,
+                            amount: amount,
+                            depart: depart
+                        }
+                        k++
+                    }
+                }
+            }
+        }
+    }
+    return newTousseArray;
+}
+
+// 弹出不同申请科室或者不同资产归属的器械包
+function loadApplicationTousseSplitByOrgUnit(index) {
+    var appId = array[index].app_id;
+    var tousseJson = array[index].tousseJson;
+    $.ajax({
+        type: "post",
+        url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadApplicationTousseSplitByOrgUnit.do',
+        data: {
+            recyclingRecordId: appId
+        },
+        dataType: 'json',
+        success: function (result) {
+            if (result.success) {
+                if (result.data.length > 0) {
+                    closeDiv();
+                    var data = result.data;
+                    var depart = $('#currentDepartLabel').text();
+                    var table = '<div style="height:310px;overflow: auto;"><div style="font-size:14px;padding:5px">该申请单中以下物品不属于当前回收科室"' + depart + '"，请确认需要拆单回收的物品以及所属科室：</div>';
+                    var name = (sstsConfig.methodOfSplitRecyclingApplication == 2) ? '资产归属' : '所属科室';
+                    table += '<table class="tousseTable saveTousseTable" border="0" cellspacing="0" style="max-height:270px">';
+                    table += '<thead>';
+                    table += '<tr><th>物品名称</th><th>数量</th><th>' + name + '</th><th>是否拆单</th></tr>';
+                    table += '</thead>';
+                    table += '<tbody>';
+                    for (var i = 0; i < data.length; i++) {
+                        table += '<tr>';
+                        table += '<td>' + data[i].tousseName + '</td><td>' + data[i].amount + '</td><td>' + data[i].depart + '</td><td class="isSplit"><input type="radio" name="isSplit_' + i + '" value="true" checked />是 <input type="radio" name="isSplit_' + i + '" value="false" style="margin-left:10px" />否</td>';
+                        table += '</tr>';
+                    }
+                    table += '</tbody>';
+                    table += '</table></div>';
+                    table += '<div style="text-align:center;background: #fff;;width: 100%;padding: 10px 0;"><button type="button" style="font-size:18px" id="saveApplicationTousseSplitByOrgUnit">确认</button></div>';
+                    layer.open({
+                        type: 1,
+                        skin: 'layui-layer-rim', //加上边框
+                        area: ['500px', '400px'], //宽高
+                        title: '拆单回收',
+                        content: table,
+                        success: function () {
+                            //保存不同申请科室或者不同资产归属的器械包
+                            document.getElementById('saveApplicationTousseSplitByOrgUnit').addEventListener('click', function () {
+                                var k = 0;
+                                var splitTousseArray = [];
+                                var newSplitTousseArray = [];
+                                var sumAmountMap = {};
+                                var tousseArrayMap = {};
+                                var newTousseJson = tousseJson;
+                                $('.saveTousseTable').find('.isSplit').each(function (item) {
+                                    var isSplit = $(this).find('input:checked').val();
+                                    var tousseName = $(this).parent().find('td').eq(0).text();
+                                    var amount = parseInt($(this).parent().find('td').eq(1).text());
+                                    if (isSplit == 'true') {
+                                        if (sumAmountMap[tousseName]) {
+                                            sumAmountMap[tousseName] += amount;
+                                        } else {
+                                            sumAmountMap[tousseName] = amount;
+                                        }
+                                    }
+                                })
+                                for (var j = 0; j < tousseJson.length; j++) {
+                                    var tousseName = tousseJson[j].tousseName;
+                                    var amount = tousseJson[j].amount;
+                                    if (tousseArrayMap[tousseName]) {
+                                        tousseArrayMap[tousseName] += amount;
+                                    } else {
+                                        tousseArrayMap[tousseName] = amount;
+                                    }
+                                }
+                                var isAlert = false;
+                                var showTousseName = '';
+                                for (var item in sumAmountMap) {
+                                    var amount = sumAmountMap[item];
+                                    if (tousseArrayMap[item] && tousseArrayMap[item] < amount) {
+                                        showTousseName = item;
+                                        isAlert = true;
+                                        continue
+                                    }
+                                }
+                                if (isAlert) {
+                                    layer.closeAll();
+                                    alertDiv(showTousseName + '拆分数量不能大于回收数量');
+                                    return
+                                }
+                                $('.saveTousseTable').find('.isSplit').each(function (item) {
+                                    var isSplit = $(this).find('input:checked').val();
+                                    var tousseName = $(this).parent().find('td').eq(0).text();
+                                    var amount = parseInt($(this).parent().find('td').eq(1).text());
+                                    var depart = $(this).parent().find('td').eq(2).text();
+                                    if (isSplit == 'true') {
+                                        splitTousseArray[k] = {
+                                            isSplit: isSplit,
+                                            tousseName: tousseName,
+                                            amount: amount,
+                                            depart: depart
+                                        }
+                                        for (var j = 0; j < newTousseJson.length; j++) {
+                                            if (newTousseJson[j].tousseName == tousseName) {
+                                                if (newTousseJson[j].amount - amount <= 0) {
+                                                    newSplitTousseArray[k] = $.extend({}, newTousseJson[j], splitTousseArray[k]);
+                                                    newTousseJson.splice(j, 1);
+                                                } else {
+                                                    newTousseJson[j].amount = newTousseJson[j].amount - amount;
+                                                    newSplitTousseArray[k] = $.extend({}, newTousseJson[j], splitTousseArray[k]);
+                                                }
+                                            }
+                                        }
+                                        k++;
+                                    }
+                                })
+                                array[index].splitTousseJson = newSplitTousseArray;
+                                //array[index].tousseJson = newTousseJson;
+                                alertDiv("保存中,请稍候......", true);
+                                submintApplication(index, true);
+                                layer.closeAll();
+                            })
+                        }
+                    });
+                } else {
+                    submintApplication(index, true);
+                }
+            } else {
+                $('#saveBtnTd').find('input').removeAttr('disabled');
+                showResult(result.message)
+            }
+        }
+    })
+}
+
+function submintApplication(i, isConfirm) {
+    if (sstsConfig.methodOfSplitRecyclingApplication && !isConfirm) {
+        loadApplicationTousseSplitByOrgUnit(i)
+        return;
+    }
+    var url = WWWROOT + "/disinfectSystem/recyclingRecordAction!saveExpressRecycling.do";
+    var data = {
+        params: "" + JSON.stringify(array[i]) + ""
+    }
+    if (array[i].app_id == '') {
+        url = WWWROOT + "/disinfectSystem/recyclingRecordAction!saveRecyclingRecord.do";
+        data = {
+            jsonParam: "" + JSON.stringify(array[i]) + "",
+            departCode: departCoding,
+            depart: currentOrgUnitName
+        }
+    }
+    $.ajax({
+        url: url,
+        type: "POST",
+        timeout: 300000,
+        data: data,
+        success: function (msg) {
+            var json = JSON.parse(msg);
+
+            if (!json.success) {
+                alert(json.msg);
+                array = [];
+            }
+
+            if (json.versionNotMatch) {
+                closeDiv();
+                layer.open({
+                    type: 1,
+                    content: '<span style="font-size:35px">' + json.message + '</span>', //这里content是一个普通的String
+                    btn: ['<span style="font-size:18px">关闭</span>', '<span style="font-size:18px">关闭并刷新</span>'],
+                    area: ['600px', '400px'],
+                    btnAlign: 'c',
+                    btn2: function () {
+                        refresh();
+                    }
+                });
+            } else {
+                updateProgressBar((i + 1));
+            }
+            $('#saveBtnTd').find('input').removeAttr('disabled');
+        },
+        error: function (x, t, m) {
+            if (t == "timeout") {
+                alert("提交超时，请重试");
+            } else {
+                alert(t);
+            }
+            $('#saveBtnTd').find('input').removeAttr('disabled');
+        }
+    });
+}
+
+var maxLen = 0;
+function updateProgressBar(val) {
+    progress(val * (100 / maxLen));
+    if (parseInt(val) < maxLen) {
+        setTimeout("submintApplication(" + parseInt(val) + ")", 50);
+    } else {
+        loadItem();
+        array = new Array();
+    }
+}
+
+var btSave = false;
+function doSaveAction() {
+    if (submitCheck()) {
+        $('#isThisConfirmationForTheRecord').val('false');
+        if (btSave) {
+            return false;
+        } else {
+            $('#saveBtnTd').find('input').attr('disabled', 'disabled');
+            alertDiv("保存中,请稍候......", true);
+            maxLen = array.length;
+            submintApplication(0);
+        }
+    }
+}
+
+function cancel() {
+    if (confirm("确认取消吗?")) {
+        location.href = 'awaitForRecycleList.jsp?resolution=' + resolution + '&source=' + source;
+    }
+}
+
+function selectDepart(departName, departCode) {
+    departCoding = departCode;
+    currentOrgUnitName = departName;
+    $('#currentDepartLabel').text(departName);
+    loadItem();
+}
+
+function openSelectDepart(departType) {
+    var width = 780;
+    var height = 650;
+    var designedTousseWidth = 1080;
+    var designedTousseHeight = 830;
+    var designedWidth = 1920;
+    var designedHeight = 1080;
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var offsetTop = 100;
+    var offsetLeft = '';
+    var heightExtra = 10;
+    if (resolution == '1980') {
+        width = 1100;
+        height = 860;
+    }
+    var zoomRatio = calculateZoomRatio(designedWidth, designedHeight, actualWidth, actualHeight);
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var size = calculateSizeAfterZoom(designedTousseWidth, designedTousseHeight, zoomRatio);
+
+    width = size.width;
+    height = size.height;
+    offsetTop = offsetTop * zoomRatio + 'px';
+    layerIndex = layer.open({
+        type: 2,
+        title: ['选择科室', true],
+        content: 'addDepart.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + "&showDisableOrgUnit=false&departType=" + departType,
+        area: [width + 'px', height + heightExtra + 'px'],
+        border: [5, 0.3, '#fff', true],
+        closeBtn: [2, true],
+        offset: [offsetTop, offsetLeft]
+    });
+}
+
+// 打开添加器械包的窗口
+function openSelectTousse(tousseName) {
+    var width = 780;
+    var height = 650;
+    var designedTousseWidth = 1080;
+    var designedTousseHeight = 830;
+    var designedWidth = 1920;
+    var designedHeight = 1080;
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var offsetTop = 100;
+    var offsetLeft = '';
+    var heightExtra = 10;
+    if (resolution == '1980') {
+        width = 1100;
+        height = 860;
+    }
+    var zoomRatio = calculateZoomRatio(designedWidth, designedHeight, actualWidth, actualHeight);
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var size = calculateSizeAfterZoom(designedTousseWidth, designedTousseHeight, zoomRatio);
+
+    width = size.width;
+    height = size.height;
+    offsetTop = offsetTop * zoomRatio + 'px';
+
+    layerIndex = layer.open({
+        type: 2,
+        title: ['添加器械包', true],
+        content: 'addTousse.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&appCode=' + departCoding + '&tousseType=' + encodeURIComponent('器械包申请单'),
+        area: [width + 'px', height + heightExtra + 'px'],
+        border: [5, 0.3, '#fff', true],
+        closeBtn: [2, true],
+        offset: [offsetTop, offsetLeft]
+    });
+}
+
+// 打开器械包加急的窗口
+function openSetUrgentAmountPage(row, packed) {
+    if (packed) {
+        return false;
+    }
+    var rowArr = row.split(',');
+
+    var isEditIDCardError = false;
+    if ($('#id').val() == "") {
+        isEditIDCardError = true;
+    }
+
+    var msg = '';
+    var itemJson = [];
+    for (var i = rowArr.length - 1; i >= 0; i--) {
+        var isIDCard = false;
+        if ($('#idCardInstanceBarcodes' + rowArr[i]).val() !== '' || $('#tousseOrIDCardInstanceBarcodes' + rowArr[i]).val() !== '') {
+            isIDCard = true;
+        }
+        var tousseType = $('#tousseType' + rowArr[i]).val();
+        if (tousseType == '外来器械拆分小包') {
+            msg = tousseType + "不能添加加急数量！"
+            break
+        }
+        itemJson.push({
+            tousseItemId: $('#tousseItemId' + rowArr[i]).val(),
+            recyclingItemId: $('#recyclingItemId' + rowArr[i]).val(),
+            tousseName: $('#tousseName' + rowArr[i]).val(),
+            applyAmount: $('#applicationAmount' + rowArr[i]).val(),
+            recycleAmount: $('#recycleAmount' + rowArr[i]).val(),
+            urgentAmount: $('#urgentAmount' + rowArr[i]).val(),
+            hiddenUrgentAmount: $('#hiddenUrgentAmount' + rowArr[i]).val(),
+            urgentName: $('#urgentLevel' + rowArr[i]).val(),
+            isIDCard: isIDCard,
+            row: rowArr[i]
+        })
+    }
+    if (msg !== '') {
+        alertDiv(msg);
+        return;
+    }
+    sessionStorage.setItem('itemJson', JSON.stringify(itemJson));
+    var width = 740;
+    var height = 400;
+    var designedTousseWidth = 980;
+    var designedTousseHeight = 700;
+    var designedWidth = 1920;
+    var designedHeight = 1080;
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var offsetTop = 100;
+    var heightExtra = 10;
+    if (resolution == '1980') {
+        width = 980;
+        height = 700;
+    }
+    var zoomRatio = calculateZoomRatio(designedWidth, designedHeight, actualWidth, actualHeight);
+    var size = calculateSizeAfterZoom(designedTousseWidth, designedTousseHeight, zoomRatio);
+
+    var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
+
+    if (!isLessIE11) {
+        document.body.style.zoom = 1;
+        documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio;
+    }
+
+    width = size.width;
+    height = size.height;
+    offsetTop = offsetTop * zoomRatio;
+    layerIndex = layer.open({
+        type: 2,
+        title: ['器械包加急', true],
+        content: 'setTousseUrgentAmount.jsp?resolution=' + resolution + '&width=' + width
+            + '&height=' + height,
+        area: [width + 'px', height + heightExtra + 'px'],
+        border: [5, 0.3, '#fff', true],
+        closeBtn: [2, true],
+        offset: [offsetTop + 'px', '']
+    });
+}
+
+function loadItem() {
+    $("#tousseItemTbody").empty();
+    $("#basketsUl").empty();
+    $("#loadingPutBasket").empty();
+    document.onkeydown = showKeyDown;
+    var index = layer.load(1, {
+        content: '加载中,请稍后...',
+        shade: [0.6, '#fff'], //0.1透明度的白色背景
+        success: function (layero) {
+            layero.find('.layui-layer-content').css({
+                'width': '300px',
+                "font-weight": "bold",
+                "font-size": "26px",
+                "text-align": "center",
+                "line-height": "37px"
+            });
+        }
+    });
+
+    var params = {}
+
+    //GDSFYBJY-29：科室快速回收
+    params.type = departExpressRecycling;
+    params.departCoding = departCoding;
+
+    $.ajax({
+        type: 'post',
+        url: WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForQuickRecyclingTousse.do',
+        dataType: 'json',
+        data: params,
+        success: function (msg) {
+            for (var i = 0; i < msg.length; i++) {
+                var item = msg[i];
+                var m = 0;
+                for (var itemDate in item) {
+                    var date = itemDate;
+                    var paramsItem = {
+                        isThereIdentificationCard: '否',
+                        depart: date,
+                        row: m,
+                        itemLevel: 1,
+                        tousseAmount: Object.keys(item[date]).length
+                    };
+                    addToussItem(paramsItem);
+                    var n = 0;
+                    for (var tousse in item[date]) {
+                        var tousseName = tousse;
+                        var paramsItem = {
+                            row: m + '_' + n,
+                            depart: '展开',
+                            dateStr: date,
+                            tousseName: tousseName,
+                            applicationAmount: 1,
+                            isThereIdentificationCard: '否',
+                            recycleAmount: 1,
+                            itemLevel: 2,
+                            tousseAmount: Object.keys(item[date]).length,
+                            childCount: item[date][tousseName].length
+                        };
+                        addToussItem(paramsItem);
+                        var sumApplicationAmount = 0;
+                        var sumRecycleAmount = 0;
+                        for (var k = 0; k < item[date][tousseName].length; k++) {
+                            var lastTousseItem = item[date][tousseName][k];
+                            var paramsItem = lastTousseItem;
+                            var recycleAmount = lastTousseItem.prepareRecycleAmount;
+                            if (recycleAmount == null || recycleAmount == 0) {
+                                recycleAmount = lastTousseItem.amount;
+                            }
+                            paramsItem.row = m + '_' + n + '_' + k;
+                            paramsItem.isThereIdentificationCard = '否';
+                            paramsItem.applicationAmount = lastTousseItem.amount;
+                            paramsItem.recycleAmount = recycleAmount;
+                            paramsItem.itemLevel = 3;
+                            paramsItem.childRow = m + '_' + n;
+                            paramsItem.depart = paramsItem.serialNumber;
+                            paramsItem.dateStr = date;
+                            addToussItem(paramsItem);
+
+                            sumApplicationAmount += parseInt(lastTousseItem.amount)
+                            sumRecycleAmount += parseInt(lastTousseItem.amount)
+                        }
+                        $('#applicationAmount' + m + '_' + n).val(sumApplicationAmount);
+                        $('#recycleAmount' + m + '_' + n).val(sumRecycleAmount);
+                        reloadFirstUrgent(m + '_' + n)
+                        n++
+                    }
+                    m++;
+                }
+            }
+            layer.close(index);
+        },
+        error: function () {
+        }
+    });
+    if (sstsConfig.loadWashLoadingStatusBasketsWhenRecycling) {
+        getWashLoadingStatusBaskets()
+    }
+}
+
+function encodeAll(text) {
+    var encoded = encodeURI(text);
+    encoded = encoded.replace('#', '%23');// 对#号进行转码
+    return encoded;
+}
+
+function userContainer(that, user, basketName, basketBarcode, classifyBasketId, containerColorCode) {
+    if (event && event.preventDefault) {
+        event.preventDefault();
+    } else {//IE中阻止函数器默认动作的方式
+        window.event.returnValue = false;
+    }
+    if (user == 1) {
+        var sumCount = $(that).parent().parent().find('.totalAmount').text();
+        var msg = {
+            basket: {
+                containerBarcode: basketBarcode,
+                id: classifyBasketId,
+                containerName: basketName,
+                washClassifyType: '',
+                containerColorCode: containerColorCode,
+                sumCount: parseInt(sumCount)
+            }
+        }
+        addBasketElement(msg);
+        $(that).parent().parent().remove();
+    } else {
+        var sumCount = $(that).parent().find('.totalAmount').text();
+        var msg = {
+            basket: {
+                containerBarcode: basketBarcode,
+                id: classifyBasketId,
+                containerName: basketName,
+                washClassifyType: '',
+                containerColorCode: containerColorCode,
+                sumCount: parseInt(sumCount)
+            }
+        }
+        addBasketElement(msg);
+        $(that).parent().remove();
+    }
+}
+function basketLoadGoods(basketName, basketBarcode, classifyBasketId) {
+    var width = 740;
+    var height = 400;
+    var designedTousseWidth = 980;
+    var designedTousseHeight = 700;
+    var designedWidth = 1920;
+    var designedHeight = 1080;
+    var actualWidth = window.screen.availWidth;
+    var actualHeight = window.screen.availHeight;
+    var offsetTop = 100;
+    var heightExtra = 10;
+    if (resolution == '1980') {
+        width = 1080;
+        height = 800;
+    }
+    var zoomRatio = calculateZoomRatio(designedWidth, designedHeight, actualWidth, actualHeight);
+    var size = calculateSizeAfterZoom(designedTousseWidth, designedTousseHeight, zoomRatio);
+
+    var bodyZoom = calculateZoomRatio(2600, 1462, actualWidth, actualHeight);
+
+    width = size.width;
+    height = size.height;
+    offsetTop = offsetTop * zoomRatio;
+    var areaWidth = width / bodyZoom * 1;
+    var areaHeight = height / bodyZoom * 1;
+    var offsetLeft = (2600 - areaWidth) / 2 + 'px';
+    if (isIE()) {
+        areaWidth = width;
+        areaHeight = height;
+        offsetLeft = '';
+    }
+    layerIndex = layer.open({
+        type: 2,
+        title: ['[' + basketName + ']    已装载物品列表', true],
+        content: 'basketLoadGoodsView.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&basketBarcode=' + basketBarcode + '&classifyBasketId=' + classifyBasketId,
+        area: [areaWidth + 'px', areaHeight + heightExtra + 'px'],
+        border: [5, 0.3, '#fff', true],
+        closeBtn: [2, true],
+        offset: [offsetTop + 'px', offsetLeft]
+    });
+}
+//获取清洗装载状态的篮筐
+function getWashLoadingStatusBaskets() {
+    $.ajax({
+        type: "post",
+        url: WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+        dataType: 'json',
+        async: true,
+        success: function (result) {
+            if (result.length > 0) {
+                for (var i = 0; i < result.length; i++) {
+                    var containerBarcode = result[i].containerBarcode;
+                    var containerName = result[i].containerName;
+                    var id = result[i].id;
+                    var sumAmount = 0;
+                    var text = '';
+                    var sumText = '';
+                    var containerColorCode = result[i].containerColorCode || '';
+                    var containerFontColor = setFontColor(containerColorCode)
+                    for (var j = 0; j < result[i].classifiedItems.length; j++) {
+                        var name = result[i].classifiedItems[j].name;
+                        var amount = result[i].classifiedItems[j].amount;
+                        sumAmount += parseInt(amount);
+                        text += name + '*' + amount + '，';
+                    }
+                    var basketElement = '';
+                    if (containerColorCode !== '') {
+                        basketElement += '<li style="background:' + containerColorCode + ';color:' + containerFontColor + '">';
+                    } else {
+                        basketElement += '<li>';
+                    }
+                    basketElement += '<input type="hidden">';
+                    basketElement += '<i>';
+                    basketElement += '<a href="javascript:void(0);" class="btn1" id="B' + containerBarcode + '" onclick="userContainer(this,1,\'' + containerName + '\',\'' + containerBarcode + '\',\'' + id + '\',\'' + containerColorCode + '\');">使用</a>';
+                    basketElement += '</i>';
+                    basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
+
+                    var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+                    var imageButton = '';
+                    if (showBasketLoadMaterialAmount == true) {
+                        imageButton = '<img src="/images/btn_query.png" onclick = "basketLoadGoods(\'' + containerName + '\',\'' + containerBarcode + '\',\'' + id + '\');" >';
+                    }
+
+                    if (text !== '') {
+                        if (text.split('，').length > 4) {
+                            sumText = text.split('，')[0] + '，' + text.split('，')[1] + '，' + text.split('，')[2] + '......';
+                        } else {
+                            if (text.split('，').length == 2) {
+                                sumText = text.split('，')[0];
+                            } else if (text.split('，').length == 3) {
+                                sumText = text.split('，')[0] + '，' + text.split('，')[1];
+                            } else if (text.split('，').length == 4) {
+                                sumText = text.split('，')[0] + '，' + text.split('，')[1] + '，' + text.split('，')[2]
+                            }
+                        }
+                    }
+
+                    var amountStyle = (result[i].percentage == 1) ? 'color:red' : '';
+
+                    basketElement += '<font onclick="userContainer(this,0,\'' + containerName + '\',\'' + containerBarcode + '\',\'' + id + '\',\'' + containerColorCode + '\');");">' + (containerName) + '' + imageButton + '</font>';
+                    basketElement += '<font class="totalAmount" style="' + amountStyle + '">' + sumAmount + '</font>';
+                    basketElement += '<dl class="sed clearfix" style="padding:0 15px">' + sumText + '</dl>';
+                    basketElement += '</li>';
+                    var obj = $(basketElement);
+                    $("#loadingPutBasket").prepend(obj);
+                }
+                $("#scanContainerBarcodeTipUl").hide();
+            } else {
+                if ($("#basketsUl > li").length == 0) {
+                    $("#scanContainerBarcodeTipUl").show();
+                } else {
+                    $("#scanContainerBarcodeTipUl").hide();
+                }
+            }
+        }
+    })
+}
+
+function init() {
+    if (sstsConfig.recycleAllTousseIntoBasketInExpressRecycle) {
+        $('#allIntoBasket').show();
+    } else {
+        $('#allIntoBasket').hide();
+    }
+    applyTimeHidden = true;
+    applyTimeText = '申请时间';
+    //BJDXZLYY-62：扩展字段
+    var expandFieldsConfigOfeExpressRecycle = sstsConfig.expandFieldsConfigOfeExpressRecycle || [];
+    if (expandFieldsConfigOfeExpressRecycle.length > 0) {
+        for (var i = 0; i < expandFieldsConfigOfeExpressRecycle.length; i++) {
+            if (expandFieldsConfigOfeExpressRecycle[i].fieldName == 'applyTime') {
+                applyTimeHidden = false;
+                applyTimeText = expandFieldsConfigOfeExpressRecycle[i].displayText;
+            }
+        }
+    }
+}
+
+$(function () {
+    progressbar = $("#progressbar");
+    progressLabel = $(".progress-label");
+    progressbar.progressbar({
+        value: false,
+        change: function () {
+            progressLabel.text(parseInt(progressbar.progressbar("value")) + "%");
+        },
+        complete: function () {
+            progressLabel.text("完成！");
+            setTimeout(function () {
+                closeDiv();
+            }, 500);
+        }
+    });
+    document.onkeydown = showKeyDown;
+    // 售后-中山大学附属第一医院ASSZDFY-48 快速回收响应慢问题,配置项为true,打开快速回收页面时显示空白页，不加载快速回收信息 
+    if (!sstsConfig.showBlankPageWhenOpenExpressRecyclePage) {
+        loadItem();
+    }
+    $('#currentDepart').show();
+    $('#changeDepart').show();
+    openSelectDepart(3);
+    $('#theadNameByDepartName').text('日期/流水号')
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/departRecycleForTouchScreen.jsp	(revision 41611)
@@ -0,0 +1,459 @@
+<%@page import="com.forgon.disinfectsystem.entity.videomonitor.Workstation"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.tousseGroup.TousseGroup"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.tousseGroup.service.TousseGroupManager"%>
+<%@page import="java.util.List"%>
+<%@page import="com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.departmentgroup.service.DepartmentGroupManager"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="com.forgon.tools.SpringBeanManger"%>
+<%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="apple-mobile-web-app-capable" content="yes" />
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<title>消毒供应中心质量追溯管理系统</title>
+<script src="alertDiv/CJL.0.1.min.js?version=${svnRevision}"></script>
+<script src="alertDiv/AlertBox.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="js/jquery-min.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="js/message-box.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="layer-v3.0.3/layer/layer.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-ui-1.10.2/js/jquery-ui-1.10.2.custom.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/RecyclingRecordTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
+<script src="${ctx}/js/magnificPopup/jquery.magnific-popup.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="commonRecycle.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
+<link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
+<link rel="stylesheet" href="${ctx}/jquery/jquery-ui-1.10.2/css/south-street/jquery-ui-1.10.2.custom.css" type="text/css" />
+<!-- alertDIV -->
+<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/expressStyle.css?version=${svnRevision}" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/divselect.js?version=${svnRevision}"></script>
+<script>
+	layer.config({
+		extend: 'myskin/style.css', //加载您的扩展样式
+		skin: 'layer-ext-myskin'
+	});
+</script>
+<style type="text/css">
+	.ui-dialog .ui-dialog-titlebar {
+		font-size: 30px;
+		padding: .1em 1em;
+		position: relative;
+	}
+	.ui-progressbar {
+		position: relative;
+	}
+	.progress-label {
+		position: absolute;
+		left: 40%;
+		top: 0px;
+		font-weight: bold;
+		text-shadow: 0px 0px 0 #fff;
+	}
+	.bgImg {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: -1;
+	}
+	.mbody {
+		width: 100%;
+		height: 100%;
+		background: none;
+		position: absolute;
+		left: 0;
+		top: 0;
+		background: none !important;
+	}
+	.mbody .btn-h {
+		margin: 0 !important;
+		position: absolute;
+	}
+	.add-form {
+		position: relative !important;
+		top: 12%;
+		left: 2%;
+		width: 60.7%;
+		height: 9%;
+	}
+	.data-table .image-box .box {
+		display: block;
+		height: 90%;
+		background: none;
+	}
+	#divselect{
+		margin: 0 !important;
+		position: absolute !important;
+		right: 2%;
+    	bottom: 10px;
+		display: none;
+	}
+	#divTousseGroup{
+		margin: 0 !important;
+		position: absolute !important;
+		bottom: 10px;
+    	left: 2%;
+		display: none;
+	}
+	.zhuangzai-table .sumCount {
+		margin-left: 0 !important;
+	}
+	#currentDepart {
+		position: absolute !important;
+		left: 10px;
+		font-size: 28px;
+		color: #fff;
+		bottom: 10px;
+		display: none;
+	}
+	#changeDepart {
+		position: absolute !important;
+		right: 11%;
+    	bottom: 10px;
+		display: none;
+	}
+	#changeDepart img {
+		height: 40px;
+		cursor: pointer;
+	}
+	
+	.tousseTable {
+		width: 480px;
+	}
+
+	.tousseTable th,.tousseTable td {
+		height: 30px;
+		border: 1px solid #ddd;
+		text-align: center;
+		line-height: 30px;
+	}
+
+	.basketSizeBox {
+		line-height: 38px;
+		height: 38px;
+		display: none;
+	}
+	.basketSize {
+		height: 35px;
+		width: 90px;
+		font-size: 20px;
+	}
+	.tabClass {
+		color: blue;
+	}
+
+	.data-table {
+		position: relative;
+		width: 60.7%;
+		height: 74%;
+		left: 1.9%;
+		top: 12%;
+	}
+	.data-table .image-box {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 90%;
+		background: none;
+		overflow: hidden;
+	}
+	.data-table .image-box table {
+		margin: 0;
+		width: 100%;
+		height: 100%;
+	}
+	.data-table .btn-box {
+		position: absolute;
+		left: 0;
+		bottom: 0%;
+		width: 100%;
+		height: 12%;
+		text-align: center;
+	}
+	.data-table .btn-box img {
+		width: 100px;
+	}
+	.data-table .input-a {
+		width: 319px;
+	}
+
+	.data-table .image-box table thead, tbody tr {
+		display: table;
+		table-layout: fixed;
+		width: 100%;
+		height: 7%;
+		text-align: center;
+	}
+	.data-table .image-box table tbody tr {
+		height: 40px;
+	}
+
+	.image-box table .title th,.image-box table td{
+		font-size: 16px;
+	}
+
+	.zhuangzai-table {
+		position: absolute;
+		right: 2.7%;
+		top: 26%;
+		width: 32.8%;
+		height: 68%;
+	}
+	.zhuangzai-table .box {
+		height: 655px;
+	}
+	.zhuangzai-table .box {
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.zhuangzai-table table {
+		width: 100%;
+		border: 0;
+		height: 7%;
+		background: #Fff;
+	}
+	.data-table .box {
+		overflow: hidden;
+	}
+	#tousseItemTbody {
+		overflow-y: scroll;
+	}
+	#allIntoBasket {
+		display: none;
+		right: 21%;
+		bottom: 10px;
+	}
+	#allIntoBasket img {
+		height: 40px;
+		cursor: pointer;
+	}
+	.divStyle {     
+		float:left;
+		display:inline;     
+		width:40px;
+		height:40px;
+		color:#FFFFFF;
+		text-align:center;
+		vertical-align:middle;
+		line-height:42px;
+		position: relative;
+	}
+	.divStyle img {
+		width: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: -1;
+	}
+	#addTousse {
+		position: absolute !important;
+		right: 1%;
+    	bottom: 10px;
+	}
+	#addTousse img {
+		height: 40px;
+		cursor: pointer;
+	}
+	.amountLabel {
+        position: absolute;
+        right: 25px;
+		top: -35px;
+		font-size: 18px;
+        color: #fff;
+        font-weight: bold;
+    }
+</style>
+
+<style>
+	#divselect{width:220px; margin:-53px 700px; position:relative; z-index:10000;}
+	#divselect cite{width:180px; height:40px;line-height:40px;font-size:22px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
+	#divselect ul{width:284px;max-height:500px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
+	#divselect ul li{height:40px; line-height:40px;}
+	#divselect ul li a{display:block;font-size:22px; height:40px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+	#divselect ul li a:hover{background-color:#CCC;}
+	
+	#divTousseGroup{width:300px; margin:-20px -80px; position:relative; z-index:10000;}
+	#divTousseGroup cite{width:220px; height:40px;line-height:40px;font-size:22px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
+	#divTousseGroup ul{width:284px;max-height:500px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
+	#divTousseGroup ul li{height:40px; line-height:40px;}
+	#divTousseGroup ul li a{display:block;font-size:22px; height:40px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+	#divTousseGroup ul li a:hover{background-color:#CCC;}
+	#basketsUl li .totalAmount{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
+	.lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}
+	.lightbox dt{background:#f4f4f4;padding:5px;}
+	.lightbox dd{ padding:20px; margin:0;}
+</style>
+</head>
+<%
+    String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+    String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName();
+	String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
+    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+    int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
+    request.setAttribute("supplyRoomType", supplyRoomType);
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    request.setAttribute("today", dateFormat.format(new Date()));
+    request.setAttribute("orgUnitCoding",orgUnitCoding);
+    request.setAttribute("orgUnitName",orgUnitName);
+	request.setAttribute("currentOrgUnitCode",currentOrgUnitCode);
+	request.setAttribute("currentOrgUnitName",orgUnitName);
+    
+    DepartmentGroupManager departmentGroupManager = (DepartmentGroupManager)SpringBeanManger.getBean("departmentGroupManager");
+    List<DepartmentGroup> groups = departmentGroupManager.getAll();
+    request.setAttribute("departmentGroups", groups);
+    
+    TousseGroupManager tousseGroupManager = (TousseGroupManager)SpringBeanManger.getBean("tousseGroupManager");
+    List<TousseGroup> tousseGroups = tousseGroupManager.getAll();
+    request.setAttribute("tousseGroups", tousseGroups);
+%>
+<body onload="init();">
+<dl id="idBox" class="lightbox" style="top:10%;left:5%;">
+    <dt><b style="font-size:20px">提示信息</b> </dt>
+    <dd>
+    	<div id="progressbar" style="width:355px;display:none"><div class="progress-label">提交中...</div></div>
+        <span id="showWord" style="font-size:35px">条码长度不符合规范！</span>
+        <br/>
+        <center>
+            <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value=" X " id="idBoxClose" />
+        </center>
+    </dd>
+</dl>
+
+<div id="dialogConfirm" title="提示">
+  <p id="confirmMsg"></p>
+</div>
+<!-- alertDIV -->
+
+<div class="mbody">
+	<img class="bgImg" src="1980/images/foreignTousse_recycle.jpg"/>
+    <!--操作 start-->
+    <div class="add-form">
+		<div id="allIntoBasket">
+			<img id="allIntoBasketImg" src="1980/images/allIntoBasketByExpress.png" onclick="allInputBasket();"/>
+		</div>
+        <form id="recyclingRecordForm" method="post" action="${ctx}/disinfectSystem/recyclingRecordAction!saveExpressRecycling.do">
+            <input type="hidden" id="resolution" name="resolution" value="${param.resolution}"/>
+            <input type="hidden" id="isThisTouchScreen" name="isThisTouchScreen" value="true"/>
+            <input type="hidden" id="containersInfo" name="containersInfo"/>
+            <input type="hidden" id="tousseInstanceIds" name="tousseInstanceIds"/>
+            <input type="hidden" id="recyclingErrors" name="recyclingErrors"/>
+            <input type="hidden" id="recyclingDamage" name="recyclingDamage"/>
+            <c:if test="${param.resolution != 1980}">
+            <div class=scanDiv><input id="codeScan" name="codeScan" type="text" class="inputScan" /></div>
+            </c:if>
+        </form>
+
+		<div id="currentDepart">
+			<span>当前科室：</span><span id="currentDepartLabel">${orgUnitName}<span>
+		</div>
+
+		<div id="changeDepart">
+			<img src="./1980/images/changeDepart.png" style="margin-left: 20px;" onclick="openSelectDepart(3);" />
+		</div>
+
+        <div id="addTousse">
+			<img id="addTousseImg" src="1980/images/addTousseByExpress.png" onclick="openSelectTousse();"/>
+		</div>
+    </div>
+    <!--操作 end-->
+    <!--表单 start-->
+    <div class="data-table">
+        <div class="box">
+			<div class="box image-box">
+				<table id="tousseItemTable" border="0" align="center" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr class="title">
+							<th width="15%" id="theadNameByDepartName">科室名称</th>
+							<th width="15%" id="theadNameByApplyTimeName" style="display: none;">申请时间</th>
+							<th width="35%">器械包名称</th>
+							<th width="10%">申请数量</th>
+							<th width="5%">增</th>
+							<th width="10%">回收数量</th>
+							<th width="5%">减</th>
+							<th width="15%">操作</th>
+							<th width="2%"></th>
+						</tr>
+					</thead>
+					<tbody class="box" id="tousseItemTbody">
+						
+					</tbody>
+				</table>
+			</div>
+        </div>
+        <div class="btn-box">
+            <table width="50%" border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td id="saveBtnTd"><input type="button" value="保存" class="btn-e" onclick="doSaveAction();"></td>
+                <td><input type="button" value="取消" class="btn-d" onclick="cancel();"></td>
+              </tr>
+            </table>
+        </div>
+    </div>
+    <!--表单 end-->
+    <!--待装载篮筐 start-->
+    <div class="zhuangzai-table">
+		<div class="amountLabel">已回收筐数:<span id="basketsAmount">0</span> 包数:<span id="tousseAmount">0</span></div>
+        <div class="box image-box">
+			<table border="0" align="center" cellpadding="0" cellspacing="0">
+				<thead>
+					<tr class="title">
+						<th>名称</th>
+						<th width="80px">数量</th>
+						<th width="130px">操作</th>
+					</tr>
+				</thead>
+			</table>
+			<div style="height: 93%;overflow-y: scroll;">
+				<ul id="basketsUl" class="list-item clearfix">
+				</ul>
+				<ul id="loadingPutBasket" class="list-item clearfix">
+					
+				</ul>
+			</div>
+        </div>
+    </div>
+    <!--待装载篮筐 end-->
+</div>
+
+<script type="text/javascript">
+	var WWWROOT = '${ctx}';
+	var resolution = '${param.resolution}';
+	var source = '${param.source}';
+	var shipped = '<%=TousseInstance.STATUS_SHIPPED%>';
+	var used = '<%=TousseInstance.STATUS_USED%>';
+	var errorTypeAdd = "<%= RecyclingError.ERRORTYPE_ADD%>";
+	var errorTypeReduce = "<%= RecyclingError.ERRORTYPE_REDUCE%>";
+
+	var today = '<%=request.getAttribute("today")%>';
+	var userName = '<%=request.getAttribute("userName")%>';
+	var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>';
+	var secondOrgUnitName = '<%=request.getAttribute("orgUnitName")%>';
+	var supplyRoomType_val = '${supplyRoomType}';
+	var departExpressRecycling = 'departExpressRecycling';
+	var departCoding = '${currentOrgUnitCode}';
+	var currentOrgUnitName = '${currentOrgUnitName}';
+	
+</script>
+<script type="text/javascript" src="departRecycleForTouchScreen.js?version=${svnRevision}"></script>
+</body>
+<jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
+	<jsp:param value="<%=Workstation.TRIGGERMODULE_RECYCLING %>" name="module"/>
+</jsp:include>
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r41066 -r41611
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 41066)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js	(.../awaitForRecycleList.js)	(revision 41611)
@@ -1040,9 +1040,9 @@
 	location.href = "expressRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + '&source=' + source; 
 }
 
-//GDSFYBJY-29：科室快速回收
+//GDSFYBJY-42：科室快速回收
 function openQuickForDepartRecyclePage() {
-	location.href = "expressRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + '&source=' + source + '&type=departExpressRecycling'; 
+	location.href = "departRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + '&source=' + source; 
 }
 
 //DGZYY-236：外来器械新增快速回收