Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions src/main/java/com/imsweb/seerapi/client/disease/Disease.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public class Disease extends Publishable {
private List<YearRangeString> _samePrimaries;
@JsonProperty("same_primaries_text")
private List<YearRangeString> _samePrimariesText;
@JsonProperty("same_primary_text")
private List<YearRangeString> _samePrimaryText;
@JsonProperty("progression")
private List<YearRangeString> _progression;
@JsonProperty("diagnostic_confirmation")
Expand Down Expand Up @@ -422,6 +424,14 @@ public void setSamePrimariesText(List<YearRangeString> samePrimariesText) {
_samePrimariesText = samePrimariesText;
}

public List<YearRangeString> getSamePrimaryText() {
return _samePrimaryText;
}

public void setSamePrimaryText(List<YearRangeString> samePrimaryText) {
_samePrimaryText = samePrimaryText;
}

public List<YearRangeString> getBiomarkers() {
return _biomarkers;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/imsweb/seerapi/client/hcpcs/Hcpcs.java
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ public enum Category {
CHEMOTHERAPY,
IMMUNOTHERAPY,
RADIOPHARMACEUTICAL,
HEME_TRANSPLANT_ENDOCRINE_PROCEDURE;
HEME_TRANSPLANT_ENDOCRINE_PROCEDURE,
OTHER;
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/imsweb/seerapi/client/ndc/NdcSeerInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public enum Category {
CHEMOTHERAPY,
IMMUNOTHERAPY,
RADIOPHARMACEUTICAL,
HEME_TRANSPLANT_ENDOCRINE_PROCEDURE
HEME_TRANSPLANT_ENDOCRINE_PROCEDURE,
OTHER
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ void testDiseaseVersions() throws IOException {

assertNotNull(versions);
assertFalse(versions.isEmpty());
DiseaseVersion version = versions.get(0);
DiseaseVersion version = versions.stream().filter(v -> "latest".equals(v.getName())).findFirst().orElseThrow();
assertEquals("latest", version.getName());
assertNull(version.getType()); // type not returned when no permisisons
assertNotNull(version.getFirstPublished());
assertNotNull(version.getCount());
}
Expand Down Expand Up @@ -89,7 +88,7 @@ void testDiseaseById() throws IOException {
Disease disease = _DISEASE.getById("latest", "51f6cf58e3e27c3994bd5408").execute().body();

assertNotNull(disease);
assertEquals("Acute erythroid leukemia (AEL)", disease.getName());
assertTrue(disease.getName().startsWith("Acute erythroid leukemia (AEL)"));
assertEquals(Disease.Type.HEMATO, disease.getType());
assertEquals("9840/3", disease.getIcdO3Morphology());
assertFalse(disease.getSamePrimaries().isEmpty());
Expand Down Expand Up @@ -117,7 +116,7 @@ void testDiseaseById() throws IOException {
assertEquals(2, disease.getTreatment().size());
assertNotNull(disease.getGenetics());
assertFalse(disease.getAlternateName().isEmpty());
assertEquals("Acute erythemia [OBS]", disease.getAlternateName().get(0).getValue());
assertTrue(disease.getAlternateName().get(0).getValue().startsWith("Acute erythemia [OBS]"));
assertTrue(disease.getIcdO2Morphology().contains("9840/3"));
assertTrue(disease.getIcdO1Morphology().contains("9840/3"));
assertEquals("C94.0 Acute erythroid leukemia", disease.getIcd10CmCode().get(0).getValue());
Expand All @@ -142,7 +141,7 @@ void testDiseaseById() throws IOException {
assertEquals("See abstractor notes", disease.getModuleId().get(0).getValue());
assertNull(disease.getBiomarkers());
assertNull(disease.getTreatmentText());
assertTrue(disease.getDiagnosticConfirmation().get(0).getValue().startsWith("This histology can be determined by positive histology"));
assertFalse(disease.getDiagnosticConfirmation().isEmpty());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ void testGlossaryVersions() throws IOException {

assertNotNull(versions);
assertFalse(versions.isEmpty());
GlossaryVersion version = versions.get(0);
GlossaryVersion version = versions.stream().filter(v -> "latest".equals(v.getName())).findFirst().orElseThrow();
assertEquals("latest", version.getName());
assertNull(version.getType()); // type isn't returned when no permisisons
assertNotNull(version.getFirstPublished());
assertNotNull(version.getCount());
}
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/com/imsweb/seerapi/client/rx/RxTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ void testRxVersions() throws IOException {

assertNotNull(versions);
assertFalse(versions.isEmpty());
RxVersion version = versions.get(0);
RxVersion version = versions.stream().filter(v -> "latest".equals(v.getName())).findFirst().orElseThrow();
assertEquals("latest", version.getName());
assertNull(version.getType()); // type not returned when no permisisons
assertNotNull(version.getFirstPublished());
assertNotNull(version.getCount());
}
Expand Down Expand Up @@ -123,8 +122,8 @@ void testRxSearch() throws IOException {

assertNotNull(results);
assertEquals(25, results.getCount().longValue());
assertEquals(8, results.getTotal().longValue());
assertEquals(8, results.getResults().size());
assertEquals(9, results.getTotal().longValue());
assertEquals(9, results.getResults().size());
assertEquals(Collections.singletonList("abt"), results.getTerms());

search.setMode(PublishableSearch.SearchMode.OR);
Expand Down
Loading