Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r17256 -r17311
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 17256)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 17311)
@@ -117,7 +117,7 @@
   // 隐藏工作量持续收集报表部分统计指标
   isHidePartOfWorkQualityCollection : true,
   //审核页面点进入审核列表按钮,所选器械包的灭菌程序与已经入到审核列表的器械包灭菌程序不一致的包不会被添加至左边的已审核列表,true表示不会被添加至左边,默认及false表示会被添加至左边
-  tousseWithDifferentSterilingTypeCanNotBatchAddReview : true,
+  //tousseWithDifferentSterilingTypeCanNotBatchAddReview : true,
   //自定义装配后清理配包人
   cleanOperatorAfterDirectPacking : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js
===================================================================
diff -u -r13694 -r17311
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js	(.../sterilisationView.js)	(revision 13694)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js	(.../sterilisationView.js)	(revision 17311)
@@ -95,6 +95,10 @@
 			header : "能否添加器械包",
 			width : 120,
 			dataIndex : 'canAddTousse'
+		},{
+			header : "能否进入审核列表",
+			width : 120,
+			dataIndex : 'canAddToReview'
 		}, {
 			id : 'parameter',
 			header : "灭菌参数",
@@ -123,6 +127,8 @@
 		},{
 			name : 'canAddTousse'
 		},{
+			name : 'canAddToReview'
+		},{
 			name : 'parameter'
 		}];
 
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.0_4.7.1.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.0_4.7.1.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.0_4.7.1.sql	(revision 17311)
@@ -0,0 +1 @@
+update Sterilisation set canAddToReview = '能';
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r16001 -r17311
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 16001)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 17311)
@@ -38,6 +38,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/ContainerTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/BarcodeTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/SterilisationTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <script type="text/javascript" src="reviewView.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r17206 -r17311
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 17206)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 17311)
@@ -295,6 +295,24 @@
 	//验证右边grid选中的项是否是 相同的灭菌方式
 	for ( var i = 0;i<records.length;i++) {
 		var sType = records[i].data['sterilingType'];
+		
+		//同步的ajax请求校验该灭菌程序能否进入审核列表,如果不能,则本次循环continue
+		var sterilingTypeCanAddToReview = true;
+		DWREngine.setAsync(false);
+		SterilisationTableManager.validateSterilingTypeCanAddToReview(sType , function(jsonResult){
+			if(!jsonResult.success){
+				if(jsonResult.message){
+					showResult(jsonResult.message);
+				}
+				sterilingTypeCanAddToReview = false;
+			}
+		});
+		DWREngine.setAsync(true);
+		if(sterilingTypeCanAddToReview == false){
+			delete records[i];
+			continue;
+		}
+		
 		if(tempSM == null){
 			tempSM = sType;
 		}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
===================================================================
diff -u -r13694 -r17311
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java	(.../Sterilisation.java)	(revision 13694)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java	(.../Sterilisation.java)	(revision 17311)
@@ -12,6 +12,11 @@
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.tools.string.StringTools;
 
+/**
+ * 灭菌程序po类
+ * @author shuyongfu
+ *
+ */
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class Sterilisation extends BarcodeDevice {
@@ -31,6 +36,11 @@
 	 */
 	private String canAddTousse;
 	
+	/**
+	 * 能否进入审核列表
+	 */
+	private String canAddToReview;
+	
 	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(3);
 
 	static {
@@ -39,6 +49,7 @@
 		ColumnNameAndPoPropertyNameMap.put("灭菌参数", "parameter");
 		ColumnNameAndPoPropertyNameMap.put("灭菌目的", "sterilizationPurpose");
 		ColumnNameAndPoPropertyNameMap.put("能否添加器械包", "canAddTousse");
+		ColumnNameAndPoPropertyNameMap.put("能否进入审核列表", "canAddToReview");
 	}
 	
 	public String getGuid() {
@@ -105,6 +116,22 @@
 		return Constants.STR_CAN.equals(getCanAddTousse());
 	}
 
+	public String getCanAddToReview() {
+		return StringTools.defaultIfEmpty(canAddToReview, Constants.STR_CAN);
+	}
+
+	public void setCanAddToReview(String canAddToReview) {
+		this.canAddToReview = canAddToReview;
+	}
+	
+	/**
+	 * 判断能否进入审核列表
+	 * @return
+	 */
+	public boolean canAddToReview(){
+		return Constants.STR_CAN.equals(getCanAddToReview());
+	}
+
 	public void initType() {
 		setType(BarcodeDevice.BARCODE_TYPE_STERILISATION);
 	}
Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r17253 -r17311
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 17253)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 17311)
@@ -20,7 +20,7 @@
 			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2",
 			"4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9",
 			"4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8",
-			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0"};// 版本列表
+			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/dwr/table/SterilisationTableManager.java
===================================================================
diff -u -r12331 -r17311
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/dwr/table/SterilisationTableManager.java	(.../SterilisationTableManager.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/dwr/table/SterilisationTableManager.java	(.../SterilisationTableManager.java)	(revision 17311)
@@ -3,8 +3,12 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONObject;
+
 import com.forgon.component.grid.GridManager;
+import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation;
+import com.forgon.tools.json.JSONUtil;
 
 /**
  * @author WangYi 2012-2-22 下午04:55:28
@@ -14,14 +18,38 @@
 	
 	private GridManager gridManager;
 	
+	private SterilisationManager sterilisationManager;
+	
 	public void setGridManager(GridManager gridManager) {
 		this.gridManager = gridManager;
 	}
 
+	public void setSterilisationManager(SterilisationManager sterilisationManager) {
+		this.sterilisationManager = sterilisationManager;
+	}
+
 	public String findSterilisationTableList(Map<String, List<String>> parameterMap) {
 		String sql = "where 1=1 ";
 		return gridManager.renderGrid(parameterMap, Sterilisation.class
 				.getSimpleName(), sql, new String[] {});
 	}
+	
+	/**
+	 * 验证灭菌程序能否进入审核列表
+	 * @param sterilingType 灭菌程序
+	 * @return {success:true}或{success:false,message:""}
+	 */
+	public JSONObject validateSterilingTypeCanAddToReview(String sterilingType){
+		boolean success = true;
+		String message = null;
+		Sterilisation sterilisation = sterilisationManager.getSterilisationByName(sterilingType);
+		if(sterilisation == null){
+			success = false;
+			message = "未找到" + sterilingType + "的灭菌程序定义";
+		}else{
+			success = sterilisation.canAddToReview();
+		}
+		return JSONUtil.buildJsonObject(success, message);
+	}
 
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
===================================================================
diff -u -r13694 -r17311
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 13694)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js	(.../sterilisationForm.js)	(revision 17311)
@@ -16,6 +16,12 @@
 		data : [[CONSTANT_CAN],[CONSTANT_NO]]
 	});
 	
+	//能否进入审核列表
+	var canAddToReviewStore = new Ext.data.SimpleStore( {
+		fields : [ 'value'],
+		data : [[CONSTANT_CAN],[CONSTANT_NO]]
+	});
+	
 	formObj = new top.Ext.FormPanel( {
 		id : 'sterilisationForm',
 		frame : true,
@@ -108,6 +114,25 @@
 					anchor : '82%'
 				}]
 			},{
+				columnWidth : 0.5,
+				layout : 'form',
+				labelWidth : 120,
+				items : [  {
+					xtype : 'combo',
+					fieldLabel : "能否进入审核列表",
+					editable:false,
+					valueField : 'value',
+					displayField : 'value',
+					store : canAddToReviewStore,
+					mode:'local',
+					forceSelection : true,
+					triggerAction : 'all',
+					allowBlank : false,
+					name : "canAddToReview",
+					id : "canAddToReview",
+					anchor : '95%'
+				}]
+			},{
 				columnWidth : 1,
 				layout : 'form',
 				items : [{