Skip to content

Update Beneficiary #143

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 8 commits into from
Dec 11, 2024
Merged

Update Beneficiary #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a70d9a2
missed file
ravishanigarapu Nov 4, 2024
76f1d39
FieldName Patching
ravishanigarapu Nov 18, 2024
01e9871
Null Conditions added
ravishanigarapu Nov 18, 2024
e08c8fd
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Dec 9, 2024
cc7a02c
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Dec 11, 2024
2ee0d95
Update beneficiary
ravishanigarapu Dec 11, 2024
f6fb441
update
ravishanigarapu Dec 11, 2024
9ab8472
Update
ravishanigarapu Dec 11, 2024
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
1 change: 1 addition & 0 deletions src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
Expand Down
4 changes: 3 additions & 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 @@ -114,8 +114,10 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut
Integer updatedRows = 0;

IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails);
if(null != benificiaryDetails.getI_bendemographics())
if(null != benificiaryDetails.getI_bendemographics()) {
identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName());
identityEditDTO.setCommunityName(benificiaryDetails.getI_bendemographics().getCommunityName());
}
if (benificiaryDetails.getBeneficiaryIdentities() != null
&& benificiaryDetails.getBeneficiaryIdentities().size() > 0) {
identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,9 @@ private static String getSubstringInRange(String input, int startIndex, int endI
@Override
public void publishSMS() {
RestTemplate restTemplateLogin = new RestTemplate();
if (!SMSServiceImpl.publishingSMS) {
try {

try {
if (!SMSServiceImpl.publishingSMS) {
SMSServiceImpl.publishingSMS = true;
Boolean doSendSMS = ConfigProperties.getBoolean("send-sms");
String sendSMSURL = ConfigProperties.getPropertyByName("send-message-url");
Expand Down Expand Up @@ -875,11 +876,11 @@ public void publishSMS() {
sms = smsNotification.save(sms);
}
}
} catch (Exception e) {
logger.error("publishSMS failed with error " + e.getMessage());
} finally {
SMSServiceImpl.publishingSMS = false;
}
} catch (Exception e) {
logger.error("publishSMS failed with error " + e.getMessage());
} finally {
SMSServiceImpl.publishingSMS = false;
}
}

Expand Down
Loading