Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
===================================================================
diff -u -r22523 -r22531
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java	(.../ReAppTableSqlHandler.java)	(revision 22523)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java	(.../ReAppTableSqlHandler.java)	(revision 22531)
@@ -4,6 +4,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -12,6 +13,7 @@
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.tools.SqlBuilder;
@@ -246,6 +248,27 @@
         String startTime = sqlWhereParamMap.get("startTime");
         String endTime = sqlWhereParamMap.get("endTime");
         String timeSearchFmt = sqlWhereParamMap.get("timeSearchFmt");
+        
+        //如果开始时间为空则取当天的开始时间或者取当月的开始时间（看配置）
+        if (StringUtils.isBlank(startTime)) {
+        	boolean startDateIsToday = CssdUtils.getSystemSetConfigByNameBool("startDateIsToday");
+        	if (startDateIsToday) {
+        		Calendar date = Calendar.getInstance(Locale.CHINA);
+        		date.set(Calendar.HOUR_OF_DAY, 0);
+        		date.set(Calendar.MINUTE, 0);
+        		date.set(Calendar.SECOND, 0);
+        		startTime = date.getTimeInMillis() + "";
+        	} else {
+        		Date date = DateUtils.setDays(new Date(), 1);
+        		startTime = date.getTime() + "";
+        	}
+        }
+        
+        //如果结束时间为空则取当前时间
+        if (StringUtils.isBlank(endTime)) {
+        	endTime = System.currentTimeMillis() + "";
+        }
+        
         if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) && StringUtils.isNotBlank(timeSearchFmt)) {
             String start;
             String end;
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.js
===================================================================
diff -u -r19036 -r22531
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.js	(.../tousseSpecificationSizeStatistics.js)	(revision 19036)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.js	(.../tousseSpecificationSizeStatistics.js)	(revision 22531)
@@ -125,12 +125,7 @@
 					forceSelection : true,
 					mode : 'local',
 					triggerAction : 'all',
-					anchor : '95%',
-					listeners : {
-						render : function(_this) {
-							supplyRoomStore.load();
-						} 
-					}
+					anchor : '95%'
 				}]
 			}]
 		}],
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r22523 -r22531
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 22523)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 22531)
@@ -185,6 +185,8 @@
 var parm_s_status = document.getElementById('parm_s_status');
 parm_s_status.value = quickQueryDefaultValue;
 
+//设置查询时间的默认值
+document.getElementById('parm_s_timeSearchFmt').value = sstsConfig.timeSearchFmt ? sstsConfig.timeSearchFmt : 'Y-m-d';
 
 var curUserName = '${userName}';       //登录用户的全名
 var userCode = '${userCode}';  		   //登录用户的登录名
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r22314 -r22531
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 22314)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 22531)
@@ -224,25 +224,24 @@
 		
 		//3、未处理完的单和今天处理完的单
 		if("todoList".equals(sqlWhereParamMap.get("listType"))){
-			//回收状态（“待回收”、“部分回收”）
-			String recyclingStatusSql = SqlBuilder.build_IN_Statement(
-					"po.recyclingStatus", SqlBuilder.IN, InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
-
-			//发货状态（“待发货”、“部分发货”、“不发货的单”）
-			String deliverStatusSql = String.format(
-					" (po.deliverStatus='%s' or po.deliverStatus='%s' or po.deliverStatus='' or po.deliverStatus is null) ",
-					InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
+			//回收状态:待回收,部分回收（针对哪一些不需要发货的）
+			String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
+			recyclingStatusSql = String.format("((deliverStatus='' or deliverStatus is null) and %s)", recyclingStatusSql);
 			
+			//发货状态:待发货,部分发货,(空:临床添加外部代理单而供应室未装配时的情况发货状态为空)
+			String deliverStatusSql = SqlBuilder.createStatus("deliverStatus", InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
+			deliverStatusSql = String.format("(((deliverStatus='' or deliverStatus is null) and type='%s') or %s)", InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION, deliverStatusSql);
 			
-			//归还状态（“未归还”、“部分归还”、“归还待确认”）
-			String returnStatusSql = SqlBuilder.build_IN_Statement(
-					"po.returnStatus", SqlBuilder.IN, InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED,
-					InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
+			//归还状态:未归还,部分归还,归还待确认
+			String returnStatusSql = SqlBuilder.createStatus("returnStatus", InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED, InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
 			
+			//提交状态:committedStatus等于0
+			String commitSql = " (po.committedStatus = 0) ";
+			
 			//今天处理的单
 			String todaySql = "po.lastInvoiceTime >= " + dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH));
 			
-			sqlBuilder.append(String.format(" and (%s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, todaySql));
+			sqlBuilder.append(String.format(" and (%s or %s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, commitSql, todaySql));
 		}
 		
 		//4、其他一些条件的过滤
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r22523 -r22531
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 22523)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 22531)
@@ -1938,7 +1938,6 @@
     }
     document.getElementById('parm_s_startTime').value = value1;
     document.getElementById('parm_s_endTime').value = value2;
-    document.getElementById('parm_s_timeSearchFmt').value = sstsConfig.timeSearchFmt;
     grid.dwrReload();
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
===================================================================
diff -u -r22526 -r22531
--- ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 22526)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 22531)
@@ -27,6 +27,8 @@
   autoFillUserName:false,
   // 自动补全用户名的长度
   autoFillUserNameLength:6,
+  //科室申领时间过滤,开始日期是否为当天
+  startDateIsToday : true,
   // 是否支持部分终止申请单中的物品
   enableTerminatePartOfApplication : true,
   //限制入库单填写的一次性物品为能申领的物品
@@ -48,8 +50,10 @@
   recycleAddQualityMonitoring : true,
   //自定义装配是否显示选择申请科室（非必填项）
   selectDepartInCustomPacking : true, 
-  //是否待装配任务工作表(true为启用,false或者不配置都不启用)
+  //是否启用“待装配任务工作表”(true为启用,false或者不配置都不启用)
   enableWaitPackingTaskReport: true,
+  //是否启用“灭菌遗漏检查表”(true为启用,false或者不配置都不启用)
+  enableSterilizationOmitReport: true,
   //清洗筐是否装配完成才可以回收
   recycleClassifyBasketAfterPacked :true,
   //终止申请单或者终止申请项后不需要联动删除装配任务