Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r29562 -r29744 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29562) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29744) @@ -333,7 +333,7 @@ var foreignTousseAppInfo = {}; if(tousseType == '外来器械包' || tousseType == '外来器械拆分小包'){ foreignTousseAppInfo = cssdUtils_findForeignTousseApplication(tousseObj); - } + } getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); if(barcodes != null && barcodes.length > 0){ for ( var j = 0; j < barcodes.length; j++) { @@ -369,7 +369,7 @@ dingxiang_applyIf(printSummaryObj,tousseObj); dingxiang_applyIf(printSummaryObj,foreignTousseAppInfo); printSummaryObj.nameWithoutDepart = tousseObj.tousseNameWithoutDepart; - setMaterialsForPrint(printSummaryObj,barcodes[j]); + setMaterialsForPrint(printSummaryObj,barcodes[j]); defaultPrintForeignToussePackage(printSummaryObj); }else{ //打印标签纸类型(大标签打印材料/小标签不打印材料) @@ -389,11 +389,16 @@ 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,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName,'remark':remark}; - + obj.depart = tousseObj.depart; obj.washOperator = tousseObj.washOperator; obj.tousseType = tousseObj.tousseType; - dingxiang_applyIf(obj,tousseObj); - obj.nameWithoutDepart = tousseObj.tousseNameWithoutDepart; + dingxiang_applyIf(obj,tousseObj); + if(tousseObj.depart && tousseObj.depart !== ''){ + obj.name = '('+tousseObj.depart+')'+tousseName; + }else { + obj.name = tousseName; + } + obj.tousseNameWithoutDepart = obj.tousseName; defaultPrintPackage(obj); } }