medication statement correction (#126)

* Abdm Facility fetch services changes

* facility save after carecontext and patientcarecontextx update

* FacilityId save in mongo db and Variable declaration correction

* Mongo carecontext save query logic changes

* ABHA Creation M1 V3 API changes

* Abha V3 changes

* removed unused code

* v3- verify auth by abdm API changes

* feat: Abdm M2 V3 changes

* feat: mongo query change fetch for linktoken

* fix: link carecontext authorization error

* feat: hiTypes addition

* feat: version change for testing

* fix: minor change for empty response

* Simplify queries in CareContextRepo interface

Removed unnecessary 'order by 1 desc' clause from queries.

* fix: corrected response format

* fix: minor logic change for care context linking

* small correction in hiType and error message modification

* modified error message

* feat: new standard FHIR bundles creation

* Fix environment variable for systemUrl

* Fix formatting of systemUrl property

* fix: taken coderabbitai comments and minor changes

* fix: changed missed variable

* fix: modified the constructor

* Change exception message for Organization resource

* Fix typo in exception message for PractitionerDataModel

* fix: corrected type error

---------

Co-authored-by: KA40094929 <KA40094929@10.152.32.202>
Co-authored-by: KA40094929 <KA40094929@APL-5CD1394ZJT>
Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com>

Author: 4 people

src/main/java/com/wipro/fhir/data/resource_model/MedicalHistoryDataModel.java

@@ -20,7 +20,7 @@ public class MedicalHistoryDataModel implements Serializable {
 
 	private BigInteger id;
 	private BigInteger beneficiaryRegID;
-	private BigInteger visitCode;
+	private String visitCode;
 	private String currentMedication;
 	private Integer currentMedYear;
 	private String yearOfIllness;
@@ -32,21 +32,41 @@ public class MedicalHistoryDataModel implements Serializable {
 	public MedicalHistoryDataModel() {
 	}
 
-	public MedicalHistoryDataModel(Object[] objArr) {
-	    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.currentMedication = objArr[3] != null ? (String) objArr[3] : null;
-	    this.currentMedYear = objArr[4] != null ? (Integer) objArr[4] : null;
-	    this.yearOfIllness = objArr[5] != null ? (String) objArr[5] : null;
-	    this.finalIllnessType = objArr[6] != null ? (String) objArr[6] : null;
-	    this.yearOfSurgery = objArr[7] != null ? (String) objArr[7] : null;
-	    this.finalSurgeryType = 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;
+	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.currentMedication = objArr[3] != null ? objArr[3].toString() : null;
+
+		        this.currentMedYear = objArr[4] != null
+		                ? Integer.parseInt(objArr[4].toString())
+		                : 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.createdDate = objArr[9] instanceof Timestamp ? (Timestamp) objArr[9] : null;
+		        this.createdBy = objArr[10] != null ? objArr[10].toString() : null;
+
+		    } catch (Exception e) {
+		    	throw new Exception("Medical statement resource model failed with error - " + e.getMessage());
+		    }
+
 	}
 
-	public List<MedicalHistoryDataModel> getMedicalList(List<Object[]> resultSetList) {
+	public List<MedicalHistoryDataModel> getMedicalList(List<Object[]> resultSetList) throws Exception {
 		MedicalHistoryDataModel medHistoryObj;
 		List<MedicalHistoryDataModel> medHistoryList = new ArrayList<MedicalHistoryDataModel>();
 		if (resultSetList != null && resultSetList.size() > 0) {

src/main/java/com/wipro/fhir/service/resource_model/MedicalHistoryResource.java

@@ -27,7 +27,7 @@ public class MedicalHistoryResource {
 	@Autowired
 	private PatientEligibleForResourceCreationRepo patientEligibleForResourceCreationRepo;
 
-	public List<MedicationStatement> getMedicalHistory(Patient patient, ResourceRequestHandler resourceRequestHandler) {
+	public List<MedicationStatement> getMedicalHistory(Patient patient, ResourceRequestHandler resourceRequestHandler) throws Exception {
 
 		List<Object[]> rsObjList = patientEligibleForResourceCreationRepo.callMedicalHistorySp(resourceRequestHandler.getVisitCode());