Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r26603 -r28305
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 26603)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 28305)
@@ -218,19 +218,19 @@
 					iconCls : 'icon_print',
 					hidden:forSupplement,
 					handler : function() {
+						var records = idCardInstancesGridPanel.getSelectionModel().getSelections();
 
-						var records = idCardInstancesGridPanel
-								.getSelectionModel().getSelections();
-
 						if (records.length == 0) {
 							showResult('请选择要打印的标识牌实例!');
 							return;
 						}
+
+						if (records.length > 1) {
+							showResult('只能选择打印一个标识牌实例!');
+							return;
+						}
 						top.Ext.MessageBox.progress('打印中', '请稍候...');
 						printIDCardInstanceByID(records[0].data.id);
-						reloadIDCardInstances();
-						// 刷新标识牌实例
-						hideMessageBox(true);
 					}
 				}, {
 					text : '转换',
@@ -762,7 +762,28 @@
 			var result = JSON.parse(jsonStr);
 			if(!isUndefinedOrNullOrEmpty(result.idCardInstance)){
 				// 重新加载
-				printIDCardInstanceObj(result.idCardInstance);
+				var idCardPaperType2 = top.Ext.getCmp('idCardPaperType2').getValue();
+				if(idCardPaperType2.indexOf('模板') > -1){
+					Ext.Ajax.request({
+						url : WWWROOT + '/disinfectSystem/idCardDefinitionAction!printIDCardInstance.do',
+						params : params,
+						success : function(response, options){
+							var obj = Ext.util.JSON.decode(response.responseText);
+							obj.barcode = result.idCardInstance.barcode;
+							obj.configKey = result.idCardInstance.configKey;
+							obj.tousseDefinition = result.idCardInstance.tousseDefinition;
+							printIDCardInstanceObj(obj);
+							reloadIDCardInstances();
+							// 刷新标识牌实例
+							hideMessageBox(true);
+						}
+					})
+				}else {
+					printIDCardInstanceObj(result.idCardInstance);
+					reloadIDCardInstances();
+					// 刷新标识牌实例
+					hideMessageBox(true);
+				}
 			}
 		});
 		DWREngine.setAsync(true);
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r27728 -r28305
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 27728)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 28305)
@@ -530,15 +530,51 @@
 	name: '标识牌',
 	objectProperties: [new ObjectDataSourceProperty({
 		propName: 'name',
-		displayName: '名字',
-		textForPreview: '手术标识牌1'
+		displayName: '(科室)包名',
+		textForPreview: '(急诊科)缝合包'
 	}),new ObjectDataSourceProperty({
-		propName: 'idNumber',
-		displayName: '编号',
+		propName: 'tousseNameWithoutDepart',
+		displayName: '包名',
+		textForPreview: '缝合包'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilingType',
+		displayName: '灭菌程序',
+		textForPreview: 'P1'
+	}),new ObjectDataSourceProperty({
+		propName: 'sterilisationAbbreviation',
+		displayName: '灭菌程序简称',
+		textForPreview: 'P'
+	}),new ObjectDataSourceProperty({
+		propName: 'hospitalName',
+		displayName: '医院名称',
+		textForPreview: '广东省人民医院'
+	}),new ObjectDataSourceProperty({
+		propName: 'remark',
+		displayName: '备注',
+		textForPreview: '缺一把剪刀'
+	}),new ObjectDataSourceProperty({
+		propName: 'materialAmount',
+		displayName: '器械总数',
+		textForPreview: '5'
+	}),new ObjectDataSourceProperty({
+		propName: 'totalAmount',
+		displayName: '材料总数',
+		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'materialsTypesAmount',
+		displayName: '材料种类',
+		textForPreview: '8'
+	}),new ObjectDataSourceProperty({
+		propName: 'packageType',
+		displayName: '包装类型',
+		textForPreview: '无纺布'
+	}),new ObjectDataSourceProperty({
+		propName: 'idCardDefinitionIdNumber',
+		displayName: '标识牌定义编号',
 		textForPreview: 'SN001'
 	}),new ObjectDataSourceProperty({
-		propName: 'description',
-		displayName: '描述',
+		propName: 'idCardDefinitionDescription',
+		displayName: '标识牌定义描述',
 		textForPreview: '注意事项'
 	})]
 });