mirror of
https://github.com/pcvolkmer/mv64e-onkostar-data.git
synced 2025-07-03 02:52:54 +00:00
feat: add MTB episodes of care
This commit is contained in:
@ -25,7 +25,7 @@ var jsonResult = Converter.toJsonString(mtbMapper.getByCaseId("16000123"));
|
|||||||
| DNPM-Datenmodell 2.1 - Bereich | Status | Anmerkung |
|
| DNPM-Datenmodell 2.1 - Bereich | Status | Anmerkung |
|
||||||
|----------------------------------|--------|----------------------------------------------------------------|
|
|----------------------------------|--------|----------------------------------------------------------------|
|
||||||
| Patient | ✅ | Verwendet Datenbank-ID, keine managing Site |
|
| Patient | ✅ | Verwendet Datenbank-ID, keine managing Site |
|
||||||
| Episoden | | |
|
| Episoden | ✅ | |
|
||||||
| Diagnosen | ✅ | Entsprechend Formularaufbau nur Diagnose der aktuellen Episode |
|
| Diagnosen | ✅ | Entsprechend Formularaufbau nur Diagnose der aktuellen Episode |
|
||||||
| Verwandten-Diagnosen | ✅ | |
|
| Verwandten-Diagnosen | ✅ | |
|
||||||
| Systemische Leitlinien-Therapien | ⌛ | Status noch nicht vollständig in Formular |
|
| Systemische Leitlinien-Therapien | ⌛ | Status noch nicht vollständig in Formular |
|
||||||
|
@ -67,6 +67,7 @@ public class MtbDataMapper implements DataMapper<Mtb> {
|
|||||||
catalogueFactory.catalogue(TumorgradingCatalogue.class),
|
catalogueFactory.catalogue(TumorgradingCatalogue.class),
|
||||||
propertyCatalogue
|
propertyCatalogue
|
||||||
);
|
);
|
||||||
|
var mtbEpisodeDataMapper = new MtbEpisodeDataMapper(kpaCatalogue, propertyCatalogue);
|
||||||
var prozedurMapper = new KpaProzedurDataMapper(
|
var prozedurMapper = new KpaProzedurDataMapper(
|
||||||
catalogueFactory.catalogue(ProzedurCatalogue.class),
|
catalogueFactory.catalogue(ProzedurCatalogue.class),
|
||||||
propertyCatalogue
|
propertyCatalogue
|
||||||
@ -97,6 +98,7 @@ public class MtbDataMapper implements DataMapper<Mtb> {
|
|||||||
|
|
||||||
resultBuilder
|
resultBuilder
|
||||||
.patient(kpaPatient)
|
.patient(kpaPatient)
|
||||||
|
.episodesOfCare(List.of(mtbEpisodeDataMapper.getById(kpaId)))
|
||||||
// DNPM Klinik/Anamnese
|
// DNPM Klinik/Anamnese
|
||||||
.diagnoses(List.of(diagnosisDataMapper.getById(kpaId)))
|
.diagnoses(List.of(diagnosisDataMapper.getById(kpaId)))
|
||||||
.guidelineProcedures(prozedurMapper.getByParentId(kpaId))
|
.guidelineProcedures(prozedurMapper.getByParentId(kpaId))
|
||||||
|
@ -0,0 +1,61 @@
|
|||||||
|
package dev.pcvolkmer.onco.datamapper.mapper;
|
||||||
|
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.MtbEpisodeOfCare;
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.PeriodDate;
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.Reference;
|
||||||
|
import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
|
||||||
|
import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mapper class to load and map patient data from database table 'dk_dnpm_kpa'
|
||||||
|
*
|
||||||
|
* @author Paul-Christian Volkmer
|
||||||
|
* @since 0.1
|
||||||
|
*/
|
||||||
|
public class MtbEpisodeDataMapper implements DataMapper<MtbEpisodeOfCare> {
|
||||||
|
|
||||||
|
private final KpaCatalogue kpaCatalogue;
|
||||||
|
private final PropertyCatalogue propertyCatalogue;
|
||||||
|
|
||||||
|
|
||||||
|
public MtbEpisodeDataMapper(
|
||||||
|
final KpaCatalogue kpaCatalogue,
|
||||||
|
final PropertyCatalogue propertyCatalogue
|
||||||
|
) {
|
||||||
|
this.kpaCatalogue = kpaCatalogue;
|
||||||
|
this.propertyCatalogue = propertyCatalogue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads and maps a ca plan using the database id
|
||||||
|
*
|
||||||
|
* @param id The database id of the procedure data set
|
||||||
|
* @return The loaded Patient data
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public MtbEpisodeOfCare getById(int id) {
|
||||||
|
var kpaData = kpaCatalogue.getById(id);
|
||||||
|
|
||||||
|
var builder = MtbEpisodeOfCare.builder();
|
||||||
|
builder
|
||||||
|
.id(kpaData.getString("id"))
|
||||||
|
.patient(getPatientReference(kpaData.getString("patient_id")))
|
||||||
|
.diagnoses(
|
||||||
|
List.of(
|
||||||
|
Reference.builder()
|
||||||
|
.id(kpaData.getString("id"))
|
||||||
|
.type("Diagnose")
|
||||||
|
.build()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.period(PeriodDate.builder().start(kpaData.getDate("anmeldedatummtb")).build())
|
||||||
|
.build()
|
||||||
|
;
|
||||||
|
return builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,71 @@
|
|||||||
|
package dev.pcvolkmer.onco.datamapper.mapper;
|
||||||
|
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.MtbEpisodeOfCare;
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.PeriodDate;
|
||||||
|
import dev.pcvolkmer.mv64e.mtb.Reference;
|
||||||
|
import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
|
||||||
|
import dev.pcvolkmer.onco.datamapper.ResultSet;
|
||||||
|
import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.Mockito.doAnswer;
|
||||||
|
|
||||||
|
@ExtendWith(MockitoExtension.class)
|
||||||
|
class MtbEpisodeDataMapperTest {
|
||||||
|
|
||||||
|
KpaCatalogue kpaCatalogue;
|
||||||
|
PropertyCatalogue propertyCatalogue;
|
||||||
|
|
||||||
|
MtbEpisodeDataMapper dataMapper;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setUp(
|
||||||
|
@Mock KpaCatalogue kpaCatalogue,
|
||||||
|
@Mock PropertyCatalogue propertyCatalogue
|
||||||
|
) {
|
||||||
|
this.kpaCatalogue = kpaCatalogue;
|
||||||
|
this.propertyCatalogue = propertyCatalogue;
|
||||||
|
this.dataMapper = new MtbEpisodeDataMapper(kpaCatalogue, propertyCatalogue);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void shouldMapData() {
|
||||||
|
final Map<String, Object> kpaData = Map.of(
|
||||||
|
"id", 4711,
|
||||||
|
"patient_id", 42,
|
||||||
|
"anmeldedatummtb", new java.sql.Date(Date.from(Instant.parse("2025-06-28T12:00:00Z")).getTime())
|
||||||
|
);
|
||||||
|
|
||||||
|
doAnswer(invocationOnMock -> ResultSet.from(kpaData))
|
||||||
|
.when(kpaCatalogue)
|
||||||
|
.getById(anyInt());
|
||||||
|
|
||||||
|
var actual = this.dataMapper.getById(1);
|
||||||
|
assertThat(actual).isInstanceOf(MtbEpisodeOfCare.class);
|
||||||
|
assertThat(actual.getId()).isEqualTo("4711");
|
||||||
|
assertThat(actual.getPatient())
|
||||||
|
.isEqualTo(Reference.builder().id("42").type("Patient").build());
|
||||||
|
|
||||||
|
assertThat(actual.getDiagnoses())
|
||||||
|
.hasSize(1);
|
||||||
|
assertThat(actual.getDiagnoses().get(0))
|
||||||
|
.isEqualTo(Reference.builder().id("4711").type("Diagnose").build());
|
||||||
|
|
||||||
|
assertThat(actual.getPeriod())
|
||||||
|
.isEqualTo(
|
||||||
|
// UTC day start!
|
||||||
|
PeriodDate.builder().start(Date.from(Instant.parse("2025-06-28T00:00:00Z"))).build()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user