diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 507bfb19c..d4164169b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -150,7 +150,9 @@ public class BasicOrderPrintController { bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); bizData.put("productDate", obj.getProductDate()); bizData.put("expireDate", obj.getExpireDate()); - bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime())); + if (ioOrderResponse.getConfirmTime() != null){ + bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime())); + } bizData.put("manufactor", obj.getManufacturer()); bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); @@ -239,7 +241,9 @@ public class BasicOrderPrintController { bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo()); bizData.put("productDate", ioOrderDetailBizEntity.getProductDate()); bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); - bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime())); + if (ioOrderResponse.getConfirmTime() != null){ + bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime())); + } bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("udiCode", obj.getCode().replaceAll("\u001D", ""));