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 rendering of Timing to not have specific verb

This commit is contained in:
Grahame Grieve 2022-12-05 13:41:01 +11:00
parent 54875fd17e
commit cacf27428e
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
View File

@ -310,7 +310,14 @@ public interface IWorkerContext {
* @throws IOException
* @throws JsonSyntaxException
*/
IContextResourceLoader getNewLoader(NpmPackage npm) throws JsonSyntaxException, IOException;
IContextResourceLoader getNewLoader(NpmPackage npm) throws JsonSyntaxException, IOException;
/**
* called when processing R2 for implicit code systems in ValueSets
*
* @return
*/
List<CodeSystem> getCodeSystems();
}
/**

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

@ -11547,6 +11547,10 @@ The primary difference between a medicationusage and a medicationadministration
return FHIRTypes.VISIONPRESCRIPTION;
if ("Parameters".equals(codeString))
return FHIRTypes.PARAMETERS;
if ("Any".equals(codeString))
return FHIRTypes.RESOURCE;
if ("CapabilityStatement2".equals(codeString))
return FHIRTypes.CAPABILITYSTATEMENT;
throw new IllegalArgumentException("Unknown FHIRTypes code '"+codeString+"'");
}
public Enumeration<FHIRTypes> fromType(Base code) throws FHIRException {

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -1574,7 +1574,7 @@ public class DataRenderer extends Renderer {
if (rep.hasOffset()) {
st = Integer.toString(rep.getOffset())+"min ";
}
b.append("Do "+st);
b.append(st);
for (Enumeration<EventTiming> wh : rep.getWhen())
b.append(displayEventCode(wh.getValue()));
} else {
@ -1592,7 +1592,7 @@ public class DataRenderer extends Renderer {
st = st + "-"+rep.getPeriodMax().toPlainString();
st = st + " "+displayTimeUnits(rep.getPeriodUnit());
}
b.append("Do "+st);
b.append(st);
}
if (rep.hasBoundsPeriod() && rep.getBoundsPeriod().hasEnd())
b.append("Until "+displayDateTime(rep.getBoundsPeriod().getEndElement()));