diff --git a/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java index bc520ff..245b90e 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java @@ -61,19 +61,18 @@ public AllergyIntoleranceDataModel() { } public AllergyIntoleranceDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.allergyStatus = (String) objArr[5]; - this.allergyType = (String) objArr[6]; - this.sctcode = (String) objArr[7]; - this.sctTerm = (String) objArr[8]; - this.createdDate = (Timestamp) objArr[9]; - this.createdBy = (String) objArr[10]; - this.allergicReactionType = (String) objArr[11]; - + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.allergyStatus = objArr[5] != null ? (String) objArr[5] : null; + this.allergyType = objArr[6] != null ? (String) objArr[6] : null; + this.sctcode = objArr[7] != null ? (String) objArr[7] : null; + this.sctTerm = objArr[8] != null ? (String) objArr[8] : null; + this.createdDate = objArr[9] != null ? (Timestamp) objArr[9] : null; + this.createdBy = objArr[10] != null ? (String) objArr[10] : null; + this.allergicReactionType = objArr[11] != null ? (String) objArr[11] : null; } public List getAllergyList(List resultSetList) { diff --git a/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java index 45ebabf..84ca4fe 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java @@ -60,21 +60,19 @@ public AppointmentDataModel() { } public AppointmentDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - this.status = (String) objArr[5]; - this.requestDate = (Timestamp) objArr[6]; - this.userID = (Integer) objArr[7]; - this.sName = (String) objArr[8]; - this.designationID = (Integer) objArr[9]; - this.designationName = (String) objArr[10]; - - this.createdDate = (Timestamp) objArr[11]; - this.createdBy = (String) objArr[12]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.status = objArr[5] != null ? (String) objArr[5] : null; + this.requestDate = objArr[6] != null ? (Timestamp) objArr[6] : null; + this.userID = objArr[7] != null ? (Integer) objArr[7] : null; + this.sName = objArr[8] != null ? (String) objArr[8] : null; + this.designationID = objArr[9] != null ? (Integer) objArr[9] : null; + this.designationName = objArr[10] != null ? (String) objArr[10] : null; + this.createdDate = objArr[11] != null ? (Timestamp) objArr[11] : null; + this.createdBy = objArr[12] != null ? (String) objArr[12] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java index 74c6c3b..8218599 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java @@ -56,15 +56,15 @@ public ConditionDiagnosisDataModel() { } public ConditionDiagnosisDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.sctTerm = (String) objArr[5]; - this.sctcode = (String) objArr[6]; - this.createdDate = (Timestamp) objArr[7]; - this.createdBy = (String) objArr[8]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.sctTerm = objArr[5] != null ? (String) objArr[5] : null; + this.sctcode = objArr[6] != null ? (String) objArr[6] : null; + this.createdDate = objArr[7] != null ? (Timestamp) objArr[7] : null; + this.createdBy = objArr[8] != null ? (String) objArr[8] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java index 9acae30..989e2a3 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java @@ -67,24 +67,24 @@ public DiagnosticReportDataModel() { } public DiagnosticReportDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.procedureID = (Integer) objArr[5]; - this.componentID = (Integer) objArr[6]; - this.procedureName = (String) objArr[7]; - this.testComponentName = (String) objArr[8]; - this.testResultValue = (String) objArr[9]; - this.rangeMin = (BigDecimal) objArr[10]; - this.rangeMax = (BigDecimal) objArr[11]; - this.loincCode = (String) objArr[12]; - this.loincValue = (String) objArr[13]; - this.createdDate = (Timestamp) objArr[14]; - this.createdBy = (String) objArr[15]; - this.remarks = (String) objArr[16]; - this.testResultUnit = (String) objArr[17]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null; + this.componentID = objArr[6] != null ? (Integer) objArr[6] : null; + this.procedureName = objArr[7] != null ? (String) objArr[7] : null; + this.testComponentName = objArr[8] != null ? (String) objArr[8] : null; + this.testResultValue = objArr[9] != null ? (String) objArr[9] : null; + this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null; + this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null; + this.loincCode = objArr[12] != null ? (String) objArr[12] : null; + this.loincValue = objArr[13] != null ? (String) objArr[13] : null; + this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null; + this.createdBy = objArr[15] != null ? (String) objArr[15] : null; + this.remarks = objArr[16] != null ? (String) objArr[16] : null; + this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java index cc2385b..4a4ead1 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java @@ -55,21 +55,16 @@ public EncounterDataModel() { } public EncounterDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - if (objArr[5] != null) - this.nurseFlag = ((Short) objArr[5]).intValue(); - if (objArr[6] != null) - this.docFlag = ((Short) objArr[6]).intValue(); - if (objArr[7] != null) - this.specialistFlag = ((Short) objArr[7]).intValue(); - - this.createdDate = (Timestamp) objArr[8]; - this.createdBy = (String) objArr[9]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.nurseFlag = objArr[5] != null ? ((Number) objArr[5]).intValue() : null; + this.docFlag = objArr[6] != null ? ((Number) objArr[6]).intValue() : null; + this.specialistFlag = objArr[7] != null ? ((Number) objArr[7]).intValue() : null; + this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null; + this.createdBy = objArr[9] != null ? (String) objArr[9] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java index 4c74e3b..38e0af1 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java @@ -57,17 +57,16 @@ public FamilyMemberHistoryDataModel() { } public FamilyMemberHistoryDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.familyMembers = (String) objArr[5]; - this.sctcode = (String) objArr[6]; - this.sctTerm = (String) objArr[7]; - this.createdDate = (Timestamp) objArr[8]; - this.createdBy = (String) objArr[9]; - + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.familyMembers = objArr[5] != null ? (String) objArr[5] : null; + this.sctcode = objArr[6] != null ? (String) objArr[6] : null; + this.sctTerm = objArr[7] != null ? (String) objArr[7] : null; + this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null; + this.createdBy = objArr[9] != null ? (String) objArr[9] : null; } public List getFamilyMemberHistoryList(List resultSetList) { diff --git a/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java b/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java index 5d4066a..ddd42a7 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java @@ -67,24 +67,24 @@ public LabTestAndComponentModel() { } public LabTestAndComponentModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.procedureID = (Integer) objArr[5]; - this.componentID = (Integer) objArr[6]; - this.procedureName = (String) objArr[7]; - this.testComponentName = (String) objArr[8]; - this.testResultValue = (String) objArr[9]; - this.rangeMin = (BigDecimal) objArr[10]; - this.rangeMax = (BigDecimal) objArr[11]; - this.loincCode = (String) objArr[12]; - this.loincValue = (String) objArr[13]; - this.createdDate = (Timestamp) objArr[14]; - this.createdBy = (String) objArr[15]; - this.remarks = (String) objArr[16]; - this.testResultUnit = (String) objArr[17]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null; + this.componentID = objArr[6] != null ? (Integer) objArr[6] : null; + this.procedureName = objArr[7] != null ? (String) objArr[7] : null; + this.testComponentName = objArr[8] != null ? (String) objArr[8] : null; + this.testResultValue = objArr[9] != null ? (String) objArr[9] : null; + this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null; + this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null; + this.loincCode = objArr[12] != null ? (String) objArr[12] : null; + this.loincValue = objArr[13] != null ? (String) objArr[13] : null; + this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null; + this.createdBy = objArr[15] != null ? (String) objArr[15] : null; + this.remarks = objArr[16] != null ? (String) objArr[16] : null; + this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java index 401be24..3dbfdd5 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java @@ -79,29 +79,29 @@ public MedicationRequestDataModel() { } public MedicationRequestDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - this.drugForm = (String) objArr[5]; - this.genericDrugName = (String) objArr[6]; - this.drugStrength = (String) objArr[7]; - this.drugDose = (String) objArr[8]; - this.drugRoute = (String) objArr[9]; - this.drugFrequency = (String) objArr[10]; - - this.duration = (String) objArr[11]; - this.durationUnit = (String) objArr[12]; - - this.instructions = (String) objArr[13]; - this.qtyPrescribed = (Integer) objArr[14]; - - this.snomedCTCodeDrug = (String) objArr[15]; - this.snomedCTTermDrug = (String) objArr[16]; - this.createdDate = (Timestamp) objArr[17]; - this.createdBy = (String) objArr[18]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + + this.drugForm = objArr[5] != null ? (String) objArr[5] : null; + this.genericDrugName = objArr[6] != null ? (String) objArr[6] : null; + this.drugStrength = objArr[7] != null ? (String) objArr[7] : null; + this.drugDose = objArr[8] != null ? (String) objArr[8] : null; + this.drugRoute = objArr[9] != null ? (String) objArr[9] : null; + this.drugFrequency = objArr[10] != null ? (String) objArr[10] : null; + + this.duration = objArr[11] != null ? (String) objArr[11] : null; + this.durationUnit = objArr[12] != null ? (String) objArr[12] : null; + + this.instructions = objArr[13] != null ? (String) objArr[13] : null; + this.qtyPrescribed = objArr[14] != null ? (Integer) objArr[14] : null; + + this.snomedCTCodeDrug = objArr[15] != null ? (String) objArr[15] : null; + this.snomedCTTermDrug = objArr[16] != null ? (String) objArr[16] : null; + this.createdDate = objArr[17] != null ? (Timestamp) objArr[17] : null; + this.createdBy = objArr[18] != null ? (String) objArr[18] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java index 01dc0a5..f477aef 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java @@ -61,9 +61,12 @@ public VitalsAnthropometryModel() { public VitalsAnthropometryModel(Object[] objArr) { - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[0]); - this.providerServiceMapID = (Integer) objArr[1]; - this.visitCode = BigInteger.valueOf((long) objArr[2]); + if (objArr[0] != null) + this.beneficiaryRegID = BigInteger.valueOf(((Number) objArr[0]).longValue()); + if (objArr[1] != null) + this.providerServiceMapID = (Integer) objArr[1]; + if (objArr[2] != null) + this.visitCode = BigInteger.valueOf((long) objArr[2]); if (objArr[3] != null) this.Temperature = (BigDecimal) objArr[3]; if (objArr[4] != null) @@ -87,8 +90,10 @@ public VitalsAnthropometryModel(Object[] objArr) { this.height_cm = (BigDecimal) objArr[15]; if (objArr[16] != null) this.BMI = (BigDecimal) objArr[16]; - this.createdDate = (Timestamp) objArr[17]; - this.createdBy = (String) objArr[18]; + if (objArr[16] != null) + this.createdDate = (Timestamp) objArr[17]; + if (objArr[16] != null) + this.createdBy = (String) objArr[18]; } diff --git a/src/main/java/com/wipro/fhir/data/users/User.java b/src/main/java/com/wipro/fhir/data/users/User.java index d8b613a..c31049e 100644 --- a/src/main/java/com/wipro/fhir/data/users/User.java +++ b/src/main/java/com/wipro/fhir/data/users/User.java @@ -2,6 +2,8 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -13,6 +15,7 @@ @Entity @Table(name = "m_user") @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class User implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY)