Skip to content

update api changes #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2023
Merged

update api changes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf5b954
update api changes
Aug 3, 2023
2d0415b
abandon summary pojo changes
Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/
package com.iemr.common.data.nhm_dashboard;

import java.math.BigInteger;
import java.sql.Timestamp;

import javax.persistence.Column;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
@Expose
private String monthlyFamilyIncome;
@Expose
private Boolean emergencyRegistration=false;
private boolean emergencyRegistration;



Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down