Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r34635 -r34637
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34635)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34637)
@@ -6737,16 +6737,29 @@
 		requestParms.templateIds = '';
 	} else {
 		var idsArr = [];
+		var isCheckedAll = true;
 		for (var i = 0; i < checkboxs.length; i++) {
-			if (checkboxs[i].checked && parseInt(checkboxs[i].value) !== 0) {
-				if (checkboxs[i].dataset) {
-					tousseNameValue.push(checkboxs[i].dataset.value)
-				} else if (checkboxs[i]['data-value']) {
-					tousseNameValue.push(checkboxs[i]['data-value'])
+			if (parseInt(checkboxs[i].value) !== 0) {
+				if (checkboxs[i].checked) {
+					if (checkboxs[i].dataset) {
+						tousseNameValue.push(checkboxs[i].dataset.value)
+					} else if (checkboxs[i]['data-value']) {
+						tousseNameValue.push(checkboxs[i]['data-value'])
+					}
+					idsArr.push(checkboxs[i].value);
 				}
-				idsArr.push(checkboxs[i].value)
+				if (!checkboxs[i].checked) {
+					isCheckedAll = false;
+				}
 			}
 		}
+		if (obj.checked) {
+			if (isCheckedAll) {
+				checkboxs[0].checked = true;
+			}
+		} else {
+			checkboxs[0].checked = obj.checked;
+		}
 		requestParms.templateIds = idsArr.join(',');
 	}
 	var layerShowLoad = layer.load(1, {
@@ -6849,10 +6862,10 @@
 						setTousseItemLoadedAmountCss(k);
 					}
 				}
-				
-				if(requestParms.templateIds == ''){
+
+				if (requestParms.templateIds == '') {
 					$('#departmentTemplate').val('全部模板');
-				}else {
+				} else {
 					$('#departmentTemplate').val(tousseNameValue.join(','));
 				}
 
@@ -6866,7 +6879,10 @@
 			var id = tousseItemsTable2[j].id || '';
 			if (id !== '') {
 				var index = id.split('tousseItemsTr')[1];
-				$('#tousseItemsTr' + index).remove();
+				var loadedAmount = $('#loadedAmount' + index).val();
+				if (parseInt(loadedAmount) == 0) {
+					$('#tousseItemsTr' + index).remove();
+				}
 			}
 		}
 		$('#departmentTemplate').val('选择模板');