Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
===================================================================
diff -u -r21054 -r21070
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21054)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21070)
@@ -158,15 +158,23 @@
 			List<ExpensiveGoods> list = objectDao.findBySql(ExpensiveGoods.class.getSimpleName(), condition, start, limit, orderField);
 			if(CollectionUtils.isNotEmpty(list)){
 				for (ExpensiveGoods expensiveGoods : list) {
-					RegistrationCertification registrationCertification = (RegistrationCertification)registrationCertificationManager.getById(expensiveGoods.getCertificationId().toString());
+					RegistrationCertification registrationCertification = null;
+					//若高值耗材的注册证id不为空则根据注册证id查找对应注册证
+					if(expensiveGoods.getCertificationId()!=null){
+						registrationCertification = (RegistrationCertification)registrationCertificationManager.getById(
+								expensiveGoods.getCertificationId().toString());
+					}
 					JSONObject expensiveGoodsJsonObject = new JSONObject();
 					expensiveGoodsJsonObject.put("id", expensiveGoods.getId());
 					expensiveGoodsJsonObject.put("spelling", expensiveGoods.getSpelling());
 					expensiveGoodsJsonObject.put("name" , expensiveGoods.getName());
 					expensiveGoodsJsonObject.put("specification" , expensiveGoods.getSpecification());
 					expensiveGoodsJsonObject.put("displayName", expensiveGoods.getShowName());
-					expensiveGoodsJsonObject.put("certification", registrationCertification.getCertification());
-					expensiveGoodsJsonObject.put("validityTime", registrationCertification.getValidityTime());
+					//注册证不为空则传前台注册证号和注册证失效日期
+					if(registrationCertification!=null){
+						expensiveGoodsJsonObject.put("certification", registrationCertification.getCertification());
+						expensiveGoodsJsonObject.put("validityTime", registrationCertification.getValidityTime());
+					}
 					expensiveGoodsJsonObject.put("referencePrice", expensiveGoods.getReferencePrice());
 					data.add(expensiveGoodsJsonObject);
 				}