Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r33614 -r33667 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33614) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33667) @@ -2657,7 +2657,7 @@ if (typeof (value) == 'undefined') { return true; } - if (value == null) { + if (value == null || value == 'null') { return true; } if (value == '') { Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r33523 -r33667 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 33523) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 33667) @@ -1338,10 +1338,12 @@ function CreateOneFormPage(barcode,name,unitName) { doGetLodop(); var tableHtml =""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + if(!isUndefinedOrNullOrEmpty(unitName)){ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + } tableHtml += ""; tableHtml += "";
"+unitName+"
"; - tableHtml += "
"+unitName+"
"; + tableHtml += "
"+name+"