Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
===================================================================
diff -u -r27800 -r28056
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java	(.../IpRoomControlHelper.java)	(revision 27800)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java	(.../IpRoomControlHelper.java)	(revision 28056)
@@ -70,7 +70,7 @@
         String taskGroup = supplyRoomVo.getTaskGroup();
         String whereSql = String.format(" from Invoice i join InvoiceItem po on i.id = po.invoice_id " +
                 " left join InvoicePlan ip on i.invoicePlan_ID  = ip.id " +
-                " where (ip.type in (%s) or ip.type is null) and i.status in ('已发货','收货签收') %s " +
+                " where ip.type in (%s) and i.status in ('已发货','收货签收') %s " +
                 " and i.sendTime between %s and %s", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, whereSqlForOrgUnitCoding, dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate()), dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate()));
         whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySql(supplyRoomVo.getTousseName(), supplyRoomVo.getTousseType(), whereSql);
         if (StringUtils.isNotBlank(departCoding)) {
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r27994 -r28056
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 27994)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 28056)
@@ -75,6 +75,7 @@
 	 		 + InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION + "','"
 	 		 + InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM + "','"
 	 		 + InvoicePlan.TYPE_BORROWINGSINGLE + "','"
+	 		 + InvoicePlan.TYPE_GOODS_RESERVATION_FORM + "','"
 	 		 + InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"'";
 	//器械包类型
 	public static final String TOUSSE_TYPE = "'"