Fix a regression in Valueset Expansion (#5993)

* Add forgotten ISA

* revert non-standard property behaviour on is-a match type

* Changelog

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5993-valueset-expansion-regression.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 5993
+title: "Corrected a regression in valueset expansion. If a valueset with a non-standard `property` in the filter used the `is-a` operation, the caller would receive `HAPI-2526`. This has been corrected."
+
+

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java

@@ -1452,6 +1452,7 @@ public class TermReadSvcImpl implements ITermReadSvc, IHasScheduledJobs {
 		} else {
 			Term term = new Term(CONCEPT_PROPERTY_PREFIX_NAME + theFilter.getProperty(), value);
 			switch (theFilter.getOp()) {
+				case ISA:
 				case EQUAL:
 					theB.must(theF.match().field(term.field()).matching(term.text()));
 					break;

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/term/ValueSetExpansionR4Test.java

@@ -401,6 +401,7 @@ public class ValueSetExpansionR4Test extends BaseTermR4Test implements IValueSet
 		createConceptsCodeSystemAndValueSet(100);
 	}
 
+
 	public IIdType createConceptsCodeSystemAndValueSet(int theCount) {
 		CodeSystem cs = new CodeSystem();
 		cs.setUrl("http://foo/cs");

hapi-fhir-jpaserver-test-r4/src/test/resources/largecodesystem/ValueSetV.json

@@ -13,7 +13,7 @@
 				"system": "http://hl7.org/fhir/sid/icd-10",
 				"filter": [
 					{
-						"property": "concept",
+						"property": "SCALE_TYP",
 						"op": "is-a",
 						"value": "STI"
 					}