Index: ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
===================================================================
diff -u -r37547 -r38317
--- ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 37547)
+++ ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 38317)
@@ -81,6 +81,7 @@
 			<intercept-url pattern="/mobileClient/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectSystem/sterilization/sterilizationRecordAction!uploadSterilizationRecordPic.do" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectSystem/printBarcodeAction!printBarcodeImage.do" access="permitAll"></intercept-url>
+			<intercept-url pattern="/disinfectSystem/baseData/showImageAction!getToussePic.do" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectSystem/verification/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectsystem/touchScreen/recycle/alertDiv/CJL.0.1.min.js" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js" access="permitAll"></intercept-url>
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r33327 -r38317
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 33327)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 38317)
@@ -1874,7 +1874,32 @@
 		tableHtml += "</td>";
 		tableHtml += "</tr>";
 	}
+
+	// ZSYY-362：打印“器械包图片”和“装配教学图片”
+	if(idCardInstance.tousseDefinition.imagesCount && idCardInstance.tousseDefinition.imagesCount > 0){
+		for(var k=1;k<=idCardInstance.tousseDefinition.imagesCount;k++){
+			var number = k;
+			var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + idCardInstance.tousseID + '&imageType=' + encodeURIComponent('器械包图片') + '&isOriginalPic=false&page=' + number+'&noCache=' + new Date().getTime();
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' width='300px' align='center' border='0'>";
+			tableHtml += "<img src='" + url + "' style='margin:2px 0;width:100%'/>";
+			tableHtml += "</td>";
+			tableHtml += "</tr>";
+		}
+	}
 	
+	if(idCardInstance.tousseDefinition.imagesCount2 && idCardInstance.tousseDefinition.imagesCount2 > 0){
+		for(var k=1;k<=idCardInstance.tousseDefinition.imagesCount2;k++){
+			var number = k;
+			var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + idCardInstance.tousseID + '&imageType=' + encodeURIComponent('器械包装配教学图片') + '&isOriginalPic=false&page=' + number+'&noCache=' + new Date().getTime();
+			tableHtml += "<tr>";
+			tableHtml += "<td colspan='4' width='300px' align='center' border='0'>";
+			tableHtml += "<img src='" + url + "' style='margin:2px 0;width:100%'/>";
+			tableHtml += "</td>";
+			tableHtml += "</tr>";
+		}
+	}
+	
 	//告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF)
 	tableHtml += "<tr>";
 	tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' border='0'><center>***严禁手写更改洗水布内容***</center></td>";
@@ -2024,9 +2049,10 @@
     foreignProxyDisinfectionLabel : foreignProxyDisinfectionLabelConfig,
     //外来器械申请单
     foreignTousseAppliation : foreignTousseAppliationPrintConfig,
- // 标识牌
+ 	// 标识牌大标签
     idCardLargeLabel:idCardLargeLabelConfig,
-    idCardSmallLabel:idCardSmallLabelConfig,// 小标签
+	// 标识牌小标签
+    idCardSmallLabel:idCardSmallLabelConfig,
     idCardAndTousseImage: idCardAndTousseImageConfig,
  // 入库单列表
     godownEntryList : godownEntryListPrintConfig,
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r38254 -r38317
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 38254)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 38317)
@@ -3338,6 +3338,18 @@
 	setPrinterByConfig();
 	// 自定义打印
 	if (!isUndefinedOrNullOrEmpty(configObj.customPrint)) {
+		Ext4.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do',
+			async : false,
+			params: {
+				imageType: '器械包装配教学图片',
+				objectId: idCardInstance.tousseID
+			},
+			success: function (response, options) {
+				var res = Ext4.decode(response.responseText);
+				idCardInstance.tousseDefinition.imagesCount2 = res.data.length;
+			}
+		})
 		if (sstsConfig.enableIdCardInfoMaintain && idCardInstance.idCardDefinitionID) {
 			Ext.Ajax.request({
 				url: WWWROOT + '/disinfectSystem/idCardInfoMaintainAction!getIDCardInfoMaintainListByIDCardDefinitionId.do',