Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37201 -r37250
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37201)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37250)
@@ -1459,6 +1459,8 @@
 			{ name: 'remarkOfApplyGoods' },
 			{ name: 'haveRemarkOfApplyGoods' },
 			{ name: 'classifiedItemAmountInfo' },
+			{ name: 'sterilizationPackageType' },
+			{ name: 'sterilizationPaperType' },
 			{ name: 'patient' },
 			{ name: 'useAmount' },
 			{ name: 'needInspectMaterials' },
@@ -2483,6 +2485,10 @@
 				name: 'packedPhotographed'
 			}, {
 				xtype: 'hidden',
+				id: 'sterilizationPackageType',
+				name: 'sterilizationPackageType'
+			}, {
+				xtype: 'hidden',
 				id: 'note'
 			}, {
 				columnWidth: .5,
@@ -2987,7 +2993,19 @@
 					data:[['本次灭菌',true],['本次不灭菌',false]],
 					fields: ['text','value']
 				}),
-				value:false
+				value:false,
+				listeners:{
+					select: function (combo, record, index) {
+						if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
+							if(record[0].data.value == true){
+								var sterilizationPackageType = Ext4.getCmp('sterilizationPackageType').getValue();
+								if(sterilizationPackageType !== ''){
+									Ext4.getCmp('packageType').setValue(sterilizationPackageType);
+								}
+							}
+						}
+					}
+				}
 			}, {
 				columnWidth: .5,
 				xtype : 'combo',
@@ -6350,7 +6368,27 @@
 			//根据灭菌程序设置灭菌方式的值
 			setSterilingModeValueBySterilingType(sterilingMethod);
 		}
+
 		Ext4.getCmp('packageType').setValue(packageType);
+
+		if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
+			var sterilizationPackageType = '';
+			var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue();
+			if(tousseType == '消毒物品'){
+				if (record.childNodes.length == 0) {
+					sterilizationPackageType = record.get('sterilizationPackageType');
+				} else {
+					sterilizationPackageType = record.childNodes[0].get('sterilizationPackageType');
+				}
+			}
+			if(sterilizationPackageType !== ''){
+				Ext4.getCmp('sterilizationPackageType').setValue(sterilizationPackageType);
+				if(sterilizedThisTime == true){
+					Ext4.getCmp('packageType').setValue(sterilizationPackageType);
+				}
+			}
+		}
+
 		lastSelectedTousseName = tousseName;
 		// 显示丢失报损按钮
 		showOrHideErrorAndDamageBtn();
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r37199 -r37250
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 37199)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 37250)
@@ -1890,7 +1890,14 @@
 	return formType;
 }
 function getConfigObj(obj) {
-	var formType = getFormTypeByPageType(obj.tousseType, obj.pageType);
+	var pageType = obj.pageType;
+	if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
+		var sterilizationPaperType = obj.sterilizationPaperType || '';
+		if (obj.tousseType == '消毒物品' && sterilizationPaperType !== '') {
+			pageType = sterilizationPaperType;
+		}
+	}
+	var formType = getFormTypeByPageType(obj.tousseType, pageType);
 	var myObj = printConfig[formType];
 	if (isUndefinedOrNullOrEmpty(myObj)) {
 		// 消毒物品返回默认的配置对象
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r37129 -r37250
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 37129)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 37250)
@@ -226,6 +226,24 @@
 	}
 }
 
+//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+function setPackageTypeAndPaperTypeBox(tousseType,isSterile){
+	if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
+		if(isSterile == '否'){
+			top.Ext.getCmp('sterilizationPackageTypeBox').hide();
+			top.Ext.getCmp('sterilizationPaperTypeBox').hide();
+		}else {
+			if(tousseType == '消毒物品'){
+				top.Ext.getCmp('sterilizationPackageTypeBox').show();
+				top.Ext.getCmp('sterilizationPaperTypeBox').show();
+			}else {
+				top.Ext.getCmp('sterilizationPackageTypeBox').hide();
+				top.Ext.getCmp('sterilizationPaperTypeBox').hide();
+			}
+		}
+	}
+}
+
 function deleteItem(id){
 	var sterilingMethodItemStore = top.Ext.getCmp('sterilingMethodGrid').getStore();
 	for(var j=0;j<sterilingMethodItemStore.getCount();j++){
@@ -829,6 +847,10 @@
 			if (tousseDefinition.printBOMwhenPrintLabel == '') {
 				top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否');
 			}
+			//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+			var tousseType = top.Ext.getCmp('tousseType').getValue();
+			setPackageTypeAndPaperTypeBox(tousseType,tousseDefinition.isSterile);
+
 			if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
 				if(tousseDefinition.isSterile !== '可选'){
 					top.Ext.getCmp('sterilizationPriceBox').hide();
@@ -1434,6 +1456,9 @@
 										top.Ext.getCmp('isRecycling').setValue('否');
 									}
 								}
+								//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+								var isSterile = top.Ext.getCmp('isSterile').getValue();
+								setPackageTypeAndPaperTypeBox(tousseType,isSterile);
 							}
 						},
 						anchor: '100%'
@@ -2148,8 +2173,10 @@
 									top.Ext.getCmp('isSterile').setValue("否");
 									top.Ext.getCmp('sterilizationPriceBox').hide();
 									top.Ext.getCmp('secondDisinfectionPriceBox').hide();
-
 								}
+								//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+								setPackageTypeAndPaperTypeBox('','否');
+
 								setStatisticsReviewWorkload();
 							}
 						}
@@ -2242,12 +2269,56 @@
 									top.Ext.getCmp('sterilizationPriceBox').hide();
 									top.Ext.getCmp('secondDisinfectionPriceBox').hide();
 								}
+								//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+								var tousseType = top.Ext.getCmp('tousseType').getValue();
+								setPackageTypeAndPaperTypeBox(tousseType,combo.getRawValue());
 							}
 						}
 					}]
 				}, {
 					columnWidth: colWidth,
 					layout: 'form',
+					labelAlign: "right",
+					labelWidth: fontSize == 12 ? 90 : 100,
+					id:'sterilizationPackageTypeBox',
+					hidden:!sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction,
+					items: [{
+						xtype: 'combo',
+						fieldLabel: '灭菌包装类型',
+						id: 'sterilizationPackageType',
+						name: 'sterilizationPackageType',
+						valueField: 'typeName',
+						displayField: 'typeName',
+						store: packTypeStore,
+						forceSelection: true,
+						editable: false,
+						triggerAction: 'all',
+						anchor: '100%',
+						allowBlank: true
+					}]
+				}, {
+					columnWidth: colWidth,
+					layout: 'form',
+					labelWidth: fontSize == 12 ? 100 : 110,
+					id:'sterilizationPaperTypeBox',
+					hidden:!sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction,
+					items: [{
+						xtype: 'combo',
+						fieldLabel: '灭菌标签纸类型',
+						id: 'sterilizationPaperType',
+						name: 'sterilizationPaperType',
+						editable: false,
+						valueField: 'name',
+						displayField: 'name',
+						store: barcodePaperTypeStore,
+						allowBlank: true,
+						forceSelection: true,
+						triggerAction: 'all',
+						anchor: '100%'
+					}]
+				}, {
+					columnWidth: colWidth,
+					layout: 'form',
 					hidden: !sstsConfig.enableIsInvoice,
 					items: [{
 						xtype: 'combo',
@@ -3535,6 +3606,10 @@
 		top.Ext.getCmp('isSterile').setValue('是');
 		top.Ext.getCmp('sterilizationPriceBox').hide();
 		top.Ext.getCmp('secondDisinfectionPriceBox').hide();
+		//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
+		var tousseType = top.Ext.getCmp('tousseType').getValue();
+		setPackageTypeAndPaperTypeBox(tousseType,'是');
+
 	}
 }