Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r16445 -r16453
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16445)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16453)
@@ -7718,19 +7718,21 @@
 							}
 						}
 					}
-				} else {  //如果生物监测结果不是"无"，那么生物监测结束时间一定有值
-					long biologicalMonitoringEndDateTime = 0;
-					try {
-						biologicalMonitoringEndDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDate).getTime();
-					} catch (ParseException e) {
-						logger.debug("生物监测结束时间格式有误先不处理");
+				} else {  //如果生物监测结果不是"无"，那么生物监测结束时间一定有值，（可能有些之前做了生物监测的旧数据，但是生物监测时间没填，所以在判断一下是否为null）
+					if (StringUtils.isNotBlank(biologicalMonitoringEndDate)) {
+						long biologicalMonitoringEndDateTime = 0;
+						try {
+							biologicalMonitoringEndDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDate).getTime();
+						} catch (ParseException e) {
+							logger.debug("生物监测结束时间格式有误先不处理");
+						}
+						if (SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(biologyResult)) {  //如果生物监测的结果不合格，强制不让发货
+							biologicalMonitoringFail = barcode;
+						}
+						if (SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(biologyResult) || biologicalMonitoringEndDateTime > nowTime) {  //生物监测没结束就发货
+							urgentDelivery = barcode;
+						}
 					}
-					if (SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(biologyResult)) {  //如果生物监测的结果不合格，强制不让发货
-						biologicalMonitoringFail = barcode;
-					}
-					if (SterilizationRecord.MONITOR_RESULT_UNQUALIFIED.equals(biologyResult) || biologicalMonitoringEndDateTime > nowTime) {  //生物监测没结束就发货
-						urgentDelivery = barcode;
-					}
 				}
 				
 				JSONObject vo = new JSONObject();