honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #360 from ItayGoren/bugfix-convertTimingRepeatComponent 

fixed bug in conversion from dstu2 to r4 in timing resource
This commit is contained in:
Grahame Grieve 2020-10-07 06:23:37 +11:00 committed by GitHub
parent 1f583d6ba7 a8b715af97
commit accec7ef5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
View File

@ -2023,15 +2023,18 @@ public class VersionConvertor_10_40 {
copyElement(src, tgt); copyElement(src, tgt);
if (src.hasBounds()) if (src.hasBounds())
tgt.setBounds(convertType(src.getBounds())); tgt.setBounds(convertType(src.getBounds()));
tgt.setCount(src.getCount()); if (src.hasCount())
tgt.setCount(src.getCount());
if (src.hasDurationElement()) if (src.hasDurationElement())
tgt.setDurationElement(convertDecimal(src.getDurationElement())); tgt.setDurationElement(convertDecimal(src.getDurationElement()));
if (src.hasDurationMaxElement()) if (src.hasDurationMaxElement())
tgt.setDurationMaxElement(convertDecimal(src.getDurationMaxElement())); tgt.setDurationMaxElement(convertDecimal(src.getDurationMaxElement()));
if (src.hasDurationUnits()) if (src.hasDurationUnits())
tgt.setDurationUnitElement(convertUnitsOfTime(src.getDurationUnitsElement())); tgt.setDurationUnitElement(convertUnitsOfTime(src.getDurationUnitsElement()));
tgt.setFrequency(src.getFrequency()); if (src.hasFrequency())
tgt.setFrequencyMax(src.getFrequencyMax()); tgt.setFrequency(src.getFrequency());
if (src.hasFrequencyMax())
tgt.setFrequencyMax(src.getFrequencyMax());
if (src.hasPeriodElement()) if (src.hasPeriodElement())
tgt.setPeriodElement(convertDecimal(src.getPeriodElement())); tgt.setPeriodElement(convertDecimal(src.getPeriodElement()));
if (src.hasPeriodMaxElement()) if (src.hasPeriodMaxElement())
@ -2051,15 +2054,18 @@ public class VersionConvertor_10_40 {
copyElement(src, tgt); copyElement(src, tgt);
if (src.hasBounds()) if (src.hasBounds())
tgt.setBounds(convertType(src.getBounds())); tgt.setBounds(convertType(src.getBounds()));
tgt.setCount(src.getCount()); if (src.hasCount())
tgt.setCount(src.getCount());
if (src.hasDurationElement()) if (src.hasDurationElement())
tgt.setDurationElement(convertDecimal(src.getDurationElement())); tgt.setDurationElement(convertDecimal(src.getDurationElement()));
if (src.hasDurationMaxElement()) if (src.hasDurationMaxElement())
tgt.setDurationMaxElement(convertDecimal(src.getDurationMaxElement())); tgt.setDurationMaxElement(convertDecimal(src.getDurationMaxElement()));
if (src.hasDurationUnit()) if (src.hasDurationUnit())
tgt.setDurationUnitsElement(convertUnitsOfTime(src.getDurationUnitElement())); tgt.setDurationUnitsElement(convertUnitsOfTime(src.getDurationUnitElement()));
tgt.setFrequency(src.getFrequency()); if (src.hasFrequency())
tgt.setFrequencyMax(src.getFrequencyMax()); tgt.setFrequency(src.getFrequency());
if (src.hasFrequencyMax())
tgt.setFrequencyMax(src.getFrequencyMax());
if (src.hasPeriodElement()) if (src.hasPeriodElement())
tgt.setPeriodElement(convertDecimal(src.getPeriodElement())); tgt.setPeriodElement(convertDecimal(src.getPeriodElement()));
if (src.hasPeriodMaxElement()) if (src.hasPeriodMaxElement())

2
org.hl7.fhir.convertors/src/test/resources/0_medication_request_40.json
View File

@ -18,9 +18,7 @@
"dosageInstruction": [{"text": "Take 10 mg by mouth nightly.", "dosageInstruction": [{"text": "Take 10 mg by mouth nightly.",
"timing": {"repeat": {"boundsPeriod": {"start": "2016-11-15T00:00:00Z", "timing": {"repeat": {"boundsPeriod": {"start": "2016-11-15T00:00:00Z",
"end": "2016-11-23T00:00:00Z"}, "end": "2016-11-23T00:00:00Z"},
"count": 0,
"frequency": 1, "frequency": 1,
"frequencyMax": 0,
"period": 1.0, "period": 1.0,
"periodUnit": "d"}}, "periodUnit": "d"}},
"asNeededBoolean": "False", "asNeededBoolean": "False",