Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r15200 -r15299 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 15200) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 15299) @@ -71,16 +71,19 @@ // 获取标签打印的名字,姓名或者工号 // operator: 打包人, reviewer:审核人,operatorCode:打包人工号,reviewerCode:审核人工号 -function getPrintNames(isPrintUserName,operator,reviewer,operatorCode,reviewerCode){ +function getPrintNames(isPrintUserName,operator,reviewer,sterileUser,operatorCode,reviewerCode,sterileCode){ var names = {}; var operatorToPrint = operator;//打包人 var reviewerToPrint = reviewer;//审核人 + var sterilizationUserToPrint = sterileUser; if(isPrintUserName == false || isPrintUserName == 'false'){ operatorToPrint = operatorCode; reviewerToPrint = reviewerCode; + sterilizationUserToPrint = sterileCode; } names.operatorToPrint = operatorToPrint; names.reviewerToPrint = reviewerToPrint; + names.sterilizationUserToPrint = sterilizationUserToPrint; return names; } @@ -113,6 +116,7 @@ var operatorToPrint = tousseObj.operatorToPrint; var reviewerToPrint = tousseObj.reviewerToPrint; + var sterilizationUserToPrint = tousseObj.sterilizationUserToPrint; var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation; //获取申请单需要打印的手术病人信息 var foreignTousseAppInfo = {}; @@ -145,7 +149,7 @@ var printSummaryObj = { - 'barcode':barcodes[j],'virtualBasketSeqNum':seq,'name':tousseName,'material':"",'operator':operatorToPrint,'reviewer':reviewerToPrint,'sterilizationDate':sterilizationDate,'validDate':validDate, + 'barcode':barcodes[j],'virtualBasketSeqNum':seq,'name':tousseName,'material':"",'operator':operatorToPrint,'reviewer':reviewerToPrint,'sterilizationUser':sterilizationUserToPrint,'sterilizationDate':sterilizationDate,'validDate':validDate, 'foreignPackageObjectArray':applicationItems,'sterilizer':sterilizer,'frequency':frequency,'markTousse':markTousse,'hospitalName':hospitalName,'total':total, 'labelType':foreignDefaultLabelpaper,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime, 'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea, @@ -183,7 +187,7 @@ if(!isTraceable){//不追溯打固定条码 printBarcodeStr = fixedBarcode; } - var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, + var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':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;