Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r12332 -r12532 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 12332) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 12532) @@ -112,7 +112,7 @@ var operatorToPrint = tousseObj.operatorToPrint; var reviewerToPrint = tousseObj.reviewerToPrint; - + var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation; //获取申请单需要打印的手术病人信息 var foreignTousseAppInfo = {}; if(tousseType == '外来器械包' || tousseType == '外来器械拆分小包'){ @@ -148,7 +148,8 @@ '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, - 'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment + 'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment, + 'packageTypeAbbreviation':packageTypeAbbreviation }; defaultPrintForeignToussePackage(printSummaryObj); }else{ @@ -166,7 +167,8 @@ printBarcodeStr = fixedBarcode; } var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint, '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, + 'packageTypeAbbreviation':packageTypeAbbreviation}; defaultPrintPackage(obj); } } @@ -261,7 +263,7 @@ tableHtml += ""; tableHtml += "
"; - tableHtml += ""; + tableHtml += tousseObj.packageTypeAbbreviation+""; tableHtml += "
"+printBarcodeStr; tableHtml += "
"; @@ -278,6 +280,17 @@ } }; +function getDepartBarcodeByDepart(depart) { + var departBarcode = ''; + DWREngine.setAsync(false); + SupplyRoomConfigTableManager.getDepartBarcode(depart, function(result) { + if (result != null) { + departBarcode = result; + } + }); + DWREngine.setAsync(true); + return departBarcode; +} function hideField(field) { field.disable();// for validation