Skip to content

Commit 5d38870

Browse files
committed
fix period
1 parent 3179f55 commit 5d38870

File tree

6 files changed

+159
-145
lines changed

6 files changed

+159
-145
lines changed

src/main/java/org/ehrbase/client/normalizer/Normalizer.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.nedap.archie.rm.RMObject;
2323
import com.nedap.archie.rm.archetyped.Locatable;
2424
import com.nedap.archie.rm.composition.Entry;
25+
import com.nedap.archie.rm.datavalues.quantity.DvInterval;
2526
import com.nedap.archie.rm.generic.PartySelf;
2627
import org.apache.commons.collections4.CollectionUtils;
2728
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -47,6 +48,11 @@ private <T> T normalize(T t, boolean root) {
4748
return null;
4849
}
4950

51+
if (DvInterval.class.isAssignableFrom(t.getClass())) {
52+
((DvInterval) t).setLower(normalize(((DvInterval) t).getLower(), false));
53+
((DvInterval) t).setUpper(normalize(((DvInterval) t).getUpper(), false));
54+
return t.equals(new DvInterval<>()) ? null : t;
55+
}
5056

5157
List<Field> allFields = Arrays.stream(FieldUtils.getAllFields(t.getClass())).collect(Collectors.toList());
5258
boolean empty = allFields.stream().map(f -> normalizeField(f, t)).reduce(!allFields.isEmpty(), (b1, b2) -> b1 && b2);

src/test/java/org/ehrbase/client/TestData.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import com.nedap.archie.rm.datavalues.DvIdentifier;
2020
import com.nedap.archie.rm.datavalues.DvText;
21+
import com.nedap.archie.rm.datavalues.quantity.DvInterval;
22+
import com.nedap.archie.rm.datavalues.quantity.datetime.DvDateTime;
2123
import com.nedap.archie.rm.generic.Participation;
2224
import com.nedap.archie.rm.generic.PartyIdentified;
2325
import com.nedap.archie.rm.generic.PartySelf;
@@ -221,6 +223,11 @@ public static EpisodeOfCareComposition buildEpisodeOfCareComposition() {
221223
episode.setSettingDefiningcode(SettingDefiningcode.NURSINGHOMECARE);
222224

223225
EpisodeofcareAdminEntry episodeofcareAdminEntry = new EpisodeofcareAdminEntry();
226+
227+
DvInterval<DvDateTime> periode = new DvInterval<>();
228+
periode.setLower(new DvDateTime(OffsetDateTime.now()));
229+
periode.setUpper(new DvDateTime(OffsetDateTime.now()));
230+
episodeofcareAdminEntry.setPeriod(periode);
224231
episodeofcareAdminEntry.setLanguage(Language.DE);
225232
episodeofcareAdminEntry.setSubject(new PartySelf());
226233
episodeofcareAdminEntry.setIdentifier(new ArrayList<>());

src/test/java/org/ehrbase/client/classgenerator/examples/episodeofcarecomposition/definition/StatusDefiningcode.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ public enum StatusDefiningcode implements EnumValueSet {
3333
}
3434

3535
public String getValue() {
36-
return this.value;
36+
return this.value;
3737
}
3838

3939
public String getDescription() {
40-
return this.description;
40+
return this.description;
4141
}
4242

4343
public String getTerminologyId() {
44-
return this.terminologyId;
44+
return this.terminologyId;
4545
}
4646

4747
public String getCode() {
48-
return this.code;
48+
return this.code;
4949
}
5050
}

0 commit comments

Comments
 (0)