Skip to content

Sm/pre prod issue 3.11.0 #388

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
vishwab1 merged 2 commits into from
Oct 23, 2026
Merged

Sm/pre prod issue 3.11.0 #388

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
06ef2ec
fix pre prod issue in release 3.11.0
SauravBizbRolly Oct 23, 2026
35a3d7f
fix pre prod issue in release 3.11.0
SauravBizbRolly Oct 23, 2026
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/flw/domain/iemr/DiagnosticOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class DiagnosticOrder {
@Column(name = "error_message", columnDefinition = "TEXT")
private String errorMessage;

@Column(name = "reason_to_close", columnDefinition = "TEXT")
@Column(name = "reason_for_refusal", columnDefinition = "TEXT")
private String reasonToClose;

@Column(name = "push_response_json", columnDefinition = "LONGTEXT")
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,27 +146,27 @@ private void checkIncentive(TBConfirmedCase entity){
|| "Longer Regimen (18–24 Months)".equalsIgnoreCase(regimen);

if (Boolean.TRUE.equals(entity.getTreatmentCompleted())
&& entity.getExpectedTreatmentCompletionDate() != null) {
&& entity.getFollowUpDate() != null) {


if (isDrTb) {
if("Shorter Regimen (9–12 Months)".equalsIgnoreCase(regimen)){
if(isEligibleForIncentive(entity.getTreatmentStartDate(),entity.getExpectedTreatmentCompletionDate(),9)){
if ("cured".equalsIgnoreCase(entity.getTreatmentOutcome())) {
incentiveLogicService.incentiveForTbFollowUpIsDrTb(
entity.getBenId(),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
entity.getUserId()
);
}

}else if("Longer Regimen (18–24 Months)".equalsIgnoreCase(regimen)){
if(isEligibleForIncentive(entity.getTreatmentStartDate(),entity.getExpectedTreatmentCompletionDate(),18)) {
if ("cured".equalsIgnoreCase(entity.getTreatmentOutcome())) {

incentiveLogicService.incentiveForTbFollowUpIsDrTb(
entity.getBenId(),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
entity.getUserId()
);
}
Expand All @@ -175,8 +175,8 @@ private void checkIncentive(TBConfirmedCase entity){
} else {
incentiveLogicService.incentiveForTbFollowUp(
entity.getBenId(),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getExpectedTreatmentCompletionDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
Timestamp.valueOf(entity.getFollowUpDate().atStartOfDay()),
entity.getUserId()
);

Expand Down
Loading