Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
===================================================================
diff -u -r13620 -r13821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java	(.../SterisDataManagerImpl.java)	(revision 13620)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java	(.../SterisDataManagerImpl.java)	(revision 13821)
@@ -64,7 +64,7 @@
 	 *  从接口读取数据和存入数据库
 	 */
 	@Override
-	public void readAndSaveRecord(DeviceInterface devInterface,String machineNo,String brand)
+	public void readAndSaveRecord(DeviceInterface devInterface,String machineNo,String brand,String isAutoCompleteSterilization)
 	{
 		if(devInterface == null)
 		{
@@ -119,8 +119,10 @@
                 	{
                 		machineNumber = (String)jsArray.get(0);
                 		cycleCounter = (String)jsArray.get(1);
-                		// 根据灭菌记录自动完成灭菌
-                    	autoFinishSterilizerRecord(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		// 灭菌炉自动完成灭菌
+                		if( !StringUtils.isNotBlank(isAutoCompleteSterilization) || isAutoCompleteSterilization.equals("是")){
+                			autoFinishSterilizerRecord(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		}
                     	refreshSterilizaerRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
                 	}
                 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataManager.java
===================================================================
diff -u -r13416 -r13821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataManager.java	(.../DeviceDataManager.java)	(revision 13416)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataManager.java	(.../DeviceDataManager.java)	(revision 13821)
@@ -7,6 +7,6 @@
  *
  */
 public interface DeviceDataManager {
-	public void readAndSaveRecord(DeviceInterface devInteface,String machineNo,String brand);
+	public void readAndSaveRecord(DeviceInterface devInteface,String machineNo,String brand,String isAutoCompleteSterilization);
 	public void end();
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
===================================================================
diff -u -r13416 -r13821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 13416)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java	(.../BelimedDataManagerImpl.java)	(revision 13821)
@@ -77,7 +77,7 @@
 	 *  从接口读取数据和存入数据库
 	 */
 	@Override
-	public void readAndSaveRecord(DeviceInterface devInterface,String machineNo,String brand)
+	public void readAndSaveRecord(DeviceInterface devInterface,String machineNo,String brand,String isAutoCompleteSterilization)
 	{
 		if(devInterface == null)
 		{
@@ -148,8 +148,10 @@
                 	{
                 		machineNumber = (String)jsArray.get(0);
                 		cycleCounter = (String)jsArray.get(1);
-                		// TODO 根据灭菌记录完成灭菌
-                    	autoFinishSterilizerRecord(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		// 灭菌炉自动完成灭菌
+                		if( !StringUtils.isNotBlank(isAutoCompleteSterilization) || isAutoCompleteSterilization.equals("是")){
+                			autoFinishSterilizerRecord(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
+                		}
                     	refreshSterilizaerRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
                 	}
                 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
===================================================================
diff -u -r13416 -r13821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java	(.../DeviceInterfaceDataProcessImpl.java)	(revision 13416)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java	(.../DeviceInterfaceDataProcessImpl.java)	(revision 13821)
@@ -57,12 +57,12 @@
 			case "Belimed":
 				Object bean = SpringBeanManger.getBean("belimedDataManager");
 				dm = (DeviceDataManager) bean;
-				dm.readAndSaveRecord(devInterface,st.getMachineNumber(),devInterface.BELIMED);
+				dm.readAndSaveRecord(devInterface,st.getMachineNumber(),devInterface.BELIMED,st.getIsAutoCompleteSterilization());
 				break;
 			case "Steris":
 				Object sterisBean = SpringBeanManger.getBean("sterisDataManager");
 				dm = (DeviceDataManager) sterisBean;
-				dm.readAndSaveRecord(devInterface,st.getMachineNumber(),devInterface.STERIS);
+				dm.readAndSaveRecord(devInterface,st.getMachineNumber(),devInterface.STERIS,st.getIsAutoCompleteSterilization());
 				break;
 			}
 		}
@@ -81,12 +81,12 @@
 			case "Belimed":
 				Object bean = SpringBeanManger.getBean("belimedDataManager");
 				dm = (DeviceDataManager) bean;
-				dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),devInterface.BELIMED);
+				dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),devInterface.BELIMED,null);
 				break;
 			case "Steris":
 				Object sterisBean = SpringBeanManger.getBean("sterisDataManager");
 				dm = (DeviceDataManager) sterisBean;
-				dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),devInterface.STERIS);
+				dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),devInterface.STERIS,null);
 				break;
 			}
 		}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
===================================================================
diff -u -r13436 -r13821
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java	(.../Sterilizer.java)	(revision 13436)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java	(.../Sterilizer.java)	(revision 13821)
@@ -51,6 +51,8 @@
 	private String isEveryDayReset = "是";// 是否隔天重置炉次
 	
 	private String isCheckSterilizationTime = "否";	// 是否校验灭菌时间
+	
+	private String isAutoCompleteSterilization = "是"; // 是否自动完成灭菌
 
 	// 购买日期
 	private Date purchaseDate;
@@ -350,4 +352,12 @@
 	public String getOwnGroup() {
 		return ownGroup;
 	}
+
+	public String getIsAutoCompleteSterilization() {
+		return isAutoCompleteSterilization;
+	}
+
+	public void setIsAutoCompleteSterilization(String isAutoCompleteSterilization) {
+		this.isAutoCompleteSterilization = isAutoCompleteSterilization;
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r13750 -r13821
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 13750)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 13821)
@@ -390,6 +390,24 @@
 									layout : 'form',
 									labelWidth : 80,
 									items:[{
+									 	xtype : 'combo',
+									 	fieldLabel : '自动完成灭菌',
+									 	allowBlank : true,
+									 	name : 'isAutoCompleteSterilization',
+									 	id : 'isAutoCompleteSterilization',
+									 	valueField : 'value',
+									 	displayField : 'value',
+									 	forceSelection : true,
+									 	store : isResetStore,
+									 	mode : 'local',
+									 	triggerAction : 'all',
+									 	anchor : '95%'
+									}]
+								},{
+									columnWidth : 0.5,
+									layout : 'form',
+									labelWidth : 80,
+									items:[{
 										xtype : 'dateextensiablefield',
 										width : 150,
 										fieldLabel : '购买日期',
@@ -717,6 +735,7 @@
 	}else{
 		top.Ext.getCmp('isEveryDayReset').setValue('是');
 		top.Ext.getCmp('isCheckSterilizationTime').setValue('否');
+		top.Ext.getCmp('isAutoCompleteSterilization').setValue('是');
 	}