Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r19894 -r19905 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 19894) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 19905) @@ -339,8 +339,17 @@ tousseItem.setIsCleanedEntirely(cleanedEntirely); tousseItem.setIsRecycling("是"); foreignTousseItems.add(tousseItem); - foreignTousseApplication.setTousseName(tousseItem.getTousseName()); - foreignTousseApplication.setSupplierName(tousseItem.getSupplierName()); + + String tousseName = StringTools.isNotBlank(foreignTousseApplication.getTousseName()) ? + String.format("%s;%s", foreignTousseApplication.getTousseName(), tousseItem.getTousseName()) : + tousseItem.getTousseName(); + + String supplierName = StringTools.isNotBlank(foreignTousseApplication.getSupplierName()) ? + String.format("%s;%s", foreignTousseApplication.getSupplierName(), tousseItem.getSupplierName()) : + tousseItem.getSupplierName(); + + foreignTousseApplication.setTousseName(tousseName); + foreignTousseApplication.setSupplierName(supplierName); } } //为外来器械申请单设置科室查看权限