Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r26944 -r26949
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26944)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26949)
@@ -2990,7 +2990,7 @@
 				Date beginDate = sdf.parse(beginDateStr);
 				Date endDate = sdf.parse(endDateStr);
 				if (invoiceSendTime.compareTo(beginDate) < 0 || invoiceSendTime.compareTo(endDate) > 0) {
-					throw new RuntimeException(tousseInstance.getTousseName() + "包的发货日期为" + invoiceSendTimeStr + "，不在所选择的时间范围内，请选择合适的时间后进行签收！");
+					throw new RuntimeException(tousseInstance.getTousseName() + "的发货日期为" + invoiceSendTimeStr + "，不在所选择的时间范围内，请选择合适的时间后进行签收！");
 				}
 			} catch (ParseException e) {
 				e.printStackTrace();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
===================================================================
diff -u -r26944 -r26949
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java	(.../SignRecordManagerImpl.java)	(revision 26944)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java	(.../SignRecordManagerImpl.java)	(revision 26949)
@@ -28,14 +28,12 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.signRecord.SignRecord;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
-import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransitionItem;
 import com.forgon.disinfectsystem.signRecord.vo.SignRecordPrintTousseVo;
 import com.forgon.disinfectsystem.signRecord.vo.SignRecordVo;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.exception.SystemException;
 import com.forgon.tools.MathTools;
-import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.string.StringTools;
@@ -305,25 +303,14 @@
 		if (StringUtils.isBlank(departCoding)) {
 			return null;
 		}
-		Date today = new Date();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-		if (StringUtils.isBlank(beginDate)) {
-			// 默认获取“近二天”待签收器械包
-			beginDate = DateTools.startOfYesterday("yyyy-MM-dd");
-		}
-		if (StringUtils.isBlank(endDate)) {
-			endDate = sdf.format(today);
-		}
-		if (!StringUtils.equals("all", beginDate)) {
+		String timeSql = "";
+		// 根据发货单发货时间查询
+		if (StringUtils.isNotBlank(beginDate) && StringUtils.isNotBlank(endDate)) {
 			beginDate = beginDate + " 00:00:00";
+			endDate = endDate + " 23:59:59";
+			timeSql = " and " + dateQueryAdapter.dateAreaSql("invoiceSendTime", beginDate, endDate);
 		}
-		endDate = endDate + " 23:59:59";
-		// 根据发货单发货时间查询
-		String timeSql = " and " + dateQueryAdapter.dateAreaSql("invoiceSendTime", beginDate, endDate);
-		if (StringUtils.equals("all", beginDate)) {
-			timeSql = "";
-		}
 		// 发货时间
 		String invoiceSendTimeSql = " (select min(ti1.invoiceSendTime) from TousseInstance ti1 where ti1.tousseName=ti.tousseName "
 				+ " and ti1.status='" + TousseInstance.STATUS_SHIPPED + "'"
@@ -350,13 +337,14 @@
 		} finally {
 			DatabaseUtil.closeResultSetAndStatement(result);
 		}
-		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
 		// 比较发货时间和当前时间
 		try {
-			today = sdf1.parse(sdf1.format(today));
+			Date today = new Date();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			today = sdf.parse(sdf.format(today));
 			for (Map<String, Object> map : list) {
 				String invoiceSendTimeStr = (String)map.get("invoiceSendTime");
-				Date invoiceSendTime = sdf1.parse(invoiceSendTimeStr);
+				Date invoiceSendTime = sdf.parse(invoiceSendTimeStr);
 				// 前台根据此字段做颜色设置
 				// (0表示待签收的物品的发货日期全部都是今天的(白色)，1表示待签收的物品的发货日期有不是今天的日期的(黄色))
 				map.put("signTime", today.compareTo(invoiceSendTime));