Skip to content

Multiple beneficiaries sync issue #31

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
ravishanigarapu merged 2 commits into from
Sep 12, 2023
Merged

Multiple beneficiaries sync issue #31

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
e380492
Multiple beneficiaries sync issue changes for FLW
Sep 12, 2023
4ed0514
Merge branch 'develop' of https://github.com/devikasuresh20/Identity-…
Sep 12, 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
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class RMNCHBornBirthDetails {

@Expose
@Column(name = "beneficiaryId")
private Integer beneficiaryId;
private Long benficieryid;

@Expose
@Column(name = "countryid")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public class RMNCHCBACdetails {

@Expose
@Column(name = "beneficiaryId")
private Integer beneficiaryid;
private Long benficieryid;

// new fields, 16-09-2021
@Expose
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,12 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
List<RMNCHBeneficiaryDetailsRmnch> benDetailsExtraList = Arrays.asList(objArr);

if (benDetailsExtraList != null && benDetailsExtraList.size() > 0) {
benRegID = rMNCHMBenRegIdMapRepo.getRegID(benDetailsExtraList.get(0).getBenficieryid());

if (benRegID != null) {
// benRegID = rMNCHMBenRegIdMapRepo.getRegID(benDetailsExtraList.get(0).getBenficieryid());
//
// if (benRegID != null) {

for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
obj.setBenRegId(benRegID);
RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegID);
Expand All @@ -164,22 +166,24 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
}
obj.setRelatedBeneficiaryIdsDB(sb.toString());
}


}

benDetailsExtraList = (ArrayList<RMNCHBeneficiaryDetailsRmnch>) rMNCHBeneficiaryDetailsRmnchRepo
.save(benDetailsExtraList);

benDetailsExtraList.forEach((n) -> beneficiaryDetailsIds.add(n.getId()));
} else
throw new Exception("invalid/empty beneficiary request data.");
// } else
// throw new Exception("invalid/empty beneficiary request data.");

// born birth details
if (jsnOBJ != null && jsnOBJ.has("bornBirthDeatils") && benRegID != null) {
if (jsnOBJ != null && jsnOBJ.has("bornBirthDeatils")) {
RMNCHBornBirthDetails[] objArr1 = InputMapper.gson()
.fromJson(jsnOBJ.get("bornBirthDeatils"), RMNCHBornBirthDetails[].class);
List<RMNCHBornBirthDetails> bornBirthList = Arrays.asList(objArr1);
for (RMNCHBornBirthDetails obj : bornBirthList) {
benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
obj.setBenRegId(benRegID);
RMNCHBornBirthDetails temp = rMNCHBornBirthDetailsRepo.getByRegID(benRegID);
if (temp != null)
Expand All @@ -197,6 +201,7 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
List<RMNCHCBACdetails> cbacList = Arrays.asList(objArr2);

for (RMNCHCBACdetails obj : cbacList) {
benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
obj.setBenRegId(benRegID);
obj.setConfirmed_hrp("Not checked");
obj.setConfirmed_ncd("Not checked");
Expand Down