Skip to content

Commit 2b01db1

Browse files
helenKaryamsettyKA40094929Karyamsetty Helen Grace
authored
Added all null checks for fhir bundle code (#100)
* fix(bug): isNewAbha null issue * fix: coderabbit suggestions * fix: updated ci properties for prod * fix: updated ci properties for abdm * fix: updated fasterxml jackson dependency to fix scheduler issue * fix: updated jackson version * fix: removed versioning for jackson * fix: Update pom.xml * fix: modified jackson version for java 8 times * fix: jackson dependency version removal * fix: updated jackson properties * fix: update properties * fix: removed jackson dependency completely * fix: added hapi base and modified hapi fhir dependency * fix: added all null checks to fhir bundle * fix: missed null checks --------- Co-authored-by: KA40094929 <KA40094929@APL-5CD1394ZJT> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com>
1 parent daea650 commit 2b01db1

10 files changed

Lines changed: 126 additions & 127 deletions

‎src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,18 @@ public AllergyIntoleranceDataModel() {
6161
}
6262

6363
public AllergyIntoleranceDataModel(Object[] objArr) {
64-
this.id = BigInteger.valueOf((long) objArr[0]);
65-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
66-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
67-
this.providerServiceMapID = (Integer) objArr[3];
68-
this.vanID = (Integer) objArr[4];
69-
this.allergyStatus = (String) objArr[5];
70-
this.allergyType = (String) objArr[6];
71-
this.sctcode = (String) objArr[7];
72-
this.sctTerm = (String) objArr[8];
73-
this.createdDate = (Timestamp) objArr[9];
74-
this.createdBy = (String) objArr[10];
75-
this.allergicReactionType = (String) objArr[11];
76-
64+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
65+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
66+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
67+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
68+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
69+
this.allergyStatus = objArr[5] != null ? (String) objArr[5] : null;
70+
this.allergyType = objArr[6] != null ? (String) objArr[6] : null;
71+
this.sctcode = objArr[7] != null ? (String) objArr[7] : null;
72+
this.sctTerm = objArr[8] != null ? (String) objArr[8] : null;
73+
this.createdDate = objArr[9] != null ? (Timestamp) objArr[9] : null;
74+
this.createdBy = objArr[10] != null ? (String) objArr[10] : null;
75+
this.allergicReactionType = objArr[11] != null ? (String) objArr[11] : null;
7776
}
7877

7978
public List<AllergyIntoleranceDataModel> getAllergyList(List<Object[]> resultSetList) {

‎src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,19 @@ public AppointmentDataModel() {
6060
}
6161

6262
public AppointmentDataModel(Object[] objArr) {
63-
this.id = BigInteger.valueOf((long) objArr[0]);
64-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
65-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
66-
this.providerServiceMapID = (Integer) objArr[3];
67-
this.vanID = (Integer) objArr[4];
68-
69-
this.status = (String) objArr[5];
70-
this.requestDate = (Timestamp) objArr[6];
71-
this.userID = (Integer) objArr[7];
72-
this.sName = (String) objArr[8];
73-
this.designationID = (Integer) objArr[9];
74-
this.designationName = (String) objArr[10];
75-
76-
this.createdDate = (Timestamp) objArr[11];
77-
this.createdBy = (String) objArr[12];
63+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
64+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
65+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
66+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
67+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
68+
this.status = objArr[5] != null ? (String) objArr[5] : null;
69+
this.requestDate = objArr[6] != null ? (Timestamp) objArr[6] : null;
70+
this.userID = objArr[7] != null ? (Integer) objArr[7] : null;
71+
this.sName = objArr[8] != null ? (String) objArr[8] : null;
72+
this.designationID = objArr[9] != null ? (Integer) objArr[9] : null;
73+
this.designationName = objArr[10] != null ? (String) objArr[10] : null;
74+
this.createdDate = objArr[11] != null ? (Timestamp) objArr[11] : null;
75+
this.createdBy = objArr[12] != null ? (String) objArr[12] : null;
7876

7977
}
8078

‎src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public ConditionDiagnosisDataModel() {
5656
}
5757

5858
public ConditionDiagnosisDataModel(Object[] objArr) {
59-
this.id = BigInteger.valueOf((long) objArr[0]);
60-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
61-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
62-
this.providerServiceMapID = (Integer) objArr[3];
63-
this.vanID = (Integer) objArr[4];
64-
this.sctTerm = (String) objArr[5];
65-
this.sctcode = (String) objArr[6];
66-
this.createdDate = (Timestamp) objArr[7];
67-
this.createdBy = (String) objArr[8];
59+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
60+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
61+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
62+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
63+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
64+
this.sctTerm = objArr[5] != null ? (String) objArr[5] : null;
65+
this.sctcode = objArr[6] != null ? (String) objArr[6] : null;
66+
this.createdDate = objArr[7] != null ? (Timestamp) objArr[7] : null;
67+
this.createdBy = objArr[8] != null ? (String) objArr[8] : null;
6868

6969
}
7070

‎src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ public DiagnosticReportDataModel() {
6767
}
6868

6969
public DiagnosticReportDataModel(Object[] objArr) {
70-
this.id = BigInteger.valueOf((long) objArr[0]);
71-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
72-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
73-
this.providerServiceMapID = (Integer) objArr[3];
74-
this.vanID = (Integer) objArr[4];
75-
this.procedureID = (Integer) objArr[5];
76-
this.componentID = (Integer) objArr[6];
77-
this.procedureName = (String) objArr[7];
78-
this.testComponentName = (String) objArr[8];
79-
this.testResultValue = (String) objArr[9];
80-
this.rangeMin = (BigDecimal) objArr[10];
81-
this.rangeMax = (BigDecimal) objArr[11];
82-
this.loincCode = (String) objArr[12];
83-
this.loincValue = (String) objArr[13];
84-
this.createdDate = (Timestamp) objArr[14];
85-
this.createdBy = (String) objArr[15];
86-
this.remarks = (String) objArr[16];
87-
this.testResultUnit = (String) objArr[17];
70+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
71+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
72+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
73+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
74+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
75+
this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null;
76+
this.componentID = objArr[6] != null ? (Integer) objArr[6] : null;
77+
this.procedureName = objArr[7] != null ? (String) objArr[7] : null;
78+
this.testComponentName = objArr[8] != null ? (String) objArr[8] : null;
79+
this.testResultValue = objArr[9] != null ? (String) objArr[9] : null;
80+
this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null;
81+
this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null;
82+
this.loincCode = objArr[12] != null ? (String) objArr[12] : null;
83+
this.loincValue = objArr[13] != null ? (String) objArr[13] : null;
84+
this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null;
85+
this.createdBy = objArr[15] != null ? (String) objArr[15] : null;
86+
this.remarks = objArr[16] != null ? (String) objArr[16] : null;
87+
this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null;
8888

8989
}
9090

‎src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,16 @@ public EncounterDataModel() {
5555
}
5656

5757
public EncounterDataModel(Object[] objArr) {
58-
this.id = BigInteger.valueOf((long) objArr[0]);
59-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
60-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
61-
this.providerServiceMapID = (Integer) objArr[3];
62-
this.vanID = (Integer) objArr[4];
63-
64-
if (objArr[5] != null)
65-
this.nurseFlag = ((Short) objArr[5]).intValue();
66-
if (objArr[6] != null)
67-
this.docFlag = ((Short) objArr[6]).intValue();
68-
if (objArr[7] != null)
69-
this.specialistFlag = ((Short) objArr[7]).intValue();
70-
71-
this.createdDate = (Timestamp) objArr[8];
72-
this.createdBy = (String) objArr[9];
58+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
59+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
60+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
61+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
62+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
63+
this.nurseFlag = objArr[5] != null ? ((Number) objArr[5]).intValue() : null;
64+
this.docFlag = objArr[6] != null ? ((Number) objArr[6]).intValue() : null;
65+
this.specialistFlag = objArr[7] != null ? ((Number) objArr[7]).intValue() : null;
66+
this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null;
67+
this.createdBy = objArr[9] != null ? (String) objArr[9] : null;
7368

7469
}
7570

‎src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,16 @@ public FamilyMemberHistoryDataModel() {
5757
}
5858

5959
public FamilyMemberHistoryDataModel(Object[] objArr) {
60-
this.id = BigInteger.valueOf((long) objArr[0]);
61-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
62-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
63-
this.providerServiceMapID = (Integer) objArr[3];
64-
this.vanID = (Integer) objArr[4];
65-
this.familyMembers = (String) objArr[5];
66-
this.sctcode = (String) objArr[6];
67-
this.sctTerm = (String) objArr[7];
68-
this.createdDate = (Timestamp) objArr[8];
69-
this.createdBy = (String) objArr[9];
70-
60+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
61+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
62+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
63+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
64+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
65+
this.familyMembers = objArr[5] != null ? (String) objArr[5] : null;
66+
this.sctcode = objArr[6] != null ? (String) objArr[6] : null;
67+
this.sctTerm = objArr[7] != null ? (String) objArr[7] : null;
68+
this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null;
69+
this.createdBy = objArr[9] != null ? (String) objArr[9] : null;
7170
}
7271

7372
public List<FamilyMemberHistoryDataModel> getFamilyMemberHistoryList(List<Object[]> resultSetList) {

‎src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ public LabTestAndComponentModel() {
6767
}
6868

6969
public LabTestAndComponentModel(Object[] objArr) {
70-
this.id = BigInteger.valueOf((long) objArr[0]);
71-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
72-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
73-
this.providerServiceMapID = (Integer) objArr[3];
74-
this.vanID = (Integer) objArr[4];
75-
this.procedureID = (Integer) objArr[5];
76-
this.componentID = (Integer) objArr[6];
77-
this.procedureName = (String) objArr[7];
78-
this.testComponentName = (String) objArr[8];
79-
this.testResultValue = (String) objArr[9];
80-
this.rangeMin = (BigDecimal) objArr[10];
81-
this.rangeMax = (BigDecimal) objArr[11];
82-
this.loincCode = (String) objArr[12];
83-
this.loincValue = (String) objArr[13];
84-
this.createdDate = (Timestamp) objArr[14];
85-
this.createdBy = (String) objArr[15];
86-
this.remarks = (String) objArr[16];
87-
this.testResultUnit = (String) objArr[17];
70+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
71+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
72+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
73+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
74+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
75+
this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null;
76+
this.componentID = objArr[6] != null ? (Integer) objArr[6] : null;
77+
this.procedureName = objArr[7] != null ? (String) objArr[7] : null;
78+
this.testComponentName = objArr[8] != null ? (String) objArr[8] : null;
79+
this.testResultValue = objArr[9] != null ? (String) objArr[9] : null;
80+
this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null;
81+
this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null;
82+
this.loincCode = objArr[12] != null ? (String) objArr[12] : null;
83+
this.loincValue = objArr[13] != null ? (String) objArr[13] : null;
84+
this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null;
85+
this.createdBy = objArr[15] != null ? (String) objArr[15] : null;
86+
this.remarks = objArr[16] != null ? (String) objArr[16] : null;
87+
this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null;
8888

8989
}
9090

‎src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -79,29 +79,29 @@ public MedicationRequestDataModel() {
7979
}
8080

8181
public MedicationRequestDataModel(Object[] objArr) {
82-
this.id = BigInteger.valueOf((long) objArr[0]);
83-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]);
84-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
85-
this.providerServiceMapID = (Integer) objArr[3];
86-
this.vanID = (Integer) objArr[4];
87-
88-
this.drugForm = (String) objArr[5];
89-
this.genericDrugName = (String) objArr[6];
90-
this.drugStrength = (String) objArr[7];
91-
this.drugDose = (String) objArr[8];
92-
this.drugRoute = (String) objArr[9];
93-
this.drugFrequency = (String) objArr[10];
94-
95-
this.duration = (String) objArr[11];
96-
this.durationUnit = (String) objArr[12];
97-
98-
this.instructions = (String) objArr[13];
99-
this.qtyPrescribed = (Integer) objArr[14];
100-
101-
this.snomedCTCodeDrug = (String) objArr[15];
102-
this.snomedCTTermDrug = (String) objArr[16];
103-
this.createdDate = (Timestamp) objArr[17];
104-
this.createdBy = (String) objArr[18];
82+
this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null;
83+
this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null;
84+
this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null;
85+
this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null;
86+
this.vanID = objArr[4] != null ? (Integer) objArr[4] : null;
87+
88+
this.drugForm = objArr[5] != null ? (String) objArr[5] : null;
89+
this.genericDrugName = objArr[6] != null ? (String) objArr[6] : null;
90+
this.drugStrength = objArr[7] != null ? (String) objArr[7] : null;
91+
this.drugDose = objArr[8] != null ? (String) objArr[8] : null;
92+
this.drugRoute = objArr[9] != null ? (String) objArr[9] : null;
93+
this.drugFrequency = objArr[10] != null ? (String) objArr[10] : null;
94+
95+
this.duration = objArr[11] != null ? (String) objArr[11] : null;
96+
this.durationUnit = objArr[12] != null ? (String) objArr[12] : null;
97+
98+
this.instructions = objArr[13] != null ? (String) objArr[13] : null;
99+
this.qtyPrescribed = objArr[14] != null ? (Integer) objArr[14] : null;
100+
101+
this.snomedCTCodeDrug = objArr[15] != null ? (String) objArr[15] : null;
102+
this.snomedCTTermDrug = objArr[16] != null ? (String) objArr[16] : null;
103+
this.createdDate = objArr[17] != null ? (Timestamp) objArr[17] : null;
104+
this.createdBy = objArr[18] != null ? (String) objArr[18] : null;
105105

106106
}
107107

‎src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ public VitalsAnthropometryModel() {
6161

6262
public VitalsAnthropometryModel(Object[] objArr) {
6363

64-
this.beneficiaryRegID = BigInteger.valueOf((long) objArr[0]);
65-
this.providerServiceMapID = (Integer) objArr[1];
66-
this.visitCode = BigInteger.valueOf((long) objArr[2]);
64+
if (objArr[0] != null)
65+
this.beneficiaryRegID = BigInteger.valueOf(((Number) objArr[0]).longValue());
66+
if (objArr[1] != null)
67+
this.providerServiceMapID = (Integer) objArr[1];
68+
if (objArr[2] != null)
69+
this.visitCode = BigInteger.valueOf((long) objArr[2]);
6770
if (objArr[3] != null)
6871
this.Temperature = (BigDecimal) objArr[3];
6972
if (objArr[4] != null)
@@ -87,8 +90,10 @@ public VitalsAnthropometryModel(Object[] objArr) {
8790
this.height_cm = (BigDecimal) objArr[15];
8891
if (objArr[16] != null)
8992
this.BMI = (BigDecimal) objArr[16];
90-
this.createdDate = (Timestamp) objArr[17];
91-
this.createdBy = (String) objArr[18];
93+
if (objArr[16] != null)
94+
this.createdDate = (Timestamp) objArr[17];
95+
if (objArr[16] != null)
96+
this.createdBy = (String) objArr[18];
9297

9398
}
9499

‎src/main/java/com/wipro/fhir/data/users/User.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.io.Serializable;
44

5+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
6+
57
import jakarta.persistence.Column;
68
import jakarta.persistence.Entity;
79
import jakarta.persistence.GeneratedValue;
@@ -13,6 +15,7 @@
1315
@Entity
1416
@Table(name = "m_user")
1517
@Data
18+
@JsonIgnoreProperties(ignoreUnknown = true)
1619
public class User implements Serializable {
1720
@Id
1821
@GeneratedValue(strategy = GenerationType.IDENTITY)

0 commit comments

Comments
 (0)