From d09380bde8fa8eb701810ee4c2131e3df7ad2e04 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Tue, 11 Jul 2023 21:51:48 +0530 Subject: [PATCH 1/5] mmu cr changes --- .../com/iemr/common/dto/identity/BeneficiariesDTO.java | 1 + .../com/iemr/common/dto/identity/CommonIdentityDTO.java | 1 + .../java/com/iemr/common/dto/identity/IdentityEditDTO.java | 1 + .../iemr/common/mapper/CommonIdentityMapperDecorator.java | 1 + .../iemr/common/mapper/IdentityBenEditMapperDecorator.java | 2 ++ .../model/beneficiary/BeneficiaryDemographicsModel.java | 4 ++++ .../iemr/common/model/beneficiary/BeneficiaryModel.java | 7 +++++++ 7 files changed, 17 insertions(+) diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java index 31ea41f3..02d63161 100644 --- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java @@ -74,6 +74,7 @@ public class BeneficiariesDTO { private String incomeStatus; private BigInteger religionId; private String religion; + private String monthlyFamilyIncome; // End Outreach diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index b29aa0b4..c9d63448 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -88,6 +88,7 @@ public class CommonIdentityDTO { private Integer titleId; private String title; private Integer zoneId; + private String monthlyFamilyIncome; // address private Address currentAddress; 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 7b8ee7e8..3522cbba 100644 --- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java @@ -104,6 +104,7 @@ public class IdentityEditDTO { private String religion; private Integer religionId; private String placeOfWork; + private String monthlyFamilyIncome; // family details private Boolean changeInFamilyDetails = false; diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index f9b5737d..b4534e96 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,6 +185,7 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); + commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); // End return commonIdentityDTO; } diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java index 43ebc4aa..d6f69fe4 100644 --- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java @@ -238,6 +238,8 @@ public IdentityEditDTO BenToIdentityEditMapper(BeneficiaryModel beneficiary) { identityEditDTO.setVanID(beneficiary.getVanID()); if (beneficiary.getParkingPlaceID() != null) identityEditDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); + + identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); return identityEditDTO; } diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java index 7346607e..83450844 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java @@ -33,9 +33,11 @@ import com.iemr.common.model.userbeneficiary.ReligionModel; import com.iemr.common.model.userbeneficiary.StateModel; +import lombok.AllArgsConstructor; import lombok.Data; @Data +@AllArgsConstructor public class BeneficiaryDemographicsModel { @Expose private Long benDemographicsID; @@ -177,6 +179,8 @@ public class BeneficiaryDemographicsModel { private String incomeStatus; @Expose private String religion; + @Expose + private String monthlyFamilyIncome; public BeneficiaryDemographicsModel() { 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 809eeaf9..1da661ba 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -41,9 +41,13 @@ import com.iemr.common.model.userbeneficiary.SexualOrientationModel; import com.iemr.common.model.userbeneficiary.StatusModel; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor +@AllArgsConstructor public class BeneficiaryModel implements Comparable { private static final Integer DAYS_IN_YEAR = 365; private static final Integer DAYS_IN_MONTH = 30; @@ -261,6 +265,9 @@ public class BeneficiaryModel implements Comparable { @Expose private Boolean beneficiaryConsent; + + @Expose + private String monthlyFamilyIncome; public static Timestamp getTimestampData(Timestamp timestamp) { return timestamp; From 51008999e15b8527efcd4674f4ee3ebd52bd3585 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 18:09:02 +0530 Subject: [PATCH 2/5] mmu cr changes for registration, quick search and update api --- .../java/com/iemr/common/dto/identity/BenDetailDTO.java | 1 + .../common/mapper/BenCompleteDetailMapperDecorator.java | 3 +++ .../iemr/common/mapper/CommonIdentityMapperDecorator.java | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java index d27e22ff..ad55f7b3 100644 --- a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java @@ -75,6 +75,7 @@ public class BenDetailDTO implements Serializable { private Short healthCareWorkerId; private String isHIVPositive; private Integer beneficiaryAge; + private String monthlyFamilyIncome; private Long houseHoldID; private String guideLineID; diff --git a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java index af328e07..a9d7f947 100644 --- a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java @@ -135,6 +135,9 @@ public BeneficiaryDemographicsModel createBenDemographicsModel(BeneficiariesDTO demographicsModel.setIncomeStatusName(benDetails.getIncomeStatus()); demographicsModel.setIncomeStatus(benDetails.getIncomeStatus()); } + if (benDetails.getMonthlyFamilyIncome() != null) { + demographicsModel.setMonthlyFamilyIncome(benDetails.getMonthlyFamilyIncome()); + } demographicsModel.setCreatedBy(createdBy); demographicsModel.setPinCode(address.getPinCode()); demographicsModel.setAddressLine1(address.getAddrLine1()); diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index b4534e96..925d2cae 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,7 +185,11 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); - commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + String monthlyFamilyIncome = beneficiary.getI_bendemographics().getMonthlyFamilyIncome(); + if(monthlyFamilyIncome != null) { + commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + } + // End return commonIdentityDTO; } From 9501d672dd89e4569f3898833caa91e354d52d23 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 19:16:39 +0530 Subject: [PATCH 3/5] changes mmu cr --- .../java/com/iemr/common/dto/identity/CommonIdentityDTO.java | 2 +- .../com/iemr/common/model/beneficiary/BeneficiaryModel.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index 52d63649..c9d63448 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -58,7 +58,7 @@ public class CommonIdentityDTO { private Integer ageAtMarriage; private Integer educationId; private String education; - private Boolean emergencyRegistration = false; + private Boolean emergencyRegistration; private Integer healthCareWorkerId; private String healthCareWorker; private String fatherName; 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 7fbcb32a..c8ee1dc9 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -269,8 +269,9 @@ public class BeneficiaryModel implements Comparable { @Expose private String monthlyFamilyIncome; @Expose - private Boolean emergencyRegistration = false; - + private Boolean emergencyRegistration=false; + + public static Timestamp getTimestampData(Timestamp timestamp) { return timestamp; From d989c45ade5df687c3803fc9484cffb6dfb3b6bb Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 19:50:11 +0530 Subject: [PATCH 4/5] changes mmu cr --- .../java/com/iemr/common/dto/identity/CommonIdentityDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java index c9d63448..52d63649 100644 --- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java @@ -58,7 +58,7 @@ public class CommonIdentityDTO { private Integer ageAtMarriage; private Integer educationId; private String education; - private Boolean emergencyRegistration; + private Boolean emergencyRegistration = false; private Integer healthCareWorkerId; private String healthCareWorker; private String fatherName; From fee3e6e498ae7ca45c29286563ea1ae1422893b0 Mon Sep 17 00:00:00 2001 From: Indrani Bandyopadhyay Date: Fri, 14 Jul 2023 20:03:17 +0530 Subject: [PATCH 5/5] changes mmu cr --- .../com/iemr/common/mapper/CommonIdentityMapperDecorator.java | 3 +-- .../iemr/common/mapper/IdentityBenEditMapperDecorator.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java index 925d2cae..2a1ed05b 100644 --- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java @@ -185,8 +185,7 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent()); - String monthlyFamilyIncome = beneficiary.getI_bendemographics().getMonthlyFamilyIncome(); - if(monthlyFamilyIncome != null) { + if(beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) { commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); } diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java index d6f69fe4..010fbb28 100644 --- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java +++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java @@ -238,8 +238,8 @@ public IdentityEditDTO BenToIdentityEditMapper(BeneficiaryModel beneficiary) { identityEditDTO.setVanID(beneficiary.getVanID()); if (beneficiary.getParkingPlaceID() != null) identityEditDTO.setParkingPlaceId(beneficiary.getParkingPlaceID()); - - identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); + if (beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) + identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome()); return identityEditDTO; }