Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r18645 -r18778 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 18645) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 18778) @@ -645,17 +645,17 @@ item.setAmount(prepareRecycleAmount); item.setPrepareRecycleAmount(prepareRecycleAmount); String tousseName = td.getName(); - if (TousseDefinition.PACKAGE_TYPE_DISINFECTION - .equals(td.getTousseType())) { + if (td.isDisinfection()) { recyclingApplicationManager.addDisinfectTousseItem(plan, prepareRecycleAmount, td,item); - continue; +// continue; + }else{ + item.setTousseDefinitionId(td.getId()); + item.setIsInvoice(td.getIsInvoice()); } item.setTousseName(tousseName); item.setTousseType(td.getTousseType()); item.setDiposable("否"); - item.setTousseDefinitionId(td.getId()); - item.setIsInvoice(td.getIsInvoice()); item.setExpressRecycling(td.getExpressRecycling()); item.setIsApplyEntireTousse(td.getIsApplyEntireTousse()); item.setIsCleanedEntirely(td.getIsCleanedEntirely());