pcvolkmer/mv64e-onkostar-data
1
0
Fork 0
mirror of https://github.com/pcvolkmer/mv64e-onkostar-data.git synced 2025-09-13 07:52:52 +00:00
Code Activity

feat: add version and display to Histologie

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2025-07-06 17:40:40 +02:00
parent 4f82993431
commit f9e5e8c2eb
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaHistologieDataMapper.java
View File

@@ -102,7 +102,7 @@ public class KpaHistologieDataMapper extends AbstractSubformDataMapper<Histology
.id(resultSet.getId().toString())
.patient(resultSet.getPatientReference())
.specimen(Reference.builder().id(osMolGen.getId().toString()).type("Specimen").build())
.value(Coding.builder().code(resultSet.getString("morphologie")).build())
.value(getTumorMorphologyCoding(resultSet))
.build()
)
.build()
@@ -115,4 +115,17 @@ public class KpaHistologieDataMapper extends AbstractSubformDataMapper<Histology
return null;
}
private Coding getTumorMorphologyCoding(ResultSet resultSet) {
var propertyCatalogueEntry = propertyCatalogue.getByCodeAndVersion(
resultSet.getString("morphologie"),
resultSet.getInteger("morphologie_propcat_version")
);
return Coding.builder()
.code(propertyCatalogueEntry.getCode())
.display(propertyCatalogueEntry.getShortdesc())
.version(propertyCatalogueEntry.getVersionDescription())
.build();
}
}

8
src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapperTest.java
View File

@@ -50,6 +50,7 @@ class MolekulargenetikToSpecimenDataMapperTest {
ReevaluationCatalogue reevaluationCatalogue;
EinzelempfehlungCatalogue einzelempfehlungCatalogue;
VorbefundeCatalogue vorbefundeCatalogue;
HistologieCatalogue histologieCatalogue;
MolekulargenetikToSpecimenDataMapper mapper;
@@ -60,7 +61,8 @@ class MolekulargenetikToSpecimenDataMapperTest {
@Mock RebiopsieCatalogue rebiopsieCatalogue,
@Mock ReevaluationCatalogue reevaluationCatalogue,
@Mock EinzelempfehlungCatalogue einzelempfehlungCatalogue,
@Mock VorbefundeCatalogue vorbefundeCatalogue
@Mock VorbefundeCatalogue vorbefundeCatalogue,
@Mock HistologieCatalogue histologieCatalogue
) {
this.molekulargenetikCatalogue = molekulargenetikCatalogue;
this.therapieplanCatalogue = therapieplanCatalogue;
@@ -68,6 +70,7 @@ class MolekulargenetikToSpecimenDataMapperTest {
this.reevaluationCatalogue = reevaluationCatalogue;
this.einzelempfehlungCatalogue = einzelempfehlungCatalogue;
this.vorbefundeCatalogue = vorbefundeCatalogue;
this.histologieCatalogue = histologieCatalogue;
this.mapper = new MolekulargenetikToSpecimenDataMapper(
molekulargenetikCatalogue,
@@ -75,7 +78,8 @@ class MolekulargenetikToSpecimenDataMapperTest {
rebiopsieCatalogue,
reevaluationCatalogue,
einzelempfehlungCatalogue,
vorbefundeCatalogue
vorbefundeCatalogue,
histologieCatalogue
);
}