Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r29971 -r29980 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29971) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29980) @@ -2970,10 +2970,11 @@ var idCardPaperType = idCardInstance.idCardPaperType; var idNumber = idCardInstance.idNumber; var idCardQuestionList = idCardInstance.idCardQuestionList || []; - var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod; var packageType = idCardInstance.tousseDefinition.packageType; + var sterilisationAbbreviation = idCardInstance.tousseDefinition.sterilisationAbbreviation || ''; + var sterilingMethod = (sterilisationAbbreviation == '')? idCardInstance.tousseDefinition.sterilingMethod:sterilisationAbbreviation; var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit,idCardPaperType,description,idNumber,idCardQuestionList); - var tableHtml = ret.tableHtml + ""; + var tableHtml = ret.tableHtml + "

"; //条码，打印人和时间和器械数量 if(barcode != '' && userName != '' && date != ''){ tableHtml += ""; @@ -3009,7 +3010,7 @@ //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += "

***需要回收，切勿丢失***

***需要回收，切勿丢失***

"; LODOP.ADD_PRINT_HTM(tableTop,tableLeft,tableWidth,tableHeight,""+tableHtml+"");