Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r36458 -r36466 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 36458) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 36466) @@ -363,14 +363,16 @@ function printBarcode(retObj,virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount){ var namesObj = { - operator: Ext.getCmp('operator').getValue(), - operatorCode: Ext.getCmp('operatorCode').getValue(), - wrapper: Ext.getCmp('wrapper').getValue(), - wrapperCode: Ext.getCmp('wrapperCode').getValue(), - reviewer: Ext.getCmp('reviewer').getValue(), - reviewerCode: Ext.getCmp('reviewerCode').getValue(), - sterileUser: Ext.getCmp('sterileUser').getValue(), - sterileCode: Ext.getCmp('sterileCode').getValue() + operator: Ext.getCmp('operator').getValue(), + operatorCode: Ext.getCmp('operatorCode').getValue(), + wrapper: Ext.getCmp('wrapper').getValue(), + wrapperCode: Ext.getCmp('wrapperCode').getValue(), + reviewer: Ext.getCmp('reviewer').getValue(), + reviewerCode: Ext.getCmp('reviewerCode').getValue(), + sterileUser: Ext.getCmp('sterileUser').getValue(), + sterileCode: Ext.getCmp('sterileCode').getValue(), + inspector: Ext.getCmp('inspector').getValue(), + inspectorCode: Ext.getCmp('inspectorCode').getValue() } var names = getPrintNames(isPrintUserFullName,namesObj); var tousseInstances = retObj.tousseInstances; @@ -421,7 +423,7 @@ var packageTypeAbbreviation = tousseInstance.packageTypeAbbreviation; var barcodes = [barcode]; var obj = {'barcodes':barcodes, 'name':toussName, 'name':toussName, 'nameWithoutDepart':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, - 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, + 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,'inspector': names.inspectorToPrint, 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation}; obj.sterilizerName = sterilizer; obj.sterileFrequency = frequency;