From 06ef2ec23e07073d32e83d5530a6a3040602f1c3 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 23 Oct 2026 17:12:49 +0530 Subject: [PATCH 1/2] fix pre prod issue in release 3.11.0 --- .../impl/TBConfirmedCaseServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java index 2dc71c08..faf95f2f 100644 --- a/src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java +++ b/src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java @@ -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() ); } @@ -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() ); From 35a3d7faf10e45d8ad3e5ca4c84f4023a536bdac Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 23 Oct 2026 17:15:41 +0530 Subject: [PATCH 2/2] fix pre prod issue in release 3.11.0 --- src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java b/src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java index ae7dc52d..c6bf2695 100644 --- a/src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java +++ b/src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java @@ -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")