Skip to content

Fixed issues with using wrong types and not populating actors on net-… #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grahamegrieve merged 4 commits into from
Feb 28, 2026
+28 −11
Merged

Fixed issues with using wrong types and not populating actors on net-… #1255

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a95f30
Fixed issues with using wrong types and not populating actors on net-…
lmckenzi Feb 21, 2026
3dba611
Also handle hierarchical category code systems and abstract category …
lmckenzi Feb 24, 2026
4a05486
Properly handle markdown in summaries
lmckenzi Feb 25, 2026
4fc4ad0
Only generate Requirements resource if there are conformance statements
lmckenzi Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions ...lisher.core/src/main/java/org/hl7/fhir/igtools/publisher/ConformanceStatementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@
import org.hl7.fhir.r5.model.ActorDefinition;
import org.hl7.fhir.r5.model.BooleanType;
import org.hl7.fhir.r5.model.CanonicalType;
import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.Coding;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.Extension;
import org.hl7.fhir.r5.model.IdType;
import org.hl7.fhir.r5.model.ImplementationGuide;
import org.hl7.fhir.r5.model.Requirements;
import org.hl7.fhir.r5.model.StringType;
Expand Down Expand Up @@ -165,6 +167,7 @@ public void setup() {
String valuesetUrl = param.getValue();
ValueSet categoriesVs = context.fetchResource(ValueSet.class, valuesetUrl);
ValueSetExpansionOutcome expansion = context.expandVS(categoriesVs, false, true, 100);
loadCategories(expansion.getValueset().getExpansion().getContains());
for (ValueSetExpansionContainsComponent catCode: expansion.getValueset().getExpansion().getContains()) {
categories.put(catCode.getCode(), new Coding(catCode.getSystem(), catCode.getCode(), catCode.getDisplay()));
}
Expand All @@ -173,6 +176,16 @@ public void setup() {
}
}

private void loadCategories(List<ValueSetExpansionContainsComponent> contains) {
for (ValueSetExpansionContainsComponent cat: contains) {
if (!cat.getAbstract())
categories.put(cat.getCode(), new Coding(cat.getSystem(), cat.getCode(), cat.getDisplay()));
if (cat.hasContains()) {
loadCategories(cat.getContains());
}
}
}

private String translateExpectationEnglish(String expectation) {
if (expectation.equals(Requirements.ConformanceExpectation.SHALL.toCode()))
return rc.formatPhrase(RenderingContext.CONF_SHALL);
Expand Down Expand Up @@ -204,6 +217,8 @@ private String translateExpectation(String expectation) {
}

public void generateRequirementsInstance(List<ValidationMessage> messages) throws IOException {
if (messages.isEmpty())
return;
String reqUrl = this.rootUrl + "Requirements/fromNarrative";
Requirements req = context.fetchResource(Requirements.class, reqUrl);
Map<String, Requirements.RequirementsStatementComponent> oldReq = new HashMap<>();
Expand All @@ -222,13 +237,6 @@ public void generateRequirementsInstance(List<ValidationMessage> messages) throw
mismatch = true;
}
}
req.setActor(new ArrayList<>());
for (ActorDefinition actor: usedActors.values()) {
CanonicalType actorRef = req.addActorElement();
actorRef.setValue(actor.getUrl());
actorRef.addExtension(EXT_REQACTORKEY, new StringType(actor.getId()));
}


} else {
req = new Requirements();
Expand All @@ -239,8 +247,17 @@ public void generateRequirementsInstance(List<ValidationMessage> messages) throw
req.setStatus(PublicationStatus.ACTIVE);
req.setExperimental(false);
req.setDescription(rc.formatPhrase(RenderingContext.CSREQ_DESC));
mismatch = true;
}

if (mismatch) {
req.setActor(new ArrayList<>());
for (ActorDefinition actor: usedActors.values()) {
CanonicalType actorRef = req.addActorElement();
actorRef.setValue(actor.getUrl());
actorRef.addExtension(EXT_REQACTORKEY, new IdType(actor.getId()));
}
}

Map<String, ConformanceClause> primaryClauses = languageClauses.get(defaultLang);
List<String> keyList = new ArrayList<>();
Expand Down Expand Up @@ -282,7 +299,7 @@ public void generateRequirementsInstance(List<ValidationMessage> messages) throw
mismatch = true;
newComp.removeExtension(EXT_CSCAT);
for (Coding category: clause.getCategories()) {
newComp.addExtension(EXT_CSCAT, category);
newComp.addExtension(EXT_CSCAT, new CodeableConcept().addCoding(category));
}
}

Expand All @@ -304,7 +321,7 @@ public void generateRequirementsInstance(List<ValidationMessage> messages) throw
mismatch = true;
newComp.removeExtension(EXT_CSACTOR);
for (ActorDefinition actor: clause.getActors()) {
newComp.addExtension(EXT_CSACTOR, new StringType(actor.getId()));
newComp.addExtension(EXT_CSACTOR, new IdType(actor.getId()));
}
}

Expand Down Expand Up @@ -387,7 +404,7 @@ private boolean matchConfExpect(List<Enumeration<Requirements.ConformanceExpecta

private boolean matchCategories(List<Extension> l1, List<Coding> l2) {
for (int i = 0; i< l1.size(); i++) {
Coding l1Cat = l1.get(i).getValueCoding();
Coding l1Cat = l1.get(i).getValueCodeableConcept().getCodingFirstRep();
if (!l1Cat.equalsDeep(l2.get(i)))
return false;
}
Expand Down Expand Up @@ -526,7 +543,7 @@ private void renderConformanceHome(String lang) throws IOException {
}

if (clause.hasSummary()) {
tr.td().tx(clause.getSummary());
tr.td().markdown(clause.getSummary(), "ConformanceStatementHandler");
} else {
tr.td().getChildNodes().addAll(clause.getNode().getChildNodes());
}
Expand Down