From bf5b9549e782ef2652f2a1a04a4f75081d02ebb8 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Thu, 3 Aug 2023 16:51:03 +0530 Subject: [PATCH 1/2] update api changes --- src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java | 2 ++ .../com/iemr/common/model/beneficiary/BeneficiaryModel.java | 2 +- .../service/beneficiary/RegisterBenificiaryServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java index 3522cbba..7a533df7 100644 --- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java @@ -162,6 +162,8 @@ public class IdentityEditDTO { private Integer vanID; @Expose private Integer parkingPlaceId; + // END OF new column added for data sync + private boolean emergencyRegistration; } diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java index c8ee1dc9..ed0980a6 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -269,7 +269,7 @@ public class BeneficiaryModel implements Comparable { @Expose private String monthlyFamilyIncome; @Expose - private Boolean emergencyRegistration=false; + private boolean emergencyRegistration; diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 8441b35e..791bc51a 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -138,7 +138,7 @@ public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servlet // logger.info("benificiaryDetails: " + beneficiaryModel); CommonIdentityDTO identityDTO = identityMapper.beneficiaryModelCommonIdentityDTO(beneficiaryModel); - identityDTO.setEmergencyRegistration(beneficiaryModel.getEmergencyRegistration()); + identityDTO.setEmergencyRegistration(beneficiaryModel.isEmergencyRegistration()); identityDTO .setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps())); String request = InputMapper.getInstance().gson().toJson(identityDTO).toString(); From 2d0415baf91785d98fd8705802174772bdcc5ebc Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Thu, 3 Aug 2023 17:49:25 +0530 Subject: [PATCH 2/2] abandon summary pojo changes --- .../com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java b/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java index 1cb84ccd..ec780476 100644 --- a/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java +++ b/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java @@ -21,6 +21,7 @@ */ package com.iemr.common.data.nhm_dashboard; +import java.math.BigInteger; import java.sql.Timestamp; import javax.persistence.Column; @@ -58,7 +59,7 @@ public class AbandonCallSummary { private Integer queueTime; @Expose @Column(name = "DIDNumber") - private Integer didNumber; + private BigInteger didNumber; @Expose @Column(name = "Skills") private String skills;