- Other Sites: Table 23: 8720/3 row added

- Other Sites: Table 23: 8054 added to 8070 row
imsweb · Dec 18, 2024 · 3213e57 · 3213e57
1 parent a661b1f
commit 3213e57
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/com/imsweb/mph/MphConstants.java b/src/main/java/com/imsweb/mph/MphConstants.java
@@ -2164,6 +2164,8 @@ private MphConstants() {
         penisAndScrotumRows.put("8560", "8140");
         penisAndScrotumRows.put("8430", "8140");
 
+        penisAndScrotumRows.put("8720/3", "8720/3");
+
         penisAndScrotumRows.put("8542/3", "8542/3");
 
         penisAndScrotumRows.put("8070", "8070");
@@ -2178,6 +2180,7 @@ private MphConstants() {
         penisAndScrotumRows.put("8085", "8070");
         penisAndScrotumRows.put("8086", "8070");
         penisAndScrotumRows.put("8051", "8070");
+        penisAndScrotumRows.put("8054", "8070");
 
         for (String site: PENIS_AND_SCROTUM_SITES)
             content.put(site, penisAndScrotumRows);
@@ -2578,6 +2581,7 @@ private MphConstants() {
         penisAndScrotumSubtypes.put("8085", "8085");
         penisAndScrotumSubtypes.put("8086", "8086");
         penisAndScrotumSubtypes.put("8051", "8051");
+        penisAndScrotumSubtypes.put("8054", "8054");
         for (String site: PENIS_AND_SCROTUM_SITES)
             content.put(site, penisAndScrotumSubtypes);
 

diff --git a/src/test/java/com/imsweb/mph/Mph2023RulesTest.java b/src/test/java/com/imsweb/mph/Mph2023RulesTest.java
@@ -148,6 +148,15 @@ public void test2023OtherSites() {
         Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
         Assert.assertEquals(MpResult.MULTIPLE_PRIMARIES, output.getResult());
         Assert.assertEquals("M17", output.getStep());
+        //8054 added as a subtype for 8070 of table 23
+        i1.setPrimarySite("C630");
+        i2.setPrimarySite("C630");
+        i1.setHistologyIcdO3("8054");
+        i2.setHistologyIcdO3("8051");
+        output = _utils.computePrimaries(i1, i2);
+        Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
+        Assert.assertEquals(MpResult.MULTIPLE_PRIMARIES, output.getResult());
+        Assert.assertEquals("M17", output.getStep());
 
         // M10 - Tumors on both sides (right and left) of a site listed in Table 1 are multiple primaries.
         i1.setPrimarySite("C622");
@@ -389,13 +398,6 @@ public void test2023OtherSites() {
         Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
         Assert.assertEquals(MpResult.SINGLE_PRIMARY, output.getResult());
         Assert.assertEquals("M18", output.getStep());
-        //C630 added to table 23
-        i1.setPrimarySite("C630");
-        i2.setPrimarySite("C630");
-        output = _utils.computePrimaries(i1, i2);
-        Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
-        Assert.assertEquals(MpResult.SINGLE_PRIMARY, output.getResult());
-        Assert.assertEquals("M18", output.getStep());
 
         //M19 - Abstract multiple primaries when separate/non-contiguous tumors are on multiple rows in Table 2-21.
         i1.setPrimarySite("C490");
@@ -447,6 +449,12 @@ public void test2023OtherSites() {
         Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
         Assert.assertEquals(MpResult.MULTIPLE_PRIMARIES, output.getResult());
         Assert.assertEquals("M19", output.getStep());
+        //8720/3 added to table 23 & C630 added to table 23
+        i1.setPrimarySite("C630");
+        i2.setPrimarySite("C630");
+        Assert.assertEquals(MphConstants.SOLID_TUMOR_2023_OTHER_SITES, output.getGroupName());
+        Assert.assertEquals(MpResult.MULTIPLE_PRIMARIES, output.getResult());
+        Assert.assertEquals("M19", output.getStep());
         //8720 added to table 19
         i1.setPrimarySite("C519");
         i2.setPrimarySite("C519");