Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r15680 -r15685
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15680)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15685)
@@ -68,7 +68,7 @@
 	/**
 	 * 外来器械做生物监测的默认时间(单位：分钟)默认250分钟
 	 */
-	private Integer biologicalMonitoringDefaultTime = new Integer(250);
+	private Integer biologicalMonitoringTime = new Integer(250);
 	
 	private String isCustomTousseCleanEntirely = STR_YES;
 
@@ -575,13 +575,13 @@
 		this.isPackingAfterWashTimeEnd = isPackingAfterWashTimeEnd;
 	}
 
-	public Integer getBiologicalMonitoringDefaultTime() {
-		return biologicalMonitoringDefaultTime;
+	public Integer getBiologicalMonitoringTime() {
+		return biologicalMonitoringTime;
 	}
 
-	public void setBiologicalMonitoringDefaultTime(
-			Integer biologicalMonitoringDefaultTime) {
-		this.biologicalMonitoringDefaultTime = biologicalMonitoringDefaultTime;
+	public void setBiologicalMonitoringTime(Integer biologicalMonitoringTime) {
+		this.biologicalMonitoringTime = biologicalMonitoringTime;
 	}
 
+
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r15680 -r15685
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 15680)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 15685)
@@ -745,8 +745,8 @@
 		supplyRoomConfig.setFtDefaultSterilingMethod(ftDefaultSterilingMethod);
 		String ftDefaultPackageType = rq.getParameter("ftDefaultPackageType");
 		supplyRoomConfig.setFtDefaultPackageType(ftDefaultPackageType);
-		String biologicalMonitoringDefaultTime = rq.getParameter("biologicalMonitoringDefaultTime");  //生物监测默认的时间（cjr）
-		supplyRoomConfig.setBiologicalMonitoringDefaultTime(new Integer(biologicalMonitoringDefaultTime));
+		String biologicalMonitoringTime = rq.getParameter("biologicalMonitoringTime");  //生物监测默认的时间（cjr）
+		supplyRoomConfig.setBiologicalMonitoringTime(new Integer(biologicalMonitoringTime));
 		// 同步修改外来器械包定义的是否审核属性
 		{
 			String sql = String.format("update %s set isReview='%s' where tousseType in('%s','%s')", TousseDefinition.class.getSimpleName(),foreignTousseNeedReview,TousseDefinition.PACKAGE_TYPE_FOREIGN,TousseDefinition.PACKAGE_TYPE_SPLIT);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15682 -r15685
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15682)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15685)
@@ -7176,8 +7176,8 @@
 					} catch (ParseException e) {
 						System.out.println("生物监测开始时间格式有误先不处理");
 					}
-					Integer biologicalMonitoringDefaultTime = supplyRoomConfigManager.getSystemParamsObj().getBiologicalMonitoringDefaultTime();
-					long tempTime = biologicalMonitoringStartDateTime + (biologicalMonitoringDefaultTime*60000);  //生物监测开始的时间加上科室供应室配置的时间
+					Integer biologicalMonitoringTime = supplyRoomConfigManager.getSystemParamsObj().getBiologicalMonitoringTime();
+					long tempTime = biologicalMonitoringStartDateTime + (biologicalMonitoringTime*60000);  //生物监测开始的时间加上科室供应室配置的时间
 					if (tempTime > nowTime) {  //默认生物监测时间还没结束就发货
 						unconventionalForeignTousses += map.get("barcode") + ";";
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r15680 -r15685
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15680)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15685)
@@ -1034,8 +1034,8 @@
 		             				xtype : 'numberfield',
 		             				allowDecimals : false,
 		             				fieldLabel : '外来器械生物监测的时间(分钟)',
-		             				id : 'biologicalMonitoringDefaultTime',
-		             				name : 'biologicalMonitoringDefaultTime',
+		             				id : 'biologicalMonitoringTime',
+		             				name : 'biologicalMonitoringTime',
 		             				anchor : '100%'
 		             			}]
 		             	  }
@@ -1802,7 +1802,7 @@
             		var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
             		var saveImagePath = Ext.getCmp("saveImagePath").getValue();
             		var mergeTousseRuleForInvoiceBatchPrint = Ext.getCmp("mergeTousseRuleForInvoiceBatchPrint").getValue();
-            		var biologicalMonitoringDefaultTime = Ext.getCmp("biologicalMonitoringDefaultTime").getValue();
+            		var biologicalMonitoringTime = Ext.getCmp("biologicalMonitoringTime").getValue();
             		
             		var myMask = new Ext.LoadMask(Ext.getBody(), {msg:"正在保存..."});
             		myMask.show();
@@ -1861,7 +1861,7 @@
 	                    	timingSignInvoiceTime:timingSignInvoiceTime,//
 	                    	warningTousseWhetherDelivery:warningTousseWhetherDelivery,//
 	                    	unitName : unitName,//
-	                    	biologicalMonitoringDefaultTime : biologicalMonitoringDefaultTime//
+	                    	biologicalMonitoringTime : biologicalMonitoringTime//
 	                    },
 	                    success : function(response, options) {
 	                    	var result = Ext.decode(response.responseText);
@@ -2047,8 +2047,8 @@
 			if(supplyRoomConfig.ftDefaultPackageType!=null){
 				  Ext.getCmp('ftDefaultPackageType').setValue(supplyRoomConfig.ftDefaultPackageType);
 			}
-			var biologicalMonitoringDefaultTime = supplyRoomConfig.biologicalMonitoringDefaultTime;
-			Ext.getCmp('biologicalMonitoringDefaultTime').setValue(biologicalMonitoringDefaultTime?biologicalMonitoringDefaultTime:250);
+			var biologicalMonitoringTime = supplyRoomConfig.biologicalMonitoringTime;
+			Ext.getCmp('biologicalMonitoringTime').setValue(biologicalMonitoringTime?biologicalMonitoringTime:250);
 			
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);