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

fix issues related to R4B generation

This commit is contained in:
Grahame Grieve 2021-03-12 06:28:56 +11:00
parent c9b3df0192
commit 5187fdd398
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations40_50.java
View File

@ -210,6 +210,9 @@ public class Enumerations40_50 extends VersionConvertor_40_50 {
case _4_0_1:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_0_1);
break;
case _4_1_0:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_1_0);
break;
default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL);
break;
@ -292,6 +295,9 @@ public class Enumerations40_50 extends VersionConvertor_40_50 {
case _4_0_1:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_0_1);
break;
case _4_1_0:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_1_0);
break;
default:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL);
break;

16
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
View File

@ -10032,6 +10032,10 @@ The primary difference between a medication statement and a medication administr
* added to help the parsers
*/
_4_0_1,
/**
* R4B - manually added
*/
_4_1_0,
NULL;
public static FHIRVersion fromCode(String codeString) throws FHIRException {
if (codeString == null || "".equals(codeString))
@ -10082,6 +10086,8 @@ The primary difference between a medication statement and a medication administr
return _4_0_0;
if ("4.0.1".equals(codeString))
return _4_0_1;
if ("4.1.0".equals(codeString))
return _4_1_0;
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
}
@Override
@ -10113,6 +10119,7 @@ The primary difference between a medication statement and a medication administr
case _3_5_0: return "3.5.0";
case _4_0_0: return "4.0.0";
case _4_0_1: return "4.0.1";
case _4_1_0: return "4.1.0";
case NULL: return null;
default: return "?";
}
@ -10142,6 +10149,7 @@ The primary difference between a medication statement and a medication administr
case _3_5_0: return "http://hl7.org/fhir/FHIR-version";
case _4_0_0: return "http://hl7.org/fhir/FHIR-version";
case _4_0_1: return "http://hl7.org/fhir/FHIR-version";
case _4_1_0: return "http://hl7.org/fhir/FHIR-version";
case NULL: return null;
default: return "?";
}
@ -10171,6 +10179,7 @@ The primary difference between a medication statement and a medication administr
case _3_5_0: return "R4 Ballot #2.";
case _4_0_0: return "FHIR Release 4 (Normative + STU).";
case _4_0_1: return "FHIR Release 4 Technical Correction #1.";
case _4_1_0: return "FHIR Release 4B";
case NULL: return null;
default: return "?";
}
@ -10200,6 +10209,7 @@ The primary difference between a medication statement and a medication administr
case _3_5_0: return "3.5.0";
case _4_0_0: return "4.0.0";
case _4_0_1: return "4.0.1";
case _4_1_0: return "4.1.0";
case NULL: return null;
default: return "?";
}
@ -10263,6 +10273,8 @@ The primary difference between a medication statement and a medication administr
return FHIRVersion._4_0_0;
if ("4.0.1".equals(codeString))
return FHIRVersion._4_0_1;
if ("4.1.0".equals(codeString))
return FHIRVersion._4_1_0;
throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'");
}
public Enumeration<FHIRVersion> fromType(Base code) throws FHIRException {
@ -10319,6 +10331,8 @@ The primary difference between a medication statement and a medication administr
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0);
if ("4.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1);
if ("4.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0);
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
}
public String toCode(FHIRVersion code) {
@ -10368,6 +10382,8 @@ The primary difference between a medication statement and a medication administr
return "4.0.0";
if (code == FHIRVersion._4_0_1)
return "4.0.1";
if (code == FHIRVersion._4_1_0)
return "4.1.0";
return "?";
}
public String toSystem(FHIRVersion code) {

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -4628,7 +4628,7 @@ public class ProfileUtilities extends TranslatingUtilities {
erow.getSubRows().add(row);
Cell c = gen.new Cell();
row.getCells().add(c);
c.addPiece(gen.new Piece((ed.getBase().getPath().equals(ed.getPath()) ? ref+ed.getPath() : corePath+(VersionUtilities.isThisOrLater("4.1", context.getVersion()) ? "types-definitions.html#"+ed.getBase().getPath() : "element-definitions.html#"+ed.getBase().getPath())), t.getName(), null));
c.addPiece(gen.new Piece((ed.getBase().getPath().equals(ed.getPath()) ? ref+ed.getPath() : corePath+(VersionUtilities.isR5Ver(context.getVersion()) ? "types-definitions.html#"+ed.getBase().getPath() : "element-definitions.html#"+ed.getBase().getPath())), t.getName(), null));
c = gen.new Cell();
row.getCells().add(c);
c.addPiece(gen.new Piece(null, null, null));

1
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
View File

@ -465,4 +465,5 @@ public class VersionUtilities {
return null;
}
}