Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r22199 -r22200
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22199)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22200)
@@ -3408,16 +3408,19 @@
 				}
 			}
 			
+			String idCardInstanceBarcode = tousseInstance.getIdCardInstanceBarcode();
+			String operationTime = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");
+			
 			instanceJSONObject.put("tousseDefinitionId", tousseDefinitionId);				//包定义id（1、默认取祖先id 2、如果是“外来器械拆分小包”取父包定义的祖先id）
 			instanceJSONObject.put("tousseInstanceId", tousseInstance.getId());				//包实例id
+			instanceJSONObject.put("idCardInstanceBarcode", idCardInstanceBarcode);			//标识牌条码
 			instanceJSONObject.put("tousseInstanceBarcode", tousseInstance.getBarcode());	//包实例条码
 			instanceJSONObject.put("tousseName", tousseInstance.getTousseName());			//包名称
 			instanceJSONObject.put("ancestorTousseName", ancestorTousseName);				//祖先包名称
 			instanceJSONObject.put("packer", tousseInstance.getOperator());					//配包人
 			instanceJSONObject.put("packerCode", tousseInstance.getOperatorCode());			//配包人编码
 			instanceJSONObject.put("reviewer", tousseInstance.getReviewer());				//审核人
 			instanceJSONObject.put("reviewerCode", tousseInstance.getReviewerCode());		//审核人编码
-			String operationTime = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "");
 			instanceJSONObject.put("operationTime", operationTime);							//装配时间
 			instanceJSONObject.put("isUrgentTousse", tousseInstance.getIsUrgentTousse());	//是否加急
 		}
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
===================================================================
diff -u -r22199 -r22200
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java	(.../SterilizationTransitionManagerImpl.java)	(revision 22199)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java	(.../SterilizationTransitionManagerImpl.java)	(revision 22200)
@@ -115,6 +115,7 @@
 					item.setReviewer(vo.getReviewer());
 					item.setTousseDefinitionId(vo.getTousseDefinitionId());
 					item.setTousseInstanceBarcode(tousseInstanceBarcode);
+					item.setIdCardInstanceBarcode(vo.getIdCardInstanceBarcode());
 					item.setTousseInstanceId(vo.getTousseInstanceId());
 					item.setAncestorTousseName(vo.getAncestorTousseName());
 					item.setTousseName(vo.getTousseName());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java
===================================================================
diff -u -r22199 -r22200
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java	(.../SterilizationTransitionItemVO.java)	(revision 22199)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java	(.../SterilizationTransitionItemVO.java)	(revision 22200)
@@ -34,6 +34,11 @@
 	private Long tousseInstanceId;
 	
 	/**
+	 * 标识牌实例条码
+	 */
+	private String idCardInstanceBarcode;
+	
+	/**
 	 * 器械包实例条码
 	 */
 	private String tousseInstanceBarcode;
@@ -165,4 +170,12 @@
 		this.ancestorTousseName = ancestorTousseName;
 	}
 	
+	public String getIdCardInstanceBarcode() {
+		return idCardInstanceBarcode;
+	}
+
+	public void setIdCardInstanceBarcode(String idCardInstanceBarcode) {
+		this.idCardInstanceBarcode = idCardInstanceBarcode;
+	}
+	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
===================================================================
diff -u -r22199 -r22200
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js	(.../sterilizationTransitionForm.js)	(revision 22199)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js	(.../sterilizationTransitionForm.js)	(revision 22200)
@@ -22,6 +22,7 @@
 		{name: 'ancestorTousseName'},		//祖先包定义名称
 		{name: 'tousseName'},				//包定义名称
 		{name: 'tousseInstanceId'},			//包实例id
+		{name: 'idCardInstanceBarcode'},	//标识牌条码
 		{name: 'tousseInstanceBarcode'},	//包实例条码
 		{name: 'packerCode'},				//配包人条码
 		{name: 'packer'},					//配包人
@@ -335,7 +336,7 @@
  * @param callback	回调函数
  */
 function loadBarcode(barcode, url, callback){
-    //加载数据
+	//加载数据
     Ext4.Ajax.request({
 		url : url,
 		params: {barcode: barcode},
@@ -362,6 +363,7 @@
 		ancestorTousseName: tousseInstance.ancestorTousseName,
 		tousseName: (leaf ? tousseInstance.tousseName : tousseInstance.ancestorTousseName),
 		tousseInstanceId: (leaf ? tousseInstance.tousseInstanceId : ''),
+		idCardInstanceBarcode: (leaf ? tousseInstance.idCardInstanceBarcode : ''),
 		tousseInstanceBarcode: (leaf ? tousseInstance.tousseInstanceBarcode : ''),
 		packerCode: (leaf ? tousseInstance.packerCode : ''),
 		packer: (leaf ? tousseInstance.packer : ''),
@@ -391,6 +393,7 @@
 				ancestorTousseName: node.get('ancestorTousseName'),
 				tousseName: node.get('tousseName'),
 				tousseInstanceId: node.get('tousseInstanceId'),
+				idCardInstanceBarcode: node.get('idCardInstanceBarcode'),
 				tousseInstanceBarcode: node.get('tousseInstanceBarcode'),
 				packerCode: node.get('packerCode'),
 				packer: node.get('packer'),
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
===================================================================
diff -u -r22199 -r22200
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java	(.../SterilizationTransitionAction.java)	(revision 22199)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java	(.../SterilizationTransitionAction.java)	(revision 22200)
@@ -77,6 +77,7 @@
 	 * 加载灭菌交接记录的数据.
 	 */
 	public void loadSterilizationTransitionList() {
+		//1、按器械包过滤
 		Long tousseDefinitionId = StrutsParamUtils.getPraramLongValue("tousseDefinitionId", 0L);
 		String tousseDefinitionIdSql = "";
 		if (DatabaseUtil.isPoIdValid(tousseDefinitionId)) {
@@ -85,6 +86,9 @@
 							tousseDefinitionId);
 		}
 		
+		//2、按条码过滤（器械包实例条码和标识牌条码）
+		String searchBarcode = StrutsParamUtils.getPraramValue("searchBarcode", "");
+		
 		String select = "select * ";
 		String where = 	String.format("from SterilizationTransition where 1=1 %s ", tousseDefinitionIdSql);
 		ExtJsEntity entity = ExtJsUtil.buildSQLEntity(select, where, "");
@@ -143,6 +147,7 @@
 				child.put("tousseDefinitionId", item.getTousseDefinitionId());
 				child.put("tousseName", item.getTousseName());
 				child.put("tousseInstanceId", item.getTousseInstanceId());
+				child.put("idCardInstanceBarcode", item.getIdCardInstanceBarcode());
 				child.put("tousseInstanceBarcode", item.getTousseInstanceBarcode());
 				child.put("packerCode", item.getPackerCode());
 				child.put("packer", item.getPacker());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java
===================================================================
diff -u -r22199 -r22200
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java	(.../SterilizationTransitionItem.java)	(revision 22199)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java	(.../SterilizationTransitionItem.java)	(revision 22200)
@@ -52,6 +52,11 @@
 	private Long tousseInstanceId;
 	
 	/**
+	 * 标识牌实例条码
+	 */
+	private String idCardInstanceBarcode;
+	
+	/**
 	 * 器械包实例条码
 	 */
 	private String tousseInstanceBarcode;
@@ -195,5 +200,13 @@
 	public void setAncestorTousseName(String ancestorTousseName) {
 		this.ancestorTousseName = ancestorTousseName;
 	}
+
+	public String getIdCardInstanceBarcode() {
+		return idCardInstanceBarcode;
+	}
+
+	public void setIdCardInstanceBarcode(String idCardInstanceBarcode) {
+		this.idCardInstanceBarcode = idCardInstanceBarcode;
+	}
 	
 }