work on child vaccine encounter both way sync

opensrp-mcare-register/src/main/java/org/opensrp/register/encounter/sync/FeedHandler.java

@@ -47,10 +47,10 @@ public FeedHandler(AllMembers allMembers,AllFormSubmissions formSubmissions){
 		this.formSubmissions = formSubmissions;
 	}
 	@SuppressWarnings("unchecked")
-	public FormSubmission getEvent(JSONObject encounter,String patientEntityId,Members member){		
+	public void getEvent(JSONObject encounter,String patientEntityId,Members member){		
 		try {					
-			JSONArray observations = encounter.getJSONArray("obs");			
-			for (int i = 0; i < observations.length(); i++) {
+			JSONArray observations = encounter.getJSONArray("obs");				
+			for (int i = 0; i < observations.length(); i++) {				
 				JSONObject o = observations.getJSONObject(i);
 				String vaccines = (String) o.get("display");
 				String vaccineStringAfterFilter = this.StringFilter(vaccines);					
@@ -65,15 +65,15 @@ public FormSubmission getEvent(JSONObject encounter,String patientEntityId,Membe
 					FormSubmission formsubmissionEntity= womanVaccine.makeForm(this.formDirectory,vaccineDate,vaccineDoseAsInt,patientEntityId, member,vaccineName);
 					if(formsubmissionEntity !=null){
 						formSubmissions.add(formsubmissionEntity);
-						return formsubmissionEntity;
+
 					}
 				}else{
 					FormsType<ChildVaccineFollowup> childVaccine= FormFatcory.getFormsTypeInstance("CVF");
 					FormSubmission formsubmissionEntity= childVaccine.makeForm(this.formDirectory,vaccineDate,vaccineDoseAsInt,patientEntityId, member,vaccineName);
-					/*if(formsubmissionEntity !=null){
+					if(formsubmissionEntity !=null){
 						formSubmissions.add(formsubmissionEntity);
-						return formsubmissionEntity;
-					}*/
+						//return formsubmissionEntity;
+					}
 				}					
 			}			
 
@@ -83,7 +83,7 @@ public FormSubmission getEvent(JSONObject encounter,String patientEntityId,Membe
 			logger.info(ee.getMessage());
 		}
 
-		return null;
+
 	}
 
 
@@ -112,10 +112,11 @@ private String getVaccinationName(String str){
 			try{				
 				String[] vaccine = value.trim().split(" ");				
 				if(SyncConstant.getChildVaccinesName().contains(vaccine[0])){
+					System.err.println("fdfdf"+vaccine[0]);
 					return vaccine[0];
 				}
 			}catch(Exception e ){
-
+				e.printStackTrace();
 			}
 		}
 		return null;

opensrp-mcare-register/src/main/java/org/opensrp/register/encounter/sync/SyncConstant.java

@@ -163,10 +163,10 @@ public class SyncConstant {
 
 	public final static List<String> getChildVaccinesName(){		
 		 List<String> childVaccines = new ArrayList<>();
-		 childVaccines.add("OPV");
+		 childVaccines.add("BCG");
 		 childVaccines.add("Pentavalent");
 		 childVaccines.add("PCV");
-		 childVaccines.add("BCG");
+		 childVaccines.add("OPV");
 		 childVaccines.add("IPV");
 		return childVaccines;