Merge pull request #26 from imsweb/tnm-1.4

TNM v1.4

Author: ctmay4

README.md

@@ -23,7 +23,7 @@ NCI will be developing SEER Summary Stage 2017, which will be effective for diag
 
 Versions supported:
 
-- 1.3 (released October 2016)
+- 1.4 (released April 2017)
 
 ### Collaborative Staging
 
@@ -45,14 +45,14 @@ Download [the latest JAR][1] or grab via Maven:
 <dependency>
     <groupId>com.imsweb</groupId>
     <artifactId>staging-client-java</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 </dependency>
 ```
 
 or via Gradle:
 
 ```groovy
-compile 'com.imsweb.com:staging-client-java:2.4'
+compile 'com.imsweb.com:staging-client-java:2.5'
 ```
 
 ## Usage

src/main/java/com/imsweb/staging/tnm/TnmDataProvider.java

@@ -13,8 +13,8 @@ public final class TnmDataProvider extends StagingFileDataProvider {
     private static final Map<TnmVersion, TnmDataProvider> _PROVIDERS = new ConcurrentHashMap<>();
 
     public enum TnmVersion {
-        LATEST("1.3"),
-        v1_3("1.3");
+        LATEST("1.4"),
+        v1_4("1.4");
 
         private String _version;
 

…nm/1.3/schemas/adnexa_uterine_other.json …nm/1.4/schemas/adnexa_uterine_other.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/adnexa_uterine_other.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/adnexa_uterine_other.json src/main/resources/algorithms/tnm/1.3/schemas/adnexa_uterine_other.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/adnexa_uterine_other.json

@@ -1,7 +1,7 @@
 {
   "id" : "adnexa_uterine_other",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Adnexa Uterine Other",
   "title" : "Broad and Round Ligaments, Parametrium, Uterine Adnexa",
   "notes" : "C571  Broad ligament\nC572  Round ligament\nC573  Parametrium\nC574  Uterine adnexa\n\n**Note:** TNM is not defined for this schema. If directly assigning Summary Stage 2000 (SS2000), use the *Broad and Round Ligaments, Parametrium, Uterine Adnexa* chapter on page 218 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=218).",
@@ -116,5 +116,5 @@
   } ],
   "involved_tables" : [ "primary_site", "seer_mets_48348", "nodes_dcc", "histology", "schema_selection_adnexa_uterine_other", "year_dx_validation", "summary_stage_rpa", "extension_bcn" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:21.902Z"
+  "last_modified" : "2016-11-29T17:24:25.911Z"
 }

…ithms/tnm/1.3/schemas/adrenal_gland.json …ithms/tnm/1.4/schemas/adrenal_gland.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/adrenal_gland.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/adrenal_gland.json src/main/resources/algorithms/tnm/1.3/schemas/adrenal_gland.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/adrenal_gland.json

@@ -1,7 +1,7 @@
 {
   "id" : "adrenal_gland",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Adrenal Gland",
   "title" : "Adrenal Gland",
   "notes" : "C740  Cortex of adrenal gland\nC741  Medulla of adrenal gland\nC749  Adrenal gland, NOS\n\n**Note 1:** This schema is based on the UICC chapter *Adrenal Cortex Tumours* pages 270-272.\n* Primary sites C741 and C749 are not listed in this chapter of the UICC manual; however, they are included in this schema and TNM staged if appropriate histology criteria are met\n\n**Note 2:**  Laterality must be coded for this site.\n\n**Note 3:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Thymus, Adrenal (Suprarenal) Gland and Other Endocrine Glands* chapter on page 278 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=278).",
@@ -685,5 +685,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "determine_default_t", "adrenal_m_7434", "radiation_surg_seq", "tnm7_path_stage_uba", "determine_default_m", "nodes_ddk", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "tnm7_stage_uba", "ssf2_kak", "stage_group_p_44348", "parse_n_67182", "determine_default_n", "stage_group_94596", "combined_n_to_summ_stage_n_84054", "histology", "concatenate_m_40642", "adrenal_gland_t_18187", "combined_t_no_tis", "combined_t_to_summ_stage_t_3_4c_re_4d_4e_d_54890", "extension_bdp", "concatenate_t_51262", "ssf3_laf", "path_n_adrenal_gland_53740", "adjustments_for_no_clin_or_no_path_26261", "schema_selection_adrenal_gland", "determine_combined_prefix_91402", "path_t_adrenal_gland_28077", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "parse_m_47057", "primary_site", "combined_m", "combined_n", "year_dx_validation", "tnm7_inclusions_tqc", "path_m_hbv", "summary_stage_rpa", "mets_hbv", "adrenal_gland_n_44698" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:22.398Z"
+  "last_modified" : "2016-11-29T17:24:26.688Z"
 }

…ithms/tnm/1.3/schemas/ampulla_vater.json …ithms/tnm/1.4/schemas/ampulla_vater.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/ampulla_vater.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/ampulla_vater.json src/main/resources/algorithms/tnm/1.3/schemas/ampulla_vater.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/ampulla_vater.json

@@ -1,7 +1,7 @@
 {
   "id" : "ampulla_vater",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Ampulla Vater",
   "title" : "Ampulla of Vater (excluding Neuroendocrine Tumor)",
   "notes" : "C241  Ampulla of Vater\n\n**Note 1:** This schema is based on the UICC chapter *Ampulla of Vater,* pages 129-131.\n\n**Note 2:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Ampulla of Vater* chapter on page 114 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=114).",
@@ -698,5 +698,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "clin_m_har", "determine_default_t", "path_m_har", "ssf2_kpc", "radiation_surg_seq", "determine_default_m", "ssf1_jpe", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "parse_n_67182", "ampulla_of_vater_t_63892", "determine_default_n", "extension_bde", "ssf3_lpc", "combined_n_to_summ_stage_n_84054", "histology", "concatenate_m_40642", "mets_har", "combined_t_to_summ_stage_t_2_4e_re_93413", "behavior", "tnm7_inclusions_tpe", "concatenate_t_51262", "clin_n_ampulla_vater_45064", "adjustments_for_no_clin_or_no_path_26261", "stage_group_p_45729", "tnm7_path_stage_uaa", "determine_combined_prefix_91402", "stage_group_c_22295", "schema_selection_ampulla_vater", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "tnm7_stage_uaa", "parse_m_47057", "path_t_ampulla_vater_23469", "primary_site", "path_n_dbo", "combined_m", "combined_n", "nodes_dbo", "year_dx_validation", "summary_stage_rpa", "combined_t" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:22.953Z"
+  "last_modified" : "2016-11-29T17:24:26.308Z"
 }

…ces/algorithms/tnm/1.3/schemas/anus.json …ces/algorithms/tnm/1.4/schemas/anus.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/anus.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/anus.json src/main/resources/algorithms/tnm/1.3/schemas/anus.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/anus.json

@@ -1,7 +1,7 @@
 {
   "id" : "anus",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Anus",
   "title" : "Anus, Anal Canal, and Other Parts of Rectum",
   "notes" : "C210 Anus, NOS (excluding skin of anus and perianal skin C445)\nC211 Anal canal\nC212 Cloacogenic zone\nC218 Overlapping lesion of rectum, anus and anal canal\n\n**Note 1:** This schema is based on the UICC chapter *Anal Canal,* pages 106-109.\n* Primary sites C210 and C218 are not listed in this chapter of the UICC manual; however, they are included in this schema and TNM staged if appropriate histology criteria are met\n* Skin of anus is coded separately (C445)\n\n**Note 2:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Anus and Anal Canal* chapter on page 104 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=104).",
@@ -684,5 +684,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "path_m_anus_33946", "determine_default_t", "radiation_surg_seq", "determine_default_m", "stage_group_p_92581", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "parse_n_67182", "determine_default_n", "stage_group_c_42709", "combined_n_to_summ_stage_n_84054", "histology", "concatenate_m_40642", "path_t_anus_61291", "behavior", "tnm7_inclusions_tpe", "concatenate_t_51262", "adjustments_for_no_clin_or_no_path_26261", "nodes_dab", "tnm7_path_stage_uab", "clin_n_dab", "determine_combined_prefix_91402", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "path_n_dab", "tnm7_stage_uab", "anus_t_35615", "parse_m_47057", "schema_selection_anus", "extension_baa", "clin_m_anus_46174", "primary_site", "combined_m", "combined_to_summ_stage_t_80394", "combined_n", "year_dx_validation", "ssf1_jce", "summary_stage_rpa", "seer_mets_anus_24893", "combined_t" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:23.581Z"
+  "last_modified" : "2016-11-29T17:24:26.302Z"
 }

…algorithms/tnm/1.3/schemas/appendix.json …algorithms/tnm/1.4/schemas/appendix.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/appendix.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/appendix.json src/main/resources/algorithms/tnm/1.3/schemas/appendix.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/appendix.json

@@ -1,7 +1,7 @@
 {
   "id" : "appendix",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Appendix",
   "title" : "Carcinomas of the Appendix (excluding Carcinoid Tumor and Neuroendocrine Carcinoma)",
   "notes" : "C181 Appendix\n\n**Note 1:** This schema is based on the UICC chapter *Appendix-Carcinoma,* pages 86-90.\n\n**Note 2:** Carcinoid tumor and neuroendocrine carcinoma (histology codes 8153, 8240-8242, 8246, 8249) of the appendix are included in the \"CarcinoidAppendix\" schema.\n\n**Note 3:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Colon* chapter on page 94 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=94).",
@@ -732,5 +732,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "appendix_grade_category_calculation", "mets_hcf", "parse_t_2177", "concatenate_n_43246", "ssf7_spf", "ssf1_jpf", "extension_bfg", "stage_group_p_96481", "ssf3_lpe", "combined_n_to_summ_stage_n_84054", "histology", "tnm7_path_stage_uar", "concatenate_m_40642", "tnm7_inclusions_tpc", "ssf10_spi", "concatenate_t_51262", "clin_m_hcf", "adjustments_for_no_clin_or_no_path_26261", "systemic_surg_seq", "parse_m_47057", "combined_m", "combined_to_summ_stage_t_80394", "combined_n", "path_m_hcf", "path_t_appendix_94760", "summary_stage_rpa", "combined_t", "path_n_dfc", "determine_default_t", "radiation_surg_seq", "ssf12_sbu", "nodes_dfc", "determine_default_m", "nodes_pos_fpa", "parse_n_67182", "determine_default_n", "behavior", "clin_t_appendix_24847", "tnm7_stage_uar", "ssf4_mpb", "determine_combined_prefix_91402", "stop_if_no_clin_and_no_path_24035", "schema_selection_appendix", "ssf11_sbt", "primary_site", "year_dx_validation", "clin_n_dfc", "stage_group_c_37137" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:24.105Z"
+  "last_modified" : "2016-11-29T17:24:26.295Z"
 }

…s/tnm/1.3/schemas/bile_ducts_distal.json …s/tnm/1.4/schemas/bile_ducts_distal.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_distal.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_distal.json src/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_distal.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_distal.json

@@ -1,7 +1,7 @@
 {
   "id" : "bile_ducts_distal",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Bile Ducts Distal",
   "title" : "Distal Bile Duct",
   "notes" : "C240 Extrahepatic bile duct\n\n**Note 1:** This schema is based on the UICC chapter *Extrahepatic Bile Ducts-Distal,* pages 126-128.\n* **Site-Specific Factor 25, Schema Discriminator: BileDuctsDistal/BileDuctsPerihilar/CysticDuct** is used to discriminate between bile duct distal, bile duct perihilar and cystic duct which are coded to ICD-O-3 code C240\n\n**Note 2:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Extrahepatic Bile Duct* chapter on page 112 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=112).",
@@ -707,5 +707,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "determine_default_t", "path_m_hcq", "clin_m_hcq", "radiation_surg_seq", "mets_hcq", "determine_default_m", "nodes_dfn", "ssf13_sqg", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "path_t_distal_bile_duct_50879", "parse_n_67182", "clin_n_dfn", "stage_group_c_82556", "determine_default_n", "combined_n_to_summ_stage_n_84054", "histology", "concatenate_m_40642", "ssf12_sqf", "stage_group_p_89660", "combined_t_to_summ_stage_t_2_4e_re_93413", "extension_bfs", "behavior", "tnm7_inclusions_tpe", "concatenate_t_51262", "adjustments_for_no_clin_or_no_path_26261", "determine_combined_prefix_91402", "schema_selection_bile_ducts_distal", "distal_blie_duct_t_30646", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "discriminator_bile_ducts", "parse_m_47057", "tnm7_stage_ubm", "primary_site", "tnm7_path_stage_ubm", "ssf14_sqh", "combined_m", "combined_n", "path_n_dfn", "year_dx_validation", "summary_stage_rpa", "combined_t" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:24.587Z"
+  "last_modified" : "2016-11-29T17:24:26.289Z"
 }

…m/1.3/schemas/bile_ducts_intrahepat.json …m/1.4/schemas/bile_ducts_intrahepat.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_intrahepat.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_intrahepat.json src/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_intrahepat.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_intrahepat.json

@@ -1,7 +1,7 @@
 {
   "id" : "bile_ducts_intrahepat",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Bile Ducts Intrahepat",
   "title" : "Intrahepatic Bile Ducts",
   "notes" : "C220 Liver\nC221  Intrahepatic bile duct\n\n**Note 1:** This schema is based on the UICC chapter *Liver-Intrahepatic Bile Ducts,* pages 114-117.\n\n**Note 2:** For C220, the BileDuctsIntrahepatic schema only includes 8190, 8161, and 8180. For other histologies, see the Liver schema. \n\n**Note 3:** For C221, the BileDuctsIntraHepat schema only includes M-8000-8162, 8180-9136, 9141-9582, and 9700-9701.  For hepatocellular carcinoma, M-8170-8175, see the Liver schema.\n\n**Note 4:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Liver and Intrahepatic Bile Ducts* chapter on page 108 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=108).",
@@ -715,5 +715,5 @@
   } ],
   "involved_tables" : [ "ssf3_lps", "cpmbined_m_to_summ_stage_m_60564", "determine_default_t", "radiation_surg_seq", "determine_default_m", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "parse_n_67182", "tnm7_path_stage_ubi", "determine_default_n", "combined_n_to_summ_stage_n_84054", "path_t_intrahepatic_bile_ducts_23893", "histology", "concatenate_m_40642", "ssf2_kpq", "combined_t_to_summ_stage_t_3_4c_re_4d_4e_d_54890", "ssf12_sqf", "nodes_dew", "behavior", "ssf1_jpw", "path_n_dew", "concatenate_t_51262", "adjustments_for_no_clin_or_no_path_26261", "determine_combined_prefix_91402", "clin_m_hbz", "tnm7_inclusions_tpt", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "extension_bfa", "stage_group_c_56577", "mets_hbz", "parse_m_47057", "clin_n_dew", "primary_site", "intrahepatic_bile_ducts_t_31771", "ssf11_sqe", "combined_m", "tnm7_stage_ubi", "combined_n", "stage_group_p_78345", "year_dx_validation", "summary_stage_rpa", "combined_t", "schema_selection_bile_ducts_intrahepat", "path_m_hbz" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:25.087Z"
+  "last_modified" : "2016-11-29T17:24:26.282Z"
 }

…nm/1.3/schemas/bile_ducts_perihilar.json …nm/1.4/schemas/bile_ducts_perihilar.jsonsrc/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_perihilar.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_perihilar.json src/main/resources/algorithms/tnm/1.3/schemas/bile_ducts_perihilar.json renamed to src/main/resources/algorithms/tnm/1.4/schemas/bile_ducts_perihilar.json

@@ -1,7 +1,7 @@
 {
   "id" : "bile_ducts_perihilar",
   "algorithm" : "tnm",
-  "version" : "1.3",
+  "version" : "1.4",
   "name" : "Bile Ducts Perihilar",
   "title" : "Perihilar Bile Ducts",
   "notes" : "C240 Extrahepatic bile duct\n\n**Note 1:** This schema is based on the UICC chapter *Extrahepatic Bile Ducts-Perihilar,* pages 122-125.\n* **Site-Specific Factor 25, Schema Discriminator: BileDuctsDistal/BileDuctsPerihilar/CysticDuct** is used to discriminate between bile duct distal, bile duct perihilar and cystic duct which are coded to ICD-O-3 code C240\n\n**Note 2:** Perihilar cholangiocarcinomas are tumors located in the extrahepatic biliary tree proximal to the origin of the cystic duct.\n\n**Note 3:** In addition to directly assigning TNM, Summary Stage 2000 (SS2000) must be captured.  If directly assigning SS2000, use the *Extrahepatic Bile Duct* chapter on page 112 of the [SS2000 on-line manual](http://seer.cancer.gov/tools/ssm/SSSM2000-122012.pdf#page=112).",
@@ -722,5 +722,5 @@
   } ],
   "involved_tables" : [ "cpmbined_m_to_summ_stage_m_60564", "determine_default_t", "path_m_hcr", "extension_bft", "clin_m_hcr", "radiation_surg_seq", "mets_hcr", "determine_default_m", "ssf13_sqg", "nodes_dfo", "nodes_pos_fpa", "parse_t_2177", "concatenate_n_43246", "clin_t_perihilar_bile_ducts_63594", "stage_group_p_93370", "combined_n_to_summ_stage_n_n2_d_23338", "clin_n_dfo", "parse_n_67182", "determine_default_n", "ssf10_sfi", "schema_selection_bile_ducts_perihilar", "histology", "concatenate_m_40642", "ssf12_sqf", "combined_t_to_summ_stage_t_2_4e_re_93413", "behavior", "stage_group_c_73800", "tnm7_inclusions_tpe", "concatenate_t_51262", "adjustments_for_no_clin_or_no_path_26261", "path_t_perihilar_bile_ducts_88350", "determine_combined_prefix_91402", "stop_if_no_clin_and_no_path_24035", "systemic_surg_seq", "discriminator_bile_ducts", "parse_m_47057", "primary_site", "tnm7_stage_ubn", "ssf14_sqh", "ssf11_sqe", "tnm7_path_stage_ubn", "combined_m", "combined_n", "path_n_dfo", "year_dx_validation", "summary_stage_rpa", "combined_t" ],
   "on_invalid_input" : "FAIL_WHEN_USED_FOR_STAGING",
-  "last_modified" : "2016-10-06T15:31:25.774Z"
+  "last_modified" : "2016-11-29T17:24:26.271Z"
 }