Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r36370 -r36673
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 36370)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 36673)
@@ -440,7 +440,7 @@
 		top.Ext.getCmp('newSaveBtn').enable();
 		return false;
 	}
-	save2(newName, top.Ext.getCmp('saveBtn'), true, true);
+	save2(newName, top.Ext.getCmp('saveBtn'), true, false);
 }
 
 function newSave() {
@@ -673,6 +673,180 @@
 	});
 }
 
+function loadTousseDefinition(id,hasVideo){
+	formObj.form.load({
+		url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinition.do',
+		method: 'GET',
+		waitMsg: '正在加载数据，请稍候',
+		params: { id: id },
+		success: function (form, action) {
+			setIdCardPaperType2();
+			var tousseDefinition = action.result.data;
+			top.Ext.getCmp("orginalName").setValue(tousseDefinition.name);
+			top.Ext.getCmp("orginalSpelling").setValue(tousseDefinition.spelling);
+			if (hasVideo) {  //已经上传过视频
+				var videoName = tousseDefinition.uuid_vedioNames;
+				if (videoName != null) {
+					//videoName = videoName.split(';')[0];
+					top.Ext.getCmp('uuid_vedioNames').setValue(videoName);
+				}
+			}
+			//ZSRY-20：可选灭菌程序
+			if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
+				var optionalSterilizationJsonArr = tousseDefinition.optionalSterilizationJsonArr;
+				if(optionalSterilizationJsonArr.length > 0){
+					var names = [];
+					var ids = [];
+					for(var i=0;i<optionalSterilizationJsonArr.length;i++){
+						names[i] = optionalSterilizationJsonArr[i].sterilisation;
+						ids[i] = optionalSterilizationJsonArr[i].id;
+					}
+					top.Ext.getCmp('optionalSterilization').setValue(names.join('；'))
+					top.Ext.getCmp('optionalSterilizationIds').setValue(ids.join(';'))
+				}
+			}
+			top.Ext.getCmp('hiddenNoteValue').setValue(tousseDefinition.note || '');
+			//初始化此包定义的所有材料
+			for (var i = 0; i < tousseDefinition.tousseDefinitionMaterials.length; i++) {
+				var tousseDefinitionMaterial = tousseDefinition.tousseDefinitionMaterials[i];
+				if (tousseDefinitionMaterial.type == '器械') {
+					var materialDefinition = tousseDefinitionMaterial.materialDefinition;
+					var materialName = materialDefinition.name;
+					var name = materialName;
+					var sp = materialDefinition.specification;
+					var isImplant = materialDefinition.isImplant;
+					if (isImplant == null || isImplant == "") {
+						isImplant = "否";
+					}
+					if (sp != null && sp != '') {
+						materialName += "[" + sp + "]";
+					}
+					var mi = tousseDefinitionMaterial;
+					var material = new materialDefinitionConfig({
+						id: mi.id,
+						materialDefinitionId: materialDefinition.id,
+						name: materialName,
+						type: '器械',
+						cost: materialDefinition.cost,
+						count: mi.count,
+						countShow: mi.count,
+						price: materialDefinition.disinfectionPrice,
+						sequence: mi.sequence,
+						isImplant: isImplant
+					});
+					var m = new materialConfig({
+						id: mi.id,
+						count: mi.count,
+						price: materialDefinition.disinfectionPrice,
+						materileName: materialName,
+						name: name,
+						specification: sp,
+						snumber: ''
+
+					});
+					configStore.add(material);
+					if (signMaterilenStore) {
+						signMaterilenStore.add(m);
+					}
+				} else {
+					var goodsName = tousseDefinitionMaterial.diposableGoods.name;
+					var specification = tousseDefinitionMaterial.diposableGoods.specification;
+					if (specification != null && specification != "") {
+						goodsName += "[" + specification + "]";
+					}
+					var material = new materialDefinitionConfig({
+						id: tousseDefinitionMaterial.id,
+						materialDefinitionId: tousseDefinitionMaterial.diposableGoods.id,
+						name: goodsName,
+						type: '一次性物品',
+						cost: tousseDefinitionMaterial.diposableGoods.referencePrice,
+						count: tousseDefinitionMaterial.amount,
+						countShow: tousseDefinitionMaterial.amount,
+						price: tousseDefinitionMaterial.diposableGoods.referencePrice,
+						isImplant: ''
+					});
+					configStore.add(material);
+				}
+			}
+			//读取器械包定义下的所属科室
+			loadTousseBelongOrgUnitByTDId(id);
+			//如果器械包类型为消毒物品,则'是否灭菌'下拉框显示实际配置值,否则赋值为'是'并禁用
+			var tousseType = top.Ext.getCmp('tousseType').getValue();
+			if (tousseType == '器械包') {  //器械包
+				top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
+				top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
+			} else {
+				//禁用优先转换并设值为"否"
+				top.Ext.getCmp('isPriorConvertApplyGoods').disable();
+				top.Ext.getCmp('isPriorConvertApplyGoods').setValue('否');
+				if (tousseType == '敷料包') {  //敷料包
+					top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
+					top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
+					top.Ext.getCmp('isRecycling').disable();  //禁用“是否回收”下拉框
+				} else if (tousseType == '消毒物品') {  //消毒物品
+					top.Ext.getCmp('isInvoice').disable();  //禁用“是否发货”下拉框
+					//设置价格为只读,不可编辑
+					top.Ext.getCmp('price').el.dom.setAttribute("readOnly", true);
+				} else if (tousseType == '外部代理灭菌') {  //外部代理灭菌
+					top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
+					top.Ext.getCmp('autoOutStockForPacking').disable();  //禁用“自动扣包内材料”下拉框
+					top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
+					top.Ext.getCmp('isInvoice').disable();  //禁用“是否发货”下拉框，并默认赋值为“是”
+
+					top.Ext.getCmp('isRecycling').disable();  //禁用“是否回收”下拉框，并默认赋值为“否”
+					top.Ext.getCmp('isRecycling').setValue('否');
+				}
+			}
+			setMaterialCountAndMaterialType(materialsPanel);
+			setMaterialCostPrice(materialsPanel);
+			if (top.Ext.getCmp('isReview').getRawValue() == '否') {
+				top.Ext.getCmp('statisticsReviewWorkload').setValue("否");
+				top.Ext.getCmp('statisticsReviewWorkload').disable();
+			} else {
+				if (!tousseDefinition.statisticsReviewWorkload || tousseDefinition.statisticsReviewWorkload == 'null') {
+					top.Ext.getCmp('statisticsReviewWorkload').setValue("是");
+				}
+			}
+			if (tousseDefinition.isCommonTousse != null) {
+				top.Ext.getCmp("isCommonTousseStr").setValue(tousseDefinition.isCommonTousse)
+			}
+			if (tousseDefinition.riskLevel == 0) {
+				top.Ext.getCmp("riskLevel").setValue('')
+			}
+			var ids = [];
+			var names = [];
+			if (tousseDefinition.instrumentSetTypeJSONArray && tousseDefinition.instrumentSetTypeJSONArray.length > 0) {
+				for (var i = 0; i < tousseDefinition.instrumentSetTypeJSONArray.length; i++) {
+					ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
+					names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
+				}
+				top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
+				top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
+			} else {
+				top.Ext.getCmp('instrumentSetType').setValue('');
+				top.Ext.getCmp('instrumentSetTypeName').setValue('');
+			}
+			if (tousseDefinition.printBOMwhenPrintLabel == '') {
+				top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否');
+			}
+			if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
+				if(tousseDefinition.isSterile !== '可选'){
+					top.Ext.getCmp('sterilizationPriceBox').hide();
+					top.Ext.getCmp('secondDisinfectionPriceBox').hide();
+				}
+			}else {
+				top.Ext.getCmp('sterilizationPriceBox').hide();
+				top.Ext.getCmp('secondDisinfectionPriceBox').hide();
+			}
+			if (tousseDefinition.isTraceable == '否') {
+				var newData = [['是'], ['否']];
+				var isSterileCombo = formObj.findById('isSterile');
+				isSterileCombo.store.loadData(newData);
+			}
+		}
+	});
+}
+
 function addAndEditTousse(id, tousseName) {
 	this.id = id;
 	tousseDefinitionID = id;
@@ -1927,6 +2101,7 @@
 						minValue: 1,
 						name: 'printAmount',
 						id: 'printAmount',
+						value:1,
 						anchor: '100%'
 					}]
 				}, {
@@ -2178,6 +2353,7 @@
 						mode: 'local',
 						allowBlank: false,
 						triggerAction: 'all',
+						value:'是',
 						anchor: '100%'
 					}]
 
@@ -2298,6 +2474,7 @@
 						allowBlank: true,
 						triggerAction: 'all',
 						anchor: '100%',
+						value:'是',
 						listeners: {
 							select: function (combo, record, index) {
 								if (combo.getRawValue() == '否') {
@@ -2337,6 +2514,7 @@
 						allowNegative: false,
 						name: 'autoDiscardCount',
 						id: 'autoDiscardCount',
+						value:0,
 						anchor: '100%'
 					}]
 				}, {
@@ -2372,6 +2550,7 @@
 						mode: 'local',
 						allowBlank: false,
 						triggerAction: 'all',
+						value:'否',
 						anchor: '100%'
 
 					}]
@@ -2398,6 +2577,7 @@
 						allowBlank: false,
 						triggerAction: 'all',
 						anchor: '100%',
+						value:'是',
 						listeners: {
 							select: function (combo, record, index) {
 								if (combo.getRawValue() == '否') {
@@ -3302,6 +3482,7 @@
 		}]
 	});
 	tousseWin.show();
+	top.Ext.getCmp('name').focus('', 10);
 	//ZSRY-16：拖动排序
 	new top.Ext.dd.DropTarget(materialsPanel.getEl(), {
 		ddGroup: 'gridDD',
@@ -3345,177 +3526,7 @@
 		}
 	})
 	if (id != 0) {
-		formObj.form.load({
-			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinition.do',
-			method: 'GET',
-			waitMsg: '正在加载数据，请稍候',
-			params: { id: id },
-			success: function (form, action) {
-				setIdCardPaperType2();
-				var tousseDefinition = action.result.data;
-				top.Ext.getCmp("orginalName").setValue(tousseDefinition.name);
-				top.Ext.getCmp("orginalSpelling").setValue(tousseDefinition.spelling);
-				if (hasVideo) {  //已经上传过视频
-					var videoName = tousseDefinition.uuid_vedioNames;
-					if (videoName != null) {
-						//videoName = videoName.split(';')[0];
-						top.Ext.getCmp('uuid_vedioNames').setValue(videoName);
-					}
-				}
-				//ZSRY-20：可选灭菌程序
-				if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
-					var optionalSterilizationJsonArr = tousseDefinition.optionalSterilizationJsonArr;
-					if(optionalSterilizationJsonArr.length > 0){
-						var names = [];
-						var ids = [];
-						for(var i=0;i<optionalSterilizationJsonArr.length;i++){
-							names[i] = optionalSterilizationJsonArr[i].sterilisation;
-							ids[i] = optionalSterilizationJsonArr[i].id;
-						}
-						top.Ext.getCmp('optionalSterilization').setValue(names.join('；'))
-						top.Ext.getCmp('optionalSterilizationIds').setValue(ids.join(';'))
-					}
-				}
-				top.Ext.getCmp('hiddenNoteValue').setValue(tousseDefinition.note || '');
-				//初始化此包定义的所有材料
-				for (var i = 0; i < tousseDefinition.tousseDefinitionMaterials.length; i++) {
-					var tousseDefinitionMaterial = tousseDefinition.tousseDefinitionMaterials[i];
-					if (tousseDefinitionMaterial.type == '器械') {
-						var materialDefinition = tousseDefinitionMaterial.materialDefinition;
-						var materialName = materialDefinition.name;
-						var name = materialName;
-						var sp = materialDefinition.specification;
-						var isImplant = materialDefinition.isImplant;
-						if (isImplant == null || isImplant == "") {
-							isImplant = "否";
-						}
-						if (sp != null && sp != '') {
-							materialName += "[" + sp + "]";
-						}
-						var mi = tousseDefinitionMaterial;
-						var material = new materialDefinitionConfig({
-							id: mi.id,
-							materialDefinitionId: materialDefinition.id,
-							name: materialName,
-							type: '器械',
-							cost: materialDefinition.cost,
-							count: mi.count,
-							countShow: mi.count,
-							price: materialDefinition.disinfectionPrice,
-							sequence: mi.sequence,
-							isImplant: isImplant
-						});
-						var m = new materialConfig({
-							id: mi.id,
-							count: mi.count,
-							price: materialDefinition.disinfectionPrice,
-							materileName: materialName,
-							name: name,
-							specification: sp,
-							snumber: ''
-
-						});
-						configStore.add(material);
-						if (signMaterilenStore) {
-							signMaterilenStore.add(m);
-						}
-					} else {
-						var goodsName = tousseDefinitionMaterial.diposableGoods.name;
-						var specification = tousseDefinitionMaterial.diposableGoods.specification;
-						if (specification != null && specification != "") {
-							goodsName += "[" + specification + "]";
-						}
-						var material = new materialDefinitionConfig({
-							id: tousseDefinitionMaterial.id,
-							materialDefinitionId: tousseDefinitionMaterial.diposableGoods.id,
-							name: goodsName,
-							type: '一次性物品',
-							cost: tousseDefinitionMaterial.diposableGoods.referencePrice,
-							count: tousseDefinitionMaterial.amount,
-							countShow: tousseDefinitionMaterial.amount,
-							price: tousseDefinitionMaterial.diposableGoods.referencePrice,
-							isImplant: ''
-						});
-						configStore.add(material);
-					}
-				}
-				//读取器械包定义下的所属科室
-				loadTousseBelongOrgUnitByTDId(id);
-				//如果器械包类型为消毒物品,则'是否灭菌'下拉框显示实际配置值,否则赋值为'是'并禁用
-				var tousseType = top.Ext.getCmp('tousseType').getValue();
-				if (tousseType == '器械包') {  //器械包
-					top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
-					top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
-				} else {
-					//禁用优先转换并设值为"否"
-					top.Ext.getCmp('isPriorConvertApplyGoods').disable();
-					top.Ext.getCmp('isPriorConvertApplyGoods').setValue('否');
-					if (tousseType == '敷料包') {  //敷料包
-						top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
-						top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
-						top.Ext.getCmp('isRecycling').disable();  //禁用“是否回收”下拉框
-					} else if (tousseType == '消毒物品') {  //消毒物品
-						top.Ext.getCmp('isInvoice').disable();  //禁用“是否发货”下拉框
-						//设置价格为只读,不可编辑
-						top.Ext.getCmp('price').el.dom.setAttribute("readOnly", true);
-					} else if (tousseType == '外部代理灭菌') {  //外部代理灭菌
-						top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框
-						top.Ext.getCmp('autoOutStockForPacking').disable();  //禁用“自动扣包内材料”下拉框
-						top.Ext.getCmp('isSterile').disable();  //禁用“是否灭菌”下拉框
-						top.Ext.getCmp('isInvoice').disable();  //禁用“是否发货”下拉框，并默认赋值为“是”
-
-						top.Ext.getCmp('isRecycling').disable();  //禁用“是否回收”下拉框，并默认赋值为“否”
-						top.Ext.getCmp('isRecycling').setValue('否');
-					}
-				}
-				setMaterialCountAndMaterialType(materialsPanel);
-				setMaterialCostPrice(materialsPanel);
-				if (top.Ext.getCmp('isReview').getRawValue() == '否') {
-					top.Ext.getCmp('statisticsReviewWorkload').setValue("否");
-					top.Ext.getCmp('statisticsReviewWorkload').disable();
-				} else {
-					if (!tousseDefinition.statisticsReviewWorkload || tousseDefinition.statisticsReviewWorkload == 'null') {
-						top.Ext.getCmp('statisticsReviewWorkload').setValue("是");
-					}
-				}
-				if (tousseDefinition.isCommonTousse != null) {
-					top.Ext.getCmp("isCommonTousseStr").setValue(tousseDefinition.isCommonTousse)
-				}
-				if (tousseDefinition.riskLevel == 0) {
-					top.Ext.getCmp("riskLevel").setValue('')
-				}
-				var ids = [];
-				var names = [];
-				if (tousseDefinition.instrumentSetTypeJSONArray && tousseDefinition.instrumentSetTypeJSONArray.length > 0) {
-					for (var i = 0; i < tousseDefinition.instrumentSetTypeJSONArray.length; i++) {
-						ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
-						names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
-					}
-					top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
-					top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
-				} else {
-					top.Ext.getCmp('instrumentSetType').setValue('');
-					top.Ext.getCmp('instrumentSetTypeName').setValue('');
-				}
-				if (tousseDefinition.printBOMwhenPrintLabel == '') {
-					top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否');
-				}
-				if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){
-					if(tousseDefinition.isSterile !== '可选'){
-						top.Ext.getCmp('sterilizationPriceBox').hide();
-						top.Ext.getCmp('secondDisinfectionPriceBox').hide();
-					}
-				}else {
-					top.Ext.getCmp('sterilizationPriceBox').hide();
-					top.Ext.getCmp('secondDisinfectionPriceBox').hide();
-				}
-				if (tousseDefinition.isTraceable == '否') {
-					var newData = [['是'], ['否']];
-					var isSterileCombo = formObj.findById('isSterile');
-					isSterileCombo.store.loadData(newData);
-				}
-			}
-		});
+		loadTousseDefinition(id,hasVideo);
 	} else {
 		packTypeStore.load();
 		top.Ext.getCmp('isApplyEntireTousse').disable();  //禁用“是否整包申请”下拉框，并默认赋值为“是”
@@ -3700,6 +3711,7 @@
 					success: function (form, action) {
 						if (isExpend) {//如果是另存为的话，就还要关闭另存信息弹窗
 							newSaveMsgWin.close();
+							loadTousseDefinition(action.result.id,false);
 						}
 						if(isCloseWindow){
 							tousseWin.close();