Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r29570 -r29616 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 29570) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 29616) @@ -2485,7 +2485,7 @@ case 14:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getSterilizationUser());break; case 15:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getSterileEndTime());break; case 16:label=new Label(j,i+1-(kk*sheetSize), tousseInstance.getSterilingType());break; - case 17:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getSterilizerName() + ",第" + tousseInstance.getSterileFrequency() + "炉");break; + case 17:label=new Label(j, i+1-(kk*sheetSize), (StringUtils.isNotBlank(tousseInstance.getSterilizerName()) && StringUtils.isNotBlank(tousseInstance.getSterileFrequency())) ? tousseInstance.getSterilizerName() + ",第" + tousseInstance.getSterileFrequency() + "炉" : "");break; case 18:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getInvoiceSender());break; case 19:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getInvoiceSendTime() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tousseInstance.getInvoiceSendTime()) : "");break; case 20:label=new Label(j, i+1-(kk*sheetSize), tousseInstance.getWasteDate() != null ? new SimpleDateFormat("yyyy-MM-dd").format(tousseInstance.getWasteDate()) : "");break;