Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
===================================================================
diff -u -r17311 -r17481
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java	(.../Sterilisation.java)	(revision 17311)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java	(.../Sterilisation.java)	(revision 17481)
@@ -41,6 +41,16 @@
 	 */
 	private String canAddToReview;
 	
+	/**
+	 * 物理监测结果默认值
+	 */
+	private String physicsResultDefault;
+	
+	/**
+	 * 化学监测结果默认值
+	 */
+	private String chemistryResultDefault;
+	
 	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(3);
 
 	static {
@@ -161,5 +171,21 @@
 			return false;
 		return true;
 	}
+
+	public String getPhysicsResultDefault() {
+		return physicsResultDefault;
+	}
+
+	public void setPhysicsResultDefault(String physicsResultDefault) {
+		this.physicsResultDefault = physicsResultDefault;
+	}
+
+	public String getChemistryResultDefault() {
+		return chemistryResultDefault;
+	}
+
+	public void setChemistryResultDefault(String chemistryResultDefault) {
+		this.chemistryResultDefault = chemistryResultDefault;
+	}
 	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
===================================================================
diff -u -r17311 -r17481
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 17311)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 17481)
@@ -22,21 +22,26 @@
 		data : [[CONSTANT_CAN],[CONSTANT_NO]]
 	});
 	
+	//能否进入审核列表
+	var resultStore = new Ext.data.SimpleStore( {
+		fields : [ 'value'],
+		data : [[RESULT_NO],[RESULT_QUALIFIED],[RESULT_UNQUALIFIED]]
+	});
+	
 	formObj = new top.Ext.FormPanel( {
 		id : 'sterilisationForm',
 		frame : true,
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
-		labelWidth : 90,
 		autoHeight:true,
-		labelAlign:'right',
 		autoScroll : true,
 		items : [ {
 			xtype : 'hidden',
 			name : 'id',
 			id : 'id'
 		}, {
 			layout : 'column',
+			labelAlign:'right',
 			items : [ {
 				columnWidth : 0.5,
 				layout : 'form',
@@ -52,7 +57,6 @@
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
-				labelWidth : 120,
 				items : [  {
 					xtype : 'combo',
 					fieldLabel : "灭菌目的",
@@ -78,12 +82,12 @@
 					blankText : '请输入灭菌程序!',
 					name : "sterilisation",
 					id : "sterilisation",
-					anchor : '82%'
+					anchor : '95%'
 				}]
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
-				labelWidth : 120,
+				labelWidth : 110,
 				items : [{
 					xtype : 'numberfield',
 					allowNegative : false,
@@ -111,12 +115,12 @@
 					allowBlank : false,
 					name : "canAddTousse",
 					id : "canAddTousse",
-					anchor : '82%'
+					anchor : '95%'
 				}]
 			},{
 				columnWidth : 0.5,
 				layout : 'form',
-				labelWidth : 120,
+				labelWidth : 110,
 				items : [  {
 					xtype : 'combo',
 					fieldLabel : "能否进入审核列表",
@@ -133,6 +137,40 @@
 					anchor : '95%'
 				}]
 			},{
+				columnWidth : 0.5,
+				layout : 'form',
+				items : [{
+					xtype : 'combo',
+					fieldLabel : "物理监测结果",
+					editable:false,
+					valueField : 'value',
+					displayField : 'value',
+					store : resultStore,
+					mode:'local',
+					forceSelection : true,
+					triggerAction : 'all',
+					name : "physicsResultDefault",
+					id : "physicsResultDefault",
+					anchor : '95%'
+				}]
+			},{
+				columnWidth : 0.5,
+				layout : 'form',
+				items : [{
+					xtype : 'combo',
+					fieldLabel : "化学监测结果",
+					editable:false,
+					valueField : 'value',
+					displayField : 'value',
+					store : resultStore,
+					mode:'local',
+					forceSelection : true,
+					triggerAction : 'all',
+					name : "chemistryResultDefault",
+					id : "chemistryResultDefault",
+					anchor : '95%'
+				}]
+			},{
 				columnWidth : 1,
 				layout : 'form',
 				items : [{
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r17477 -r17481
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17477)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17481)
@@ -367,14 +367,15 @@
 				updateInterruptRecordFinishType(sterilizationRecord.getId(),SterilizationInterruptRecord.ITERRUPT_FINISH_FINISH);
 			}
 			Sterilizer sterilizer = sterilizationRecord
-					.getSterilizer();
+					.getSterilizer();  //灭菌炉
+			Sterilisation sterilisation = sterilisationManager
+					.getSterilisationByName(sterilizationRecord.getSterilizationType());  //灭菌程序
 			String isCheckSterilizationTime = sterilizer.getIsCheckSterilizationTime();
 			if(isCheckSterilizationTime != null && isCheckSterilizationTime.equals("是"))
 			{
-				Sterilisation sa = sterilisationManager.getSterilisationByName(sterilizationRecord.getSterilizationType());
-				if(sa != null && sa.getUseTime() != null)
+				if(sterilisation != null && sterilisation.getUseTime() != null)
 				{
-					Integer time = sa.getUseTime();
+					Integer time = sterilisation.getUseTime();
 					Date da = sterilizationRecord.getStartDate();
 					Date curDate = new Date();
 					long dTime = curDate.getTime() - da.getTime();
@@ -478,9 +479,19 @@
 			}
 			
 			sterilizationRecord.setStatus(SterilizationRecord.STERILIZATION_STATUS_END);
-			sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
-			sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 			
+			//“物理监测结果”、“化学监测结果”这两个的默认值由灭菌程序的配置来决定，注明：“生物监测”的的默认值由灭菌炉配置决定
+			if (sterilisation != null) {
+				String physicsResultDefault = sterilisation.getPhysicsResultDefault();
+				String chemistryResultDefault = sterilisation.getChemistryResultDefault();
+				physicsResultDefault = StringTools.isNotBlank(physicsResultDefault)
+						? physicsResultDefault : SterilizationRecord.MONITOR_RESULT_QUALIFIED;
+				chemistryResultDefault = StringTools.isNotBlank(chemistryResultDefault)
+						? chemistryResultDefault : SterilizationRecord.MONITOR_RESULT_QUALIFIED;
+				sterilizationRecord.setPhysicsResult(physicsResultDefault);
+				sterilizationRecord.setChemistryResult(chemistryResultDefault);
+			}
+			
 			/////
 			String biologicalMonitoringDisplay = sterilizer.getBiologicalMonitoringDisplay();  //生物监测的默认值
 			Integer biologicalMonitoringTime = sterilizer.getBiologicalMonitoringTime();  //生物监测持续时间
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp
===================================================================
diff -u -r17150 -r17481
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp	(.../sterilisationView.jsp)	(revision 17150)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp	(.../sterilisationView.jsp)	(revision 17481)
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@page import="com.forgon.Constants"%>
+<%@page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -65,6 +66,10 @@
 
 var CONSTANT_CAN = '<%=Constants.STR_CAN %>';//能
 var CONSTANT_NO = '<%=Constants.STR_NO %>';//否
+
+var RESULT_NO = '<%=SterilizationRecord.MONITOR_RESULT_NO %>';//无
+var RESULT_QUALIFIED = '<%=SterilizationRecord.MONITOR_RESULT_QUALIFIED %>';//合格
+var RESULT_UNQUALIFIED = '<%=SterilizationRecord.MONITOR_RESULT_UNQUALIFIED %>';//不合格
 </script>