Skip to content

Commit

Permalink
Merge pull request #146 from imsweb/lung-rule-bug-145
Browse files Browse the repository at this point in the history
Lung rule bug
  • Loading branch information
depryf authored Sep 30, 2024
2 parents c49ce6a + 658e1e7 commit 1619b7e
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 31 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Multiple Primary and Histology Coding Rules Version History

**Changes in version 1.36**

- Fixed a bug in 2018 Lung rules Table 3 list.
- Updated HematoDB data with latest data from SEER API.
-
**Changes in version 1.35**

- Fixed an exception happening in GroupUtility with invalid dates. The fix in previous version was not complete.
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/imsweb/mph/MphConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -736,16 +736,15 @@ private MphConstants() {
content.put("8250/2", "8250/2");
content.put("8260", "8260");
content.put("8230", "8230");
content.put("8045", "8045");
content.put("8041", "8041");
content.put("8249", "8249");
content.put("9043/3", "9043/3");
content.put("9042/3", "9042/3");
content.put("9137/3", "9137/3");
content.put("8842/3", "8842/3");
content.put("9041/3", "9041/3");
content.put("9040/3", "9040/3");
content.put("8249/3", "8249/3");
content.put("8045/3", "8045/3");
content.put("8246/3", "8246/3");
content.put("8240/3", "8240/3");
content.put("8083", "8083");
content.put("8071", "8071");
content.put("8072", "8072");
Expand Down Expand Up @@ -787,6 +786,11 @@ private MphConstants() {
content.put("8720", "8720"); // Melanoma 8720
content.put("8430", "8430"); // Mucoepidermoid carcinoma 8430
content.put("8982", "8982"); // Myoepithelial carcinoma 8982
content.put("8246", "8246"); //Neuroendocrine carcinoma (NEC) 8246
content.put("8045", "8246"); //Neuroendocrine carcinoma (NEC) 8246
content.put("8041", "8246"); //Neuroendocrine carcinoma (NEC) 8246
content.put("8240", "8240"); //Neuroendocrine tumor, NOS (NET) 8240
content.put("8249", "8240"); //Neuroendocrine tumor, NOS (NET) 8240
content.put("8023/3", "8023/3"); // NUT carcinoma 8023/3
content.put("8714/3", "8714/3"); // PEComa malignant 8714/3
content.put("8022", "8022"); // Pleomorphic carcinoma 8022
Expand All @@ -799,11 +803,6 @@ private MphConstants() {
content.put("8842/3", "8800/3"); // Sarcoma NOS 8800/3
content.put("9041/3", "8800/3"); // Sarcoma NOS 8800/3
content.put("9040/3", "8800/3"); // Sarcoma NOS 8800/3
content.put("8041/3", "8041/3"); // Small cell carcinoma/neuroendocrine tumors (NET Tumors) 8041
content.put("8249/3", "8041/3"); // Small cell carcinoma/neuroendocrine tumors (NET Tumors) 8041
content.put("8045/3", "8041/3"); // Small cell carcinoma/neuroendocrine tumors (NET Tumors) 8041
content.put("8246/3", "8041/3"); // Small cell carcinoma/neuroendocrine tumors (NET Tumors) 8041
content.put("8240/3", "8041/3"); // Small cell carcinoma/neuroendocrine tumors (NET Tumors) 8041
content.put("8032", "8032"); // Spindle cell carcinoma 8032
content.put("8070", "8070"); // Squamous carcinoma 8070
content.put("8083", "8070"); // Squamous carcinoma 8070
Expand Down
28 changes: 14 additions & 14 deletions src/main/resources/Hematopoietic2010SamePrimaryPairs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -691,20 +691,20 @@
"9662/3","2001","2009","2001",,"9664/3"
"9662/3","2001","2009","2001",,"9665/3"
"9662/3","2001","2009","2001",,"9667/3"
"9659/3","2001",,"2001",,"9590/3"
"9659/3","2001",,"2001","2009","9596/3"
"9659/3","2001",,"2001",,"9650/3"
"9659/3","2001",,"2001",,"9651/3"
"9659/3","2001",,"2001",,"9652/3"
"9659/3","2001",,"2001",,"9653/3"
"9659/3","2001",,"2001",,"9654/3"
"9659/3","2001",,"2001",,"9655/3"
"9659/3","2001",,"2001",,"9661/3"
"9659/3","2001",,"2001",,"9662/3"
"9659/3","2001",,"2001",,"9663/3"
"9659/3","2001",,"2001",,"9664/3"
"9659/3","2001",,"2001",,"9665/3"
"9659/3","2001",,"2001",,"9667/3"
"9659/3","1992",,"2001",,"9590/3"
"9659/3","1992",,"2001","2009","9596/3"
"9659/3","1992",,"2001",,"9650/3"
"9659/3","1992",,"2001",,"9651/3"
"9659/3","1992",,"2001",,"9652/3"
"9659/3","1992",,"2001",,"9653/3"
"9659/3","1992",,"2001",,"9654/3"
"9659/3","1992",,"2001",,"9655/3"
"9659/3","1992",,"2001",,"9661/3"
"9659/3","1992",,"2001",,"9662/3"
"9659/3","1992",,"2001",,"9663/3"
"9659/3","1992",,"2001",,"9664/3"
"9659/3","1992",,"2001",,"9665/3"
"9659/3","1992",,"2001",,"9667/3"
"9675/3","2001","2009","2001",,"9590/3"
"9675/3","2001","2009","2001",,"9591/3"
"9675/3","2001","2009","2001","2009","9596/3"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/Hematopoietic2010TransformFromPairs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"9651/3","1978",,"2010",,"9761/3"
"9652/3","2001",,"2010",,"9671/3"
"9652/3","2001",,"2010",,"9761/3"
"9659/3","2001",,"2010",,"9671/3"
"9659/3","2001",,"2010",,"9761/3"
"9659/3","1992",,"2010",,"9671/3"
"9659/3","1992",,"2010",,"9761/3"
"9655/3","2001",,"2010",,"9671/3"
"9655/3","2001",,"2010",,"9761/3"
"9867/3","2001",,"2010",,"9875/3"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/Hematopoietic2010TransformToPairs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"9962/3","2001",,"2010",,"9897/3"
"9962/3","2001",,"2010",,"9910/3"
"9962/3","2001",,"2010",,"9911/3"
"9659/3","2001",,"2010",,"9680/3"
"9659/3","1992",,"2010",,"9680/3"
"9698/3","2001",,"2010",,"9680/3"
"9653/3","2001",,"2010",,"9680/3"
"9671/3","2001",,"2010",,"9650/3"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/hemato_data_info.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Mon Jan 08 09:11:15 EST 2024
last_updated=202401080911
#Mon Sep 30 14:46:05 EDT 2024
last_updated=202409301446
13 changes: 10 additions & 3 deletions src/test/java/com/imsweb/mph/Mph2018RuleTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -2642,8 +2642,8 @@ public void test2018Lung() {
Assert.assertEquals(ruleCountToTest, output.getAppliedRules().size());
Assert.assertTrue(output.getReason().contains("two or more different subtypes/variants in Column 3, Table 3"));
Assert.assertEquals(ruleStepToTest, output.getStep());
i1.setHistologyIcdO3("8246");
i2.setHistologyIcdO3("8249");
i1.setHistologyIcdO3("8045");
i2.setHistologyIcdO3("8041");
i1.setBehaviorIcdO3("3");
i2.setBehaviorIcdO3("3");
output = _utils.computePrimaries(i1, i2);
Expand Down Expand Up @@ -2724,6 +2724,13 @@ public void test2018Lung() {
i2.setHistologyIcdO3("8083");
output = _utils.computePrimaries(i1, i2);
Assert.assertNotEquals(ruleStepToTest, output.getStep());
// Small cell carcinoma 8041/3 row: “Neuroendocrine carcinoma, NOS” removed from beneath Typical Carcinoid 8240/3 and added as its own subtype/variant with the code 8246/3
i1.setHistologyIcdO3("8041");
i2.setHistologyIcdO3("8240");
i1.setBehaviorIcdO3("3");
i2.setBehaviorIcdO3("3");
output = _utils.computePrimaries(i1, i2);
Assert.assertNotEquals(ruleStepToTest, output.getStep());
//Histologies not in table->
i1.setHistologyIcdO3("8000");
i2.setHistologyIcdO3("8002");
Expand Down Expand Up @@ -2788,7 +2795,7 @@ public void test2018Lung() {
Assert.assertNotEquals(ruleStepToTest, output.getStep());
// Does not apply.
i1.setHistologyIcdO3("8041");
i2.setHistologyIcdO3("8240");
i2.setHistologyIcdO3("8246");
output = _utils.computePrimaries(i1, i2);
Assert.assertNotEquals(ruleStepToTest, output.getStep());

Expand Down

0 comments on commit 1619b7e

Please sign in to comment.