Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r29268 -r29313 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29268) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 29313) @@ -927,9 +927,13 @@ if(tousseInstance.getForeignProxyItem_id() != null){ ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao); if(foreignProxyDisinfection != null){ - - obj.put("maker", foreignProxyDisinfection.getMaker()); - obj.put("assistant", foreignProxyDisinfection.getAssistant()); + if(isPrintUserName){ + obj.put("maker", foreignProxyDisinfection.getMaker()); + obj.put("assistant", foreignProxyDisinfection.getAssistant()); + }else{ + obj.put("maker", foreignProxyDisinfection.getMakerCode()); + obj.put("assistant", foreignProxyDisinfection.getAssistantCode()); + } obj.put("depart", foreignProxyDisinfection.getDepart()); } }