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

Two model fixes

This commit is contained in:
jamesagnew 2020-05-11 08:05:36 -04:00
parent daa58aea8f
commit 7c81ebce56
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java
View File

@ -52,14 +52,12 @@ package org.hl7.fhir.r5.model;
*/ */
import org.hl7.fhir.instance.model.api.IBaseIntegerDatatype;
import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.DatatypeDef;
/** /**
* Primitive type "integer" in FHIR: A signed 32-bit integer * Primitive type "integer" in FHIR: A signed 32-bit integer
*/ */
@DatatypeDef(name = "integer") @DatatypeDef(name = "integer64")
public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ { public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ {
private static final long serialVersionUID = 3L; private static final long serialVersionUID = 3L;

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java
View File

@ -209,7 +209,7 @@ public class Narrative extends BaseNarrative implements INarrative {
/** /**
* The actual narrative content, a stripped down version of XHTML. * The actual narrative content, a stripped down version of XHTML.
*/ */
@Child(name = "div", type = {XhtmlType.class}, order=1, min=1, max=1, modifier=false, summary=false) @Child(name = "div", type = {XhtmlNode.class}, order=1, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="Limited xhtml content", formalDefinition="The actual narrative content, a stripped down version of XHTML." ) @Description(shortDefinition="Limited xhtml content", formalDefinition="The actual narrative content, a stripped down version of XHTML." )
protected XhtmlNode div; protected XhtmlNode div;