mmu cr change

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;

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
 

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;

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;

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());

src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java

@@ -185,6 +185,10 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene
 		commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID());
 
 		commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent());
+		if(beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) {
+			commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome());
+		}
+
 		// End
 		return commonIdentityDTO;
 	}

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());
+		if (beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null)
+			identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome());
 
 		return identityEditDTO;
 	}

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() {
 

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<BeneficiaryModel> {
 	private static final Integer DAYS_IN_YEAR = 365;
 	private static final Integer DAYS_IN_MONTH = 30;
@@ -263,7 +267,11 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	private Boolean beneficiaryConsent;
 
 	@Expose
-	private Boolean emergencyRegistration = false;
+	private String monthlyFamilyIncome;
+	@Expose
+	private Boolean emergencyRegistration=false;
+
+
 
 	public static Timestamp getTimestampData(Timestamp timestamp) {
 		return timestamp;