Skip to content

Commit

Permalink
added unit for value
Browse files Browse the repository at this point in the history
  • Loading branch information
@cfischer27
cfischer27 committed Dec 6, 2024
1 parent 5039b7b commit d721d71
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 173 deletions.
8 changes: 4 additions & 4 deletions ...ain/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,28 +171,28 @@ public List<Observation> map(
.setCode("1")
.setSystem(fhirProperties.getSystems().getUcum())
.setValue(histo.getLKBefallen().intValue())
.setUnit("");
.setUnit("" + "#");
obs_befallen.setValue(value_befallen);
var value_untersucht =
new Quantity()
.setCode("1")
.setSystem(fhirProperties.getSystems().getUcum())
.setValue(histo.getLKUntersucht().intValue())
.setUnit("");
.setUnit("#");
obs_untersucht.setValue(value_untersucht);
var value_befallen_sentinel =
new Quantity()
.setCode("1")
.setSystem(fhirProperties.getSystems().getUcum())
.setValue(histo.getSentinelLKBefallen().intValue())
.setUnit("");
.setUnit("#");
obs_befallen_sentienel.setValue(value_befallen_sentinel);
var value_untersucht_sentinel =
new Quantity()
.setCode("1")
.setSystem(fhirProperties.getSystems().getUcum())
.setValue(histo.getSentinelLKUntersucht().intValue())
.setUnit("");
.setUnit("#");
obs_untersucht_sentinel.setValue(value_untersucht_sentinel);

result.add(obs_befallen);
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static void beforeAll(@Autowired FhirProperties fhirProps) {

@ParameterizedTest
@CsvSource({"Testpatient_1.xml", "Testpatient_2.xml", "Testpatient_3.xml"})
void map_withGivenObds_shouldCreateValidMedicationStatement(String sourceFile)
void map_withGivenObds_shouldCreateValidObservation(String sourceFile)
throws IOException {
final var resource = this.getClass().getClassLoader().getResource("obds3/" + sourceFile);
assertThat(resource).isNotNull();
Expand Down
56 changes: 0 additions & 56 deletions ...map_withGivenObds_shouldCreateValidConditionResource.Testpatient_1.xml.approved.fhir.json
View file

This file was deleted.

56 changes: 0 additions & 56 deletions ...map_withGivenObds_shouldCreateValidConditionResource.Testpatient_2.xml.approved.fhir.json
View file

This file was deleted.

56 changes: 0 additions & 56 deletions ...map_withGivenObds_shouldCreateValidConditionResource.Testpatient_3.xml.approved.fhir.json
View file

This file was deleted.

1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_0.approved.fhir.json → ...tpatient_1.xml.index_0.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 2,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_1.approved.fhir.json → ...tpatient_1.xml.index_1.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 10,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...patient_1.xml.index_10.approved.fhir.json → ...patient_1.xml.index_10.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2021-06-01",
"valueQuantity": {
"value": 1,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...patient_1.xml.index_11.approved.fhir.json → ...patient_1.xml.index_11.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2021-06-01",
"valueQuantity": {
"value": 1,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_2.approved.fhir.json → ...tpatient_1.xml.index_2.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 1,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_3.approved.fhir.json → ...tpatient_1.xml.index_3.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 2,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_4.approved.fhir.json → ...tpatient_1.xml.index_4.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 2,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_5.approved.fhir.json → ...tpatient_1.xml.index_5.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 10,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_6.approved.fhir.json → ...tpatient_1.xml.index_6.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 1,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_7.approved.fhir.json → ...tpatient_1.xml.index_7.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2020-03-05",
"valueQuantity": {
"value": 2,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_8.approved.fhir.json → ...tpatient_1.xml.index_8.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2021-06-01",
"valueQuantity": {
"value": 5,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down
1 change: 1 addition & 0 deletions ...tpatient_1.xml.index_9.approved.fhir.json → ...tpatient_1.xml.index_9.approved.fhir.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"effectiveDateTime": "2021-06-01",
"valueQuantity": {
"value": 5,
"unit": "#",
"system": "http://unitsofmeasure.org",
"code": "1"
}
Expand Down

0 comments on commit d721d71

Please sign in to comment.