Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r27814 -r27837 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 27814) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 27837) @@ -6507,6 +6507,7 @@ obj.put("barcode", ((ExpensiveDisposablegoods)bd).getBarcode()); obj.put("showTousseName", CssdUtils.getDiposableGoodsName(batch.getDiposableGoods())); + obj.put("ttsName", StringUtils.isBlank(disposableGoods.getTtsName()) ? "" : disposableGoods.getTtsName()); obj.put("batchNo", batch.getBatchNumber()); obj.put("validUntil", batch.getExpDateStr()); obj.put("tousseType", TousseItem.TYPE_DIPOSABLE_GOODS); @@ -6528,6 +6529,7 @@ obj.put("barcode", diposableGoods.getBarcode()); obj.put("showTousseName", CssdUtils.getDiposableGoodsName(diposableGoods)); + obj.put("ttsName", StringUtils.isBlank(diposableGoods.getTtsName()) ? "" : diposableGoods.getTtsName()); obj.put("tousseType", TousseItem.TYPE_DIPOSABLE_GOODS); //pda需要用到以下两个属性 obj.put("type", "DisposableGoods"); @@ -6544,6 +6546,7 @@ } obj.put("barcode", batch.getBarcode()); obj.put("showTousseName", CssdUtils.getDiposableGoodsName(batch.getDiposableGoods())); + obj.put("ttsName", StringUtils.isBlank(disposableGoods.getTtsName()) ? "" : disposableGoods.getTtsName()); obj.put("batchNo", batch.getBatchNumber()); obj.put("validUntil", batch.getExpDateStr()); obj.put("tousseType", TousseItem.TYPE_DIPOSABLE_GOODS);