Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java =================================================================== diff -u -r29083 -r29090 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 29083) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 29090) @@ -298,15 +298,17 @@ } } InvoicePlan invoicePlan = invoicePlanManager.get(tousseTransitionPlan.getInvoicePlanId()); - if (invoicePlan.getPrepareRecycleDateTime() != null) { - obj.put("prepareRecycleDateTime", Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan - .getPrepareRecycleDateTime())); + if(invoicePlan != null){ + if (invoicePlan.getPrepareRecycleDateTime() != null) { + obj.put("prepareRecycleDateTime", Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan + .getPrepareRecycleDateTime())); + } + obj.put("comfirmor", invoicePlan.getPrepareRecycleComfirmor()); + obj.put("operator", invoicePlan.getPrepareRecycleOperator()); + obj.put("items", tousseItemArray); + obj.put("serialNumber", invoicePlan.getSerialNumber()); + obj.put("applicant", invoicePlan.getApplicant()); } - obj.put("comfirmor", invoicePlan.getPrepareRecycleComfirmor()); - obj.put("operator", invoicePlan.getPrepareRecycleOperator()); - obj.put("items", tousseItemArray); - obj.put("serialNumber", invoicePlan.getSerialNumber()); - obj.put("applicant", invoicePlan.getApplicant()); UseRecord useRecord = (UseRecord) objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", tousseTransitionPlan.getUseRecordId()); if(useRecord != null){ obj.put("patientName", useRecord.getPatientName());