Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
===================================================================
diff -u -r18201 -r18601
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 18201)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 18601)
@@ -80,6 +80,9 @@
             String whereSql = raRoomControlHelper.buildWhereSql(supplyRoomVo);
             String sql = "select * from (" + selectSql + whereSql + " order by po.\"applicationTime\" ";
             String countSql = "select count(*), sum(po.\"amount\"), sum(po.\"recyclingAmount\") from (";
+            if (TousseDefinition.PACKAGE_TYPE_DRESSING.equals(supplyRoomVo.getTousseType()) || DisposableGoods.TYPE_NAME.equals(supplyRoomVo.getTousseType())) {
+            	countSql = "select count(*), sum(po.\"amount\"), 0 from (";
+            }
             countSql += selectSql + whereSql;
             logger.debug("[sql]:" + sql);
             return this.getResult(raRoomControlHelper, sql, countSql);
Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r18201 -r18601
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18201)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18601)
@@ -442,6 +442,7 @@
 				iconCls : 'icon_set',
 				handler : function() {
 					$Id('goodsSearch').value = "";
+					$Id('tousseType').value = "";
 					$Id('department').value = "";
 					$Id('startDate').value = "";
 					$Id('endDate').value = "";
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
===================================================================
diff -u -r16631 -r18601
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 16631)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java	(.../SupplyRoomControlAction.java)	(revision 18601)
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -11,9 +12,12 @@
 import com.forgon.disinfectsystem.vo.TousseOperate;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
+
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -51,6 +55,10 @@
 	}
 	
 	public void searchRecyclingApplication(){
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		Map<String, Object> applicationMap = supplyRoomControlManager2.getRecyclingApplicationList(supplyRoomVo);
 		// Map applicationMap = supplyRoomControlManager.getRecyclingApplicationList(statDate, endDate, department,start, limit, tousseName,tousseType);
 		ObjectMapper mapper = new ObjectMapper();
@@ -105,6 +113,10 @@
 		// String limit = StrutsParamUtils.getPraramValue("limit", "");
 		// String start = StrutsParamUtils.getPraramValue("start", "");
 		// String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		Map<String, Object> washDisinfectionMap = supplyRoomControlManager2.getWashDisinfectionList(supplyRoomVo);
 		// Map washDisinfectionMap = supplyRoomControlManager.getWashDisinfectionList(statDate, endDate, departCoding,start, limit, tousseName,tousseType);
 		ObjectMapper mapper = new ObjectMapper();
@@ -120,6 +132,10 @@
 		
 	}
 	public void searchPacking(){
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		// Map packingMap = supplyRoomControlManager.getPackingList(statDate, endDate, departCoding,start, limit, tousseName,tousseType);
 		Map<String, Object> packingMap = supplyRoomControlManager2.getPackingList(supplyRoomVo);
 		ObjectMapper mapper = new ObjectMapper();
@@ -135,6 +151,10 @@
 		
 	}
 	public void searchReview(){
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		// Map reviewMap = supplyRoomControlManager.getReviewList(statDate, endDate, departCoding,start, limit, tousseName,tousseType);
 		Map<String, Object> reviewMap = supplyRoomControlManager2.getReviewList(supplyRoomVo);
 		ObjectMapper mapper = new ObjectMapper();
@@ -150,6 +170,10 @@
 		
 	}
 	public void searchSterilization(){
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		Map<String, Object> sterilizationMap = supplyRoomControlManager2.getSterilizationList(supplyRoomVo);
 		// Map sterilizationMap = supplyRoomControlManager.getSterilizationList(statDate, endDate, departCoding,start, limit, tousseName,tousseType);
 		ObjectMapper mapper = new ObjectMapper();
@@ -166,6 +190,10 @@
 	}
 	public void searchInvoice(){
 		// Map invoiceMap = supplyRoomControlManager.getInvoicePlanList(statDate, endDate, department,start, limit, tousseName,tousseType);
+		//如果器械包名称为称,则器械包类型也要设置为空,防止先选了器械包、然后删除包名称后查询到的结果不对的情况
+		if(StringUtils.isBlank(supplyRoomVo.getTousseName())){
+			supplyRoomVo.setTousseType("");
+		}
 		Map<String, Object> invoiceMap = supplyRoomControlManager2.getInvoicePlanList(supplyRoomVo);
 		ObjectMapper mapper = new ObjectMapper();
 		String applicationData = "";