Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r33698 -r33700 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33698) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 33700) @@ -362,7 +362,7 @@ node.attributes.type = params.type; node.attributes.position = params.position; node.attributes.amount = params.amount; - node.attributes.reviewTime = (params.isTraceable == '是') ? params.reviewTime : ''; + node.attributes.reviewTime = params.reviewTime || ''; node.attributes.sterilingMode = params.sterilingMode; node.attributes.stockAmount = params.stockAmount; node.attributes.isUrgentTousse = params.isUrgentTousse; @@ -1688,12 +1688,9 @@ var tdIncludeImplant = resultData.tdIncludeImplant;//是否为含有植入物的普通器械包 var reviewTime = resultData.reviewTime; //审核时间 var unTraceable = resultData.unTraceable; //是否为不追溯(有值代表不追溯) - var sterilingMode = resultData.sterilingMode; //灭菌方式 + var sterilingMode = resultData.sterilingMode || ''; //灭菌方式 var isUrgentTousse = resultData.isUrgentTousse;//是否加急 var urgentLevel = resultData.urgentLevel;//加急对象 - if (!sterilingMode) { - sterilingMode = ""; - } if (top.Ext.getCmp('sterilizationType').getValue() != sterilingType) { showMultipleResult("器械包[" + tousseName + "]的灭菌程序和所选的灭菌程序不同!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage, true); } @@ -2481,6 +2478,7 @@ var reviewTime = clickNode.attributes.reviewTime; var amount = clickNode.attributes.amount; var sterilingMode = clickNode.attributes.sterilingMode; + var tousseIsUrgent = '否'; var tousseUrgentLevel = clickNode.attributes.urgentLevel; var countAmount = 0 var array = new Array(); @@ -2497,6 +2495,17 @@ var urgentLevel = pNode.attributes.urgentLevel; var childType = 'TOUSSE_IN'; var isUrgent = '否'; + DWREngine.setAsync(false); + //如果灭菌程序不能添加器械包,要清除灭菌物品列表 + SterilizationRecordTableManager.isTousseUrgent(childObjBarcode, function (res) { + var result = Ext.decode(res); + if (result.isUrgent == true) { + isUrgent = '是'; + isBasketUrgent = true; + urgentLevel = result.urgentLevel; + } + }); + DWREngine.setAsync(true); var params = { objBarcode: childObjBarcode, objName: childObjName, @@ -2506,28 +2515,28 @@ reviewTime: pNode.attributes.reviewTime, sterilingMode: pNode.attributes.sterilingMode, isTraceable: pNode.attributes.isTraceable, + isUrgent: isUrgent, urgentLevel: urgentLevel } children.push(params); var childNode = createPendingSterilizationGoodsNodeForUrgent(params); - DWREngine.setAsync(false); - //如果灭菌程序不能添加器械包,要清除灭菌物品列表 - SterilizationRecordTableManager.isTousseUrgent(childObjBarcode, function (res) { - var result = Ext.decode(res); - if (result.isUrgent == true) { - isUrgent = '是'; - isBasketUrgent = true; - urgentLevel = result.urgentLevel; - } - }); - DWREngine.setAsync(true); - childNode.attributes.isUrgent = isUrgent; - childNode.attributes.urgentLevel = urgentLevel; array.push(childNode); }); } else { type = 'TOUSSE'; } + if (type == 'TOUSSE') { + DWREngine.setAsync(false); + //如果灭菌程序不能添加器械包,要清除灭菌物品列表 + SterilizationRecordTableManager.isTousseUrgent(objBarcode, function (res) { + var result = Ext.decode(res); + if (result.isUrgent == true) { + tousseIsUrgent = '是'; + tousseUrgentLevel = result.urgentLevel; + } + }); + DWREngine.setAsync(true); + } var params = { objBarcode: objBarcode, objName: objName, @@ -2537,25 +2546,10 @@ reviewTime: reviewTime, sterilingMode: sterilingMode, urgentLevel: tousseUrgentLevel, + isUrgent: tousseIsUrgent, cls: clickNode.attributes.cls } var node = createPendingSterilizationGoodsNodeForUrgent(params); - if (type == 'TOUSSE') { - var isUrgent = '否'; - var urgentLevel = ''; - DWREngine.setAsync(false); - //如果灭菌程序不能添加器械包,要清除灭菌物品列表 - SterilizationRecordTableManager.isTousseUrgent(node.attributes.objBarcode, function (res) { - var result = Ext.decode(res); - if (result.isUrgent == true) { - isUrgent = '是'; - urgentLevel = result.urgentLevel; - } - }); - DWREngine.setAsync(true); - node.attributes.isUrgent = isUrgent; - node.attributes.urgentLevel = urgentLevel; - } if (type == 'BASKET') { if (isBasketUrgent) { node.attributes.isUrgent = '是';