[drtechie]

Brings the release-3.12.2 hotfixes forward into release-3.13.0.

Tickets

• STOP-765: faster changes-feed first download
• STOP-774: camp hub creates the X-ray / TrueNat orders a screening refers for

Commits from 3.12.2

• d9ba0424 fix(sync): build feed beneficiary pages in batches and send 100 per page
• e1acf2b7 fix(sync): use the newest mapping when batching beneficiary addresses
• 514ce59f fix(stoptb): camp hub creates the X-ray / TrueNat orders a screening refers for (STOP-774)
• 5572b225 fix(sync): report hub-side referral order creation in the changes feed (STOP-774)
• fe316629 fix(sync): build feed beneficiary records from the requested registration
• 647c69ed fix code merge issue
• plus the 3.12.2 merge commits (fix(sync): faster changes-feed first download; camp hub creates referral orders (STOP-765, STOP-774) #405, fix: restore code lost when release 3.12.0 was merged to main #407, Bring main into release-3.12.2 (restores code lost in the 3.12.0 merge) #408)

Conflict resolution

One conflict, imports only, in TBConfirmedCaseServiceImpl.java: 3.13.0 added explicit follow-up imports, 3.12.2 switched to wildcard domain.iemr.* / repo.iemr.* and added java.time.ZoneId / java.util.*. Kept the 3.12.2 imports, which cover the 3.13.0 ones (checked no simple-name clashes with java.util).

Tests

• mvn compile passes.
• StopTB referral, sync, TB confirmed and diagnostic order tests pass, except StopTBSyncCoverageTest, which fails with the same table list on release-3.12.2 alone (badge, notification, tb_referral_follow_up, tb_tpt_follow_up, user_fcm_tokens not classified). Not introduced by this merge.

🤖 Generated with Claude Code

Summary by CodeRabbit

• New Features
  • TB screening referrals can now trigger chest X-ray and sputum diagnostic orders when eligible, with checks to avoid duplicate or outdated orders.
  • Incentive eligibility now reflects treatment completion, follow-up dates, and applicable treatment outcomes.
• Bug Fixes
  • Beneficiary records are matched to the correct registration when addresses are shared, improving worklist accuracy.

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

The pull request adds asynchronous orders for TB screening referrals, updates beneficiary address mapping for requested registrations, and changes TB incentive date and outcome checks. It also updates sync-page settings and adds referral-order tests.

Changes: TB referral orders

Layer / File(s)	Summary
Referral and duplicate-order queries src/main/java/com/iemr/flw/repo/iemr/DiagnosticOrderRepo.java, src/main/java/com/iemr/flw/repo/iemr/TBScreeningRepo.java	The repositories now find recent referred screenings and check for a matching order created today or with an open status.
Referral processing and order creation src/main/java/com/iemr/flw/service/impl/StopTBReferralOrderService.java	The service queues referrals after commit or processes them in a scheduled sweep. It checks screening dates, beneficiary details, and existing orders before creating requested orders.
Screening integration and sync settings src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java, src/main/java/com/iemr/flw/service/impl/StopTBSyncServiceImpl.java, src/test/java/com/iemr/flw/service/impl/StopTBReferralOrderServiceTest.java	Saved screenings pass referral flags to the order service. Sync pages include camp configuration and use a beneficiary page limit of 100. Tests cover order creation and skip conditions.

Beneficiary address mapping

Layer / File(s)	Summary
Registration-aware address prefetch src/main/java/com/iemr/flw/service/impl/WorklistPagePrefetch.java	Worklist prefetch accepts requested registration IDs and returns usable addresses keyed by registration ID.
Registration-aware beneficiary records src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java	Beneficiary record lookup batches address retrieval, falls back to per-registration lookups, and selects the mapping associated with each requested registration.

TB incentive eligibility

Layer / File(s)	Summary
Incentive date and outcome checks src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java	The incentive check uses the follow-up date and calls the DR-TB incentive only for cured outcomes. The new eligibility method checks the minimum treatment duration.

Estimated code review effort: 4 (Complex) | ~45 minutes

Change: Bug fix

Sequence Diagram(s)

sequenceDiagram
  participant Scheduler
  participant StopTBReferralOrderService
  participant TBScreeningRepo
  participant DiagnosticOrderRepo
  Scheduler->>StopTBReferralOrderService: invoke scheduled sweep
  StopTBReferralOrderService->>TBScreeningRepo: findReferredSince for configured van and today
  TBScreeningRepo-->>StopTBReferralOrderService: return referred screenings
  StopTBReferralOrderService->>DiagnosticOrderRepo: check for matching order today or open order

Loading

Possibly related PRs

• PSMRI/FLW-API#405: Contains the same STOP-765 and STOP-774 changes and is described as the release-branch merge of this change set.
• PSMRI/FLW-API#393: Changes the beneficiary record-building contract and related prefetch behavior that this pull request also updates.
• PSMRI/FLW-API#407: Adds the same incentive eligibility method and changes incentive handling in the same service.

Suggested reviewers: vishwab1, sehjotsinghunthinkable, sauravbizbrolly

Merge Risk: Low · up to 97c90

Referral order creation could occasionally be delayed until the next two-minute sweep if queuing fails after a save. The impact is small and self-recovering, so the change is mergeable with minor follow-up.

- [ ] Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

• X
• Mastodon
• Reddit
• LinkedIn

[sonarqubecloud]

Quality Gate passed

Issues
15 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud