Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r24784 -r25217 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 24784) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 25217) @@ -143,8 +143,10 @@ if(jsonObj.result[i].typeName != "一次性物品"){ materials.push(jsonObj.result[i]); }else{ - if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods != false){ - materials.push(jsonObj.result[i]); + if(sstsConfig && sstsConfig.tousseLabelPrintDisposableGoods){ + if(jsonObj.result[i].printInLabel == "是"){ + materials.push(jsonObj.result[i]); + } } } } @@ -377,9 +379,9 @@ var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation}; + obj.washOperator = tousseObj.washOperator; obj.tousseType = tousseObj.tousseType; - dingxiang_applyIf(obj,tousseObj); obj.nameWithoutDepart = tousseObj.tousseNameWithoutDepart; defaultPrintPackage(obj);