Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r22140 -r22304 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 22140) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 22304) @@ -2748,7 +2748,7 @@ TousseDefinition createInstanceTD = td; //创建消毒物品包定义 - if(isNewAddTousse && TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())){ + if(isNewAddTousse && td.isDisinfection()){ JSONArray materialArray = new JSONArray(); for(MaterialInstance mi : td.getMaterialInstances()){ JSONObject obj = new JSONObject(); @@ -2843,8 +2843,7 @@ private TousseItem newApplicationItem(List tousseDefinitions, InvoicePlan application, String tousseName,Long tousseDefinitionID, Integer recyclingAmount) { - TousseItem appItem; - appItem = new TousseItem(); + TousseItem appItem = new TousseItem(); appItem.setTousseName(tousseName); TousseDefinition td = getTousseDefinition(tousseDefinitions, tousseDefinitionID); appItem.setAmount(0);