Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r30365 -r30366 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 30365) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 30366) @@ -1558,7 +1558,6 @@ var applicationTime = printSummaryObj.applicationTime?printSummaryObj.applicationTime.substring(0,10):" "; var doctor = printSummaryObj.doctor?printSummaryObj.doctor:" "; var remark = printSummaryObj.remark?printSummaryObj.remark:" "; - var amount = printSummaryObj.amount?printSummaryObj.amount:" "; var css="body{margin:0;padding:0;}div{display:inline-block;text-align:left;margin:2px 0;padding:0px;vertical-align: middle;font-size:13px;}" + ".content{width:100%}" @@ -1577,7 +1576,15 @@ var tousses = printSummaryObj.tousses; if(tousses && tousses.length > 0){ var tousse = tousses[0] - var tousseName = tousse.tousseName?tousse.tousseName:" "; + var tousseName = tousse.tousseName; + if(tousseName.indexOf('-') >= 0){ + tousseName = tousseName.split('-')[0]; + if(parseInt(tousseName.substr(tousseName.length-2,1)) >= 0){ + tousseName = tousseName.slice(0,tousseName.length-2) + }else { + tousseName = tousseName.slice(0,tousseName.length-1) + } + } var amount1 = 0; var amount2 = 0; var splitNumber = 0;