diff --git a/src/main/java/com/wipro/fhir/data/resource_model/MedicalHistoryDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/MedicalHistoryDataModel.java
index 92f22ed..dc1aba7 100644
--- a/src/main/java/com/wipro/fhir/data/resource_model/MedicalHistoryDataModel.java
+++ b/src/main/java/com/wipro/fhir/data/resource_model/MedicalHistoryDataModel.java
@@ -19,49 +19,31 @@ public class MedicalHistoryDataModel implements Serializable {
 
 
 	private BigInteger id;
-	private BigInteger beneficiaryRegID;
-	private String visitCode;
+	private BigInteger providerServiceMapID;
 	private String currentMedication;
-	private Integer currentMedYear;
-	private String yearOfIllness;
-	private String finalIllnessType;
-	private String yearOfSurgery;
-	private String finalSurgeryType;
-	private Timestamp createdDate;
+	private Timestamp currentMedYear;
 	private String createdBy;
+	private Timestamp createdDate;
 	public MedicalHistoryDataModel() {
 	}
 	
 	public MedicalHistoryDataModel(Object[] objArr) throws Exception {
 		    try {
 
-		        this.id = objArr[0] != null
-		                ? BigInteger.valueOf(Long.parseLong(objArr[0].toString()))
-		                : null;
-
-		        this.beneficiaryRegID = objArr[1] != null
-		                ? BigInteger.valueOf(Long.parseLong(objArr[1].toString()))
-		                : null;
-
-		        // visitCode is STRING only
-		        this.visitCode = objArr[2] != null ? objArr[2].toString() : null;
+		        this.id = objArr[0] != null ? BigInteger.valueOf(Long.parseLong(objArr[0].toString())) : null;
+		        
+		        this.providerServiceMapID = objArr[1] != null ? BigInteger.valueOf(Long.parseLong(objArr[1].toString())) : null;
 
-		        this.currentMedication = objArr[3] != null ? objArr[3].toString() : null;
+		        this.currentMedication = objArr[2] != null ? objArr[2].toString() : null;
 
-		        this.currentMedYear = objArr[4] != null
-		                ? Integer.parseInt(objArr[4].toString())
-		                : null;
+		        this.currentMedYear = objArr[3] instanceof Timestamp ? (Timestamp) objArr[3] : null;
 
-		        this.yearOfIllness = objArr[5] != null ? objArr[5].toString() : null;
-		        this.finalIllnessType = objArr[6] != null ? objArr[6].toString() : null;
-		        this.yearOfSurgery = objArr[7] != null ? objArr[7].toString() : null;
-		        this.finalSurgeryType = objArr[8] != null ? objArr[8].toString() : null;
+		        this.createdBy = objArr[4] != null ? objArr[4].toString() : null;
 
-		        this.createdDate = objArr[9] instanceof Timestamp ? (Timestamp) objArr[9] : null;
-		        this.createdBy = objArr[10] != null ? objArr[10].toString() : null;
+		        this.createdDate = objArr[5] instanceof Timestamp ? (Timestamp) objArr[5] : null;
 
 		    } catch (Exception e) {
-		    	throw new Exception("Medical statement resource model failed with error - " + e.getMessage());
+		    	throw new Exception("Medical History resource model failed with error - " + e.getMessage());
 		    }
 
 	}
diff --git a/src/main/java/com/wipro/fhir/repo/common/PatientEligibleForResourceCreationRepo.java b/src/main/java/com/wipro/fhir/repo/common/PatientEligibleForResourceCreationRepo.java
index 69480a5..17cbc85 100644
--- a/src/main/java/com/wipro/fhir/repo/common/PatientEligibleForResourceCreationRepo.java
+++ b/src/main/java/com/wipro/fhir/repo/common/PatientEligibleForResourceCreationRepo.java
@@ -121,8 +121,7 @@ List<Object[]> callMedicationRequestSP(@Param("beneficiaryRegID_IN") BigInteger
 	List<Object[]> callMedicalHistorySp(@Param("visitCode_IN") BigInteger visitCode_IN);
 	
 	//Immunization record
-	@Query(nativeQuery = true, value = "CALL db_iemr.FHIR_R_Immunization(:beneficiaryRegID_IN, :visitCode_IN, @0, "
-			+ "@1, @2, @3, @4, @5, @6, @7, @8, @9, @10, @11, @12)")
+	@Query(nativeQuery = true, value = "CALL db_iemr.FHIR_R_Immunization(:beneficiaryRegID_IN, :visitCode_IN)")
 	List<Object[]> callImmunizationSP(@Param("beneficiaryRegID_IN") BigInteger beneficiaryRegID_IN, @Param("visitCode_IN") BigInteger visitCode_IN);
 
 	@Query(nativeQuery = true, value = "CALL db_iemr.FHIR_R_OrganizationDetails(:visitCode_IN)")