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

feat: add display and system to prozedur data

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2025-06-22 14:45:08 +02:00
parent f03d89d7bd
commit 673d89f5e2
3 changed files with 112 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/AbstractKpaTherapieverlaufDataMapper.java
View File

@ -1,6 +1,7 @@
package dev.pcvolkmer.onco.datamapper.mapper; package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.mv64e.mtb.*; import dev.pcvolkmer.mv64e.mtb.*;
import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
import dev.pcvolkmer.onco.datamapper.datacatalogues.AbstractSubformDataCatalogue; import dev.pcvolkmer.onco.datamapper.datacatalogues.AbstractSubformDataCatalogue;
import java.io.IOException; import java.io.IOException;
@ -15,16 +16,21 @@ import java.util.stream.Collectors;
*/ */
public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSubformDataMapper<T> { public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSubformDataMapper<T> {
AbstractKpaTherapieverlaufDataMapper(AbstractSubformDataCatalogue catalogue) { private final PropertyCatalogue propertyCatalogue;
AbstractKpaTherapieverlaufDataMapper(final AbstractSubformDataCatalogue catalogue, final PropertyCatalogue propertyCatalogue) {
super(catalogue); super(catalogue);
this.propertyCatalogue = propertyCatalogue;
} }
protected MtbTherapyIntentCoding getMtbTherapyIntentCoding(String value) { protected MtbTherapyIntentCoding getMtbTherapyIntentCoding(String value, int version) {
if (value == null || !Arrays.stream(MtbTherapyIntentCodingCode.values()).map(MtbTherapyIntentCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(MtbTherapyIntentCodingCode.values()).map(MtbTherapyIntentCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
var resultBuilder = MtbTherapyIntentCoding.builder(); var resultBuilder = MtbTherapyIntentCoding.builder()
.system("dnpm-dip/therapy/intent")
.display(propertyCatalogue.getByCodeAndVersion(value, version).getShortdesc());
switch (value) { switch (value) {
case "X": case "X":
@ -44,12 +50,14 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected TherapyStatusCoding getTherapyStatusCoding(String value) { protected TherapyStatusCoding getTherapyStatusCoding(String value, int version) {
if (value == null || !Arrays.stream(TherapyStatusCodingCode.values()).map(TherapyStatusCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(TherapyStatusCodingCode.values()).map(TherapyStatusCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
var resultBuilder = TherapyStatusCoding.builder(); var resultBuilder = TherapyStatusCoding.builder()
.system("dnpm-dip/therapy/status")
.display(propertyCatalogue.getByCodeAndVersion(value, version).getShortdesc());
switch (value) { switch (value) {
case "not-done": case "not-done":
@ -69,12 +77,15 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected MtbTherapyStatusReasonCoding getMtbTherapyStatusReasonCoding(String value) { protected MtbTherapyStatusReasonCoding getMtbTherapyStatusReasonCoding(String value, int version) {
if (value == null || !Arrays.stream(MtbTherapyStatusReasonCodingCode.values()).map(MtbTherapyStatusReasonCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(MtbTherapyStatusReasonCodingCode.values()).map(MtbTherapyStatusReasonCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
var resultBuilder = MtbTherapyStatusReasonCoding.builder(); var resultBuilder = MtbTherapyStatusReasonCoding.builder()
.system("dnpm-dip/therapy/status-reason")
.display(propertyCatalogue.getByCodeAndVersion(value, version).getShortdesc());
try { try {
resultBuilder.code(MtbTherapyStatusReasonCodingCode.forValue(value)); resultBuilder.code(MtbTherapyStatusReasonCodingCode.forValue(value));
} catch (IOException e) { } catch (IOException e) {
@ -84,7 +95,7 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected MtbSystemicTherapyRecommendationFulfillmentStatusCoding getMtbSystemicTherapyRecommendationFulfillmentStatusCoding(String value) { protected MtbSystemicTherapyRecommendationFulfillmentStatusCoding getMtbSystemicTherapyRecommendationFulfillmentStatusCoding(String value, int version) {
if (value == null || !Arrays.stream(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.values()).map(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.values()).map(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
@ -99,7 +110,7 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected MtbSystemicTherapyCategoryCoding getMtbSystemicTherapyCategoryCoding(String value) { protected MtbSystemicTherapyCategoryCoding getMtbSystemicTherapyCategoryCoding(String value, int version) {
if (value == null || !Arrays.stream(MtbSystemicTherapyCategoryCodingCode.values()).map(MtbSystemicTherapyCategoryCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(MtbSystemicTherapyCategoryCodingCode.values()).map(MtbSystemicTherapyCategoryCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
@ -114,7 +125,7 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected MtbSystemicTherapyDosageDensityCoding getMtbSystemicTherapyDosageDensityCoding(String value) { protected MtbSystemicTherapyDosageDensityCoding getMtbSystemicTherapyDosageDensityCoding(String value, int version) {
if (value == null || !Arrays.stream(MtbSystemicTherapyDosageDensityCodingCode.values()).map(MtbSystemicTherapyDosageDensityCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(MtbSystemicTherapyDosageDensityCodingCode.values()).map(MtbSystemicTherapyDosageDensityCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
@ -129,12 +140,15 @@ public abstract class AbstractKpaTherapieverlaufDataMapper<T> extends AbstractSu
return resultBuilder.build(); return resultBuilder.build();
} }
protected OncoProcedureCoding getOncoProcedureCoding(String value) { protected OncoProcedureCoding getOncoProcedureCoding(String value, int version) {
if (value == null || !Arrays.stream(OncoProcedureCodingCode.values()).map(OncoProcedureCodingCode::toValue).collect(Collectors.toSet()).contains(value)) { if (value == null || !Arrays.stream(OncoProcedureCodingCode.values()).map(OncoProcedureCodingCode::toValue).collect(Collectors.toSet()).contains(value)) {
return null; return null;
} }
var resultBuilder = OncoProcedureCoding.builder(); var resultBuilder = OncoProcedureCoding.builder()
.system("dnpm-dip/therapy/type")
.display(propertyCatalogue.getByCodeAndVersion(value, version).getShortdesc());
try { try {
resultBuilder.code(OncoProcedureCodingCode.forValue(value)); resultBuilder.code(OncoProcedureCodingCode.forValue(value));
} catch (IOException e) { } catch (IOException e) {

40
src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java
View File

@ -3,6 +3,7 @@ package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.mv64e.mtb.OncoProcedure; import dev.pcvolkmer.mv64e.mtb.OncoProcedure;
import dev.pcvolkmer.mv64e.mtb.PeriodDate; import dev.pcvolkmer.mv64e.mtb.PeriodDate;
import dev.pcvolkmer.mv64e.mtb.Reference; import dev.pcvolkmer.mv64e.mtb.Reference;
import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
import dev.pcvolkmer.onco.datamapper.ResultSet; import dev.pcvolkmer.onco.datamapper.ResultSet;
import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue; import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue;
@ -14,8 +15,8 @@ import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue;
*/ */
public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<OncoProcedure> { public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<OncoProcedure> {
public KpaProzedurDataMapper(final ProzedurCatalogue catalogue) { public KpaProzedurDataMapper(final ProzedurCatalogue catalogue, final PropertyCatalogue propertyCatalogue) {
super(catalogue); super(catalogue, propertyCatalogue);
} }
/** /**
@ -45,11 +46,36 @@ public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<
.basedOn(Reference.builder().id(diseases.get(0).getDiseaseId().toString()).build()) .basedOn(Reference.builder().id(diseases.get(0).getDiseaseId().toString()).build())
.recordedOn(resultSet.getDate("erfassungsdatum")) .recordedOn(resultSet.getDate("erfassungsdatum"))
.therapyLine(resultSet.getLong("therapielinie")) .therapyLine(resultSet.getLong("therapielinie"))
.intent(getMtbTherapyIntentCoding(resultSet.getString("intention"))) .intent(
.status(getTherapyStatusCoding(resultSet.getString("status"))) getMtbTherapyIntentCoding(
.statusReason(getMtbTherapyStatusReasonCoding(resultSet.getString("statusgrund"))) resultSet.getString("intention"),
.period(PeriodDate.builder().start(resultSet.getDate("beginn")).end(resultSet.getDate("ende")).build()) resultSet.getInteger("intention_propcat_version")
.code(getOncoProcedureCoding(resultSet.getString("typ"))) )
)
.status(
getTherapyStatusCoding(
resultSet.getString("status"),
resultSet.getInteger("status_propcat_version")
)
)
.statusReason(
getMtbTherapyStatusReasonCoding(
resultSet.getString("statusgrund"),
resultSet.getInteger("statusgrund_propcat_version")
)
)
.period(
PeriodDate.builder()
.start(resultSet.getDate("beginn"))
.end(resultSet.getDate("ende"))
.build()
)
.code(
getOncoProcedureCoding(
resultSet.getString("typ"),
resultSet.getInteger("typ_propcat_version")
)
)
; ;
return builder.build(); return builder.build();
} }

67
src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java
View File

@ -1,6 +1,7 @@
package dev.pcvolkmer.onco.datamapper.mapper; package dev.pcvolkmer.onco.datamapper.mapper;
import dev.pcvolkmer.mv64e.mtb.*; import dev.pcvolkmer.mv64e.mtb.*;
import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
import dev.pcvolkmer.onco.datamapper.ResultSet; import dev.pcvolkmer.onco.datamapper.ResultSet;
import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue; import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -24,13 +25,18 @@ import static org.mockito.Mockito.when;
class KpaProzedurDataMapperTest { class KpaProzedurDataMapperTest {
ProzedurCatalogue catalogue; ProzedurCatalogue catalogue;
PropertyCatalogue propertyCatalogue;
KpaProzedurDataMapper dataMapper; KpaProzedurDataMapper dataMapper;
@BeforeEach @BeforeEach
void setUp(@Mock ProzedurCatalogue catalogue) { void setUp(
@Mock ProzedurCatalogue catalogue,
@Mock PropertyCatalogue propertyCatalogue
) {
this.catalogue = catalogue; this.catalogue = catalogue;
this.dataMapper = new KpaProzedurDataMapper(catalogue); this.propertyCatalogue = propertyCatalogue;
this.dataMapper = new KpaProzedurDataMapper(catalogue, propertyCatalogue);
} }
@Test @Test
@ -74,6 +80,19 @@ class KpaProzedurDataMapperTest {
.when(catalogue) .when(catalogue)
.getDiseases(anyInt()); .getDiseases(anyInt());
doAnswer(invocationOnMock -> {
var testPropertyData = Map.of(
"S", new PropertyCatalogue.Entry("S", "Sonstiges", "Sonstiges"),
"stopped", new PropertyCatalogue.Entry("stopped", "Abgebrochen", "Abgebrochen"),
"patient-death", new PropertyCatalogue.Entry("patient-death", "Tod", "Tod"),
"surgery", new PropertyCatalogue.Entry("surgery", "OP", "OP")
);
var code = invocationOnMock.getArgument(0, String.class);
return testPropertyData.get(code);
}
).when(propertyCatalogue).getByCodeAndVersion(anyString(), anyInt());
var actualList = this.dataMapper.getByParentId(1); var actualList = this.dataMapper.getByParentId(1);
assertThat(actualList).hasSize(1); assertThat(actualList).hasSize(1);
@ -87,19 +106,39 @@ class KpaProzedurDataMapperTest {
.build() .build()
); );
assertThat(actual.getRecordedOn()).isEqualTo(Date.from(Instant.parse("2024-06-19T12:00:00Z"))); assertThat(actual.getRecordedOn()).isEqualTo(Date.from(Instant.parse("2024-06-19T12:00:00Z")));
assertThat(actual.getIntent()).isEqualTo( assertThat(actual.getIntent())
MtbTherapyIntentCoding.builder().code(MtbTherapyIntentCodingCode.S).build() .isEqualTo(
); MtbTherapyIntentCoding.builder()
assertThat(actual.getStatus()).isEqualTo( .code(MtbTherapyIntentCodingCode.S)
TherapyStatusCoding.builder().code(TherapyStatusCodingCode.STOPPED).build() .display("Sonstiges")
); .system("dnpm-dip/therapy/intent")
assertThat(actual.getStatusReason()).isEqualTo( .build()
MtbTherapyStatusReasonCoding.builder().code(MtbTherapyStatusReasonCodingCode.PATIENT_DEATH).build() );
); assertThat(actual.getStatus())
.isEqualTo(
TherapyStatusCoding.builder()
.code(TherapyStatusCodingCode.STOPPED)
.display("Abgebrochen")
.system("dnpm-dip/therapy/status")
.build()
);
assertThat(actual.getStatusReason())
.isEqualTo(
MtbTherapyStatusReasonCoding.builder()
.code(MtbTherapyStatusReasonCodingCode.PATIENT_DEATH)
.display("Tod")
.system("dnpm-dip/therapy/status-reason")
.build()
);
assertThat(actual.getTherapyLine()).isEqualTo(1); assertThat(actual.getTherapyLine()).isEqualTo(1);
assertThat(actual.getCode()).isEqualTo( assertThat(actual.getCode())
OncoProcedureCoding.builder().code(OncoProcedureCodingCode.SURGERY).build() .isEqualTo(
); OncoProcedureCoding.builder()
.code(OncoProcedureCodingCode.SURGERY)
.display("OP")
.system("dnpm-dip/therapy/type")
.build()
);
} }
} }