Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java =================================================================== diff -u -r29054 -r29083 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 29054) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java (.../TousseTransitionPlanManagerImpl.java) (revision 29083) @@ -302,18 +302,20 @@ obj.put("prepareRecycleDateTime", Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan .getPrepareRecycleDateTime())); } - UseRecord useRecord = (UseRecord) objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", tousseTransitionPlan.getUseRecordId()); - - obj.put("applicationTime", tousseTransitionPlan.getCreateTime()); - obj.put("patientName", useRecord.getPatientName()); - obj.put("operationRoom", useRecord.getOperationRoom()); - obj.put("hospitalNum", useRecord.getHospitalNum()); - obj.put("treatmentNum",useRecord.getTreatmentNum()); 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()); + obj.put("operationRoom", useRecord.getOperationRoom()); + obj.put("hospitalNum", useRecord.getHospitalNum()); + obj.put("treatmentNum",useRecord.getTreatmentNum()); + } + + obj.put("applicationTime", tousseTransitionPlan.getCreateTime()); obj.put("depart", tousseTransitionPlan.getDepart()); } return obj;