Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/adverseeventrecord/service/AdverseEventRecordManagerImpl.java
===================================================================
diff -u -r32965 -r32977
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/adverseeventrecord/service/AdverseEventRecordManagerImpl.java	(.../AdverseEventRecordManagerImpl.java)	(revision 32965)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/adverseeventrecord/service/AdverseEventRecordManagerImpl.java	(.../AdverseEventRecordManagerImpl.java)	(revision 32977)
@@ -88,7 +88,7 @@
 	@Override
 	public void saveAdverseEventRecord(InvoicePlan invoicePlan,
 			String eventCode, String eventName, String timeoutHandType) {
-		if(invoicePlan != null && objectDao.countBySql("select count(*) from " + AdverseEventRecord.class.getSimpleName() + " where recyclingApplication_ID="+ invoicePlan.getId()) == 0){
+		if(invoicePlan != null && objectDao.countBySql("select count(*) from " + AdverseEventRecord.class.getSimpleName() + " where eventCode='"+ eventCode +"' and recyclingApplication_ID="+ invoicePlan.getId()) == 0){
 			AdverseEventRecord adverseEventRecord = new AdverseEventRecord();
 			adverseEventRecord.setEventCode(eventCode);
 			adverseEventRecord.setEventName(eventName);