Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r26862 -r26879 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26862) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26879) @@ -1198,6 +1198,7 @@ var sterilingTypeTemp = top.Ext.getCmp('sterilizationType').getValue(); var myBarcodes2=[] var myBarcodes3=[] + var diffTousseNames = ""; for(var i = 0; i < length; i ++) { var tousseInstan = tousseInstanceArr[i]; var typeForSterilizationStatistics = tousseInstan.typeForSterilizationStatistics; //器械包类型(用于分类统计) @@ -1214,11 +1215,12 @@ sterilizationRecordWin.getEl().unmask(); return; }; - if(sterilingTypeTemp != sterilingType){ - showResultWithoutSpeak("器械包[" + tousseName + "]的灭菌程序和所选的灭菌程序不同!", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + //多个灭菌程序和所选的灭菌程序不同的器械包提示一起提示。同名包只出现一次 + if(sterilingTypeTemp != sterilingType && diffTousseNames.indexOf(tousseName) == -1){ + diffTousseNames += '[' + tousseName + ']'; } if(i==0){ - myBarcodes3[0]=tousseInstan.tousseBarcode//临时存放固定条码 + myBarcodes3[0]=tousseInstan.tousseBarcode;//临时存放固定条码 //添加到灭菌物品视图列表的第一行 var rootNode = sterilizationColumnTree.getRootNode(); var parentNode = createNode(true, tousseBarcode, tousseName, typeForSterilizationStatistics, "", '器械包', position, amount, reviewTime,stockAmount,todayAmount); @@ -1237,6 +1239,9 @@ myBarcodes2[i-1]=tousseInstan.tousseBarcode //本次的包实例条码 } } + if(diffTousseNames != ''){ + showResultWithoutSpeak("器械包" + diffTousseNames + "的灭菌程序和所选的灭菌程序不同!", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } Array.prototype.push.apply(myBarcodes,myBarcodes2);//将所有的包实例条码存入全局条码中 speakContent = sterilizationColumnTree.getRootNode().text; sterilizationRecordWin.getEl().unmask();