Skip to content

stop:802 Nikshay Workflow: X-ray check added for "normal but not tb presumptive" for negative case. #165

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
sehjotsinghunthinkable merged 2 commits into from
Nov 12, 2026
Merged

stop:802 Nikshay Workflow: X-ray check added for "normal but not tb presumptive" for negative case. #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b185da7
stop:647 Nikshay Workflow: X-ray check added for "normal but not tb p…
chetansaroya Nov 12, 2026
94abfa9
stop:647 Nikshay Workflow: code rabbit comment resultion for abnormal…
chetansaroya Nov 12, 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
17 changes: 11 additions & 6 deletions src/main/java/com/iemr/admin/repo/nikshayidgenerate/NikshayIdGenerateRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ private static String detected(String column) {
+ " AND NULLIF(TRIM(dx.digital_chest_xray_result), '') IS NOT NULL "
+ "ORDER BY dx.id DESC LIMIT 1)";

// X-ray results (lower case) that do not stop a household from being all negative; both
// "not suggestive" wordings, as in XrayTestPayloadBuilder
private static final String CLEAR_XRAY = "('normal', 'abnormal but not tb presumptive', "
+ "'abnormal but tb not presumptive')";

// Latest completed chest X-ray order result of "mem" (the result the X-ray upload sends)
private static final String ORDER_XRAY_SQL = "(SELECT rx.result_summary "
+ "FROM db_iemr.tb_diagnostic_order ox "
Expand All @@ -209,9 +214,9 @@ private static String detected(String column) {
+ "ORDER BY ox.created_date DESC, ox.id DESC LIMIT 1)";

// A member of the household (each from their latest rmnch row) who stops it from being
// all negative: not TB screened, ever TB confirmed or M. Tb detected, or no normal X-ray.
// The X-ray is normal when at least one of the two results says Normal and neither
// says anything else
// all negative: not TB screened, ever TB confirmed or M. Tb detected, or no clear X-ray.
// The X-ray is clear when at least one of the two results says Normal or "Abnormal but
// not TB Presumptive" and neither says anything else
private static final String MEMBER_NOT_CLEARED_SQL = "SELECT 1 FROM db_identity.i_beneficiarydetails_rmnch mem "
+ "WHERE mem.houseoldId = rm.houseoldId "
+ " AND mem.BeneficiaryRegID IS NOT NULL "
Expand All @@ -237,13 +242,13 @@ private static String detected(String column) {
+ " AND " + detected("d3.truenat_result") + ") "
+ " OR NOT ( "
+ " (" + FORM_XRAY_SQL + " IS NOT NULL OR " + ORDER_XRAY_SQL + " IS NOT NULL) "
+ " AND LOWER(TRIM(IFNULL(" + FORM_XRAY_SQL + ", 'normal'))) = 'normal' "
+ " AND LOWER(TRIM(IFNULL(" + ORDER_XRAY_SQL + ", 'normal'))) = 'normal' "
+ " AND LOWER(TRIM(IFNULL(" + FORM_XRAY_SQL + ", 'normal'))) IN " + CLEAR_XRAY + " "
+ " AND LOWER(TRIM(IFNULL(" + ORDER_XRAY_SQL + ", 'normal'))) IN " + CLEAR_XRAY + " "
+ " ) "
+ " )";

// Members of all-negative households who have no Ni-kshay ID yet: every member of the
// household is TB screened, has a normal X-ray and is not TB confirmed
// household is TB screened, has a clear X-ray (see MEMBER_NOT_CLEARED_SQL) and is not TB confirmed
private static final String ALL_NEGATIVE_BENEFICIARIES_SQL = BENEFICIARY_COLUMNS_SQL
+ "WHERE m.Deleted = 0 "
+ " AND m.BenRegId IS NOT NULL "
Expand Down
Loading