Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r15685 -r15687
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15685)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15687)
@@ -68,7 +68,7 @@
 	/**
 	 * 外来器械做生物监测的默认时间(单位：分钟)默认250分钟
 	 */
-	private Integer biologicalMonitoringTime = new Integer(250);
+	private Integer biologicalMonitoringTime;
 	
 	private String isCustomTousseCleanEntirely = STR_YES;
 
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15685 -r15687
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15685)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15687)
@@ -7177,7 +7177,12 @@
 						System.out.println("生物监测开始时间格式有误先不处理");
 					}
 					Integer biologicalMonitoringTime = supplyRoomConfigManager.getSystemParamsObj().getBiologicalMonitoringTime();
-					long tempTime = biologicalMonitoringStartDateTime + (biologicalMonitoringTime*60000);  //生物监测开始的时间加上科室供应室配置的时间
+					
+					if (biologicalMonitoringTime==null) {
+						biologicalMonitoringTime = new Integer(250);
+					}
+					
+					long tempTime = biologicalMonitoringStartDateTime + (biologicalMonitoringTime*60*1000);  //生物监测开始的时间加上科室供应室配置的时间
 					if (tempTime > nowTime) {  //默认生物监测时间还没结束就发货
 						unconventionalForeignTousses += map.get("barcode") + ";";
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15680 -r15687
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15680)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15687)
@@ -529,7 +529,7 @@
 				}
 				
 				if (goods.isRoutine == '否' && sstsConfig.biologicalMonitoringEnable && !goods.noBiologicalMonitoring){  //此外来器械包正在做生物监测（cjr）
-					if (!confirm('[' + goods.name + ']正在做生物监测的器械包，需要紧急发货吗？')){
+					if (!confirm('[' + goods.name + ']正在做生物监测，需要紧急发货吗？')){
 						continue;
 					}
 				}