Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
===================================================================
diff -u -r20040 -r20042
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java	(.../Sterilizer.java)	(revision 20040)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java	(.../Sterilizer.java)	(revision 20042)
@@ -66,7 +66,7 @@
 	/**
 	 * 是否定时自动完成灭菌，与“isAutoCompleteSterilization”属性有区别，后者针对读接口的
 	 */
-	private String timingAutoCompleteSterilization;
+	private String timingCompleteSterilization;
 
 	/**
 	 * 购买日期
@@ -484,13 +484,11 @@
 		this.rapidFurnace = rapidFurnace;
 	}
 
-	public String getTimingAutoCompleteSterilization() {
-		return timingAutoCompleteSterilization;
+	public String getTimingCompleteSterilization() {
+		return timingCompleteSterilization;
 	}
 
-	public void setTimingAutoCompleteSterilization(
-			String timingAutoCompleteSterilization) {
-		this.timingAutoCompleteSterilization = timingAutoCompleteSterilization;
+	public void setTimingCompleteSterilization(String timingCompleteSterilization) {
+		this.timingCompleteSterilization = timingCompleteSterilization;
 	}
-	
 }
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r20040 -r20042
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 20040)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 20042)
@@ -1312,7 +1312,7 @@
 		
 		//定时自动完成灭菌
 		Sterilisation sterilisation = sterilisationManager.getSterilisationByName(sterilizationRecord.getSterilizationType());  //灭菌程序
-		if (Constants.STR_YES.equals(sterilizationRecord.getSterilizer().getTimingAutoCompleteSterilization())
+		if (Constants.STR_YES.equals(sterilizationRecord.getSterilizer().getTimingCompleteSterilization())
 				&& sterilisation != null && sterilisation.getUseTime() != null && sterilisation.getUseTime() > 0) {
 			timingAutoCompleteSterilization(sterilisation.getUseTime(), sterilizationRecord);
 		}
@@ -2720,7 +2720,7 @@
 								
 								String sql = String.format("select sr.startDate from SterilizationRecord sr "
 										+ "join Sterilizer s on s.id=sr.sterilizer_id "
-										+ "where sr.id=%s and sr.status='%s' and s.timingAutoCompleteSterilization='%s'",
+										+ "where sr.id=%s and sr.status='%s' and s.timingCompleteSterilization='%s'",
 										sterilizationRecord.getId(),SterilizationRecord.STERILIZATION_STATUS_BEGIN,Constants.STR_YES);
 								
 								result = objectDao.executeSql(sql);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r20040 -r20042
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 20040)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 20042)
@@ -632,8 +632,8 @@
 									 	xtype : 'combo',
 									 	fieldLabel : '定时完成灭菌',
 									 	allowBlank : true,
-									 	name : 'timingAutoCompleteSterilization',
-									 	id : 'timingAutoCompleteSterilization',
+									 	name : 'timingCompleteSterilization',
+									 	id : 'timingCompleteSterilization',
 									 	valueField : 'value',
 									 	displayField : 'value',
 									 	forceSelection : true,