Skip to content

Commit 984ba82

Browse files
author
Christian Ohr
committed
#502: add "creation" search parameter
1 parent 5c7e687 commit 984ba82

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

‎commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti67/Iti67ResourceProvider.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import ca.uhn.fhir.rest.api.SortSpec;
2828
import ca.uhn.fhir.rest.api.server.IBundleProvider;
2929
import ca.uhn.fhir.rest.api.server.RequestDetails;
30+
import ca.uhn.fhir.rest.param.DateParam;
3031
import ca.uhn.fhir.rest.param.DateRangeParam;
3132
import ca.uhn.fhir.rest.param.ReferenceAndListParam;
3233
import ca.uhn.fhir.rest.param.ReferenceOrListParam;
@@ -69,13 +70,15 @@ public class Iti67ResourceProvider extends AbstractPlainProvider {
6970
private static final String STU3_RELATED_ID = "related-id";
7071
private static final String STU3_RELATED_REF = "related-ref";
7172
private static final String STU3_SECURITY_LABEL = "securitylabel";
73+
private static final String SP_CREATION = "creation";
7274

7375
@SuppressWarnings("unused")
7476
@Search(type = DocumentReference.class)
7577
public IBundleProvider documentReferenceSearch(
7678
@RequiredParam(name = DocumentReference.SP_PATIENT, chainWhitelist = {"", Patient.SP_IDENTIFIER}) ReferenceParam patient,
7779
@OptionalParam(name = DocumentReference.SP_STATUS) TokenOrListParam status,
7880
@OptionalParam(name = DocumentReference.SP_IDENTIFIER) TokenParam identifier,
81+
@OptionalParam(name = SP_CREATION) DateParam creation,
7982
@OptionalParam(name = DocumentReference.SP_DATE) DateRangeParam date,
8083
@OptionalParam(name = STU3_INDEXED) DateRangeParam indexed,
8184
@OptionalParam(name = DocumentReference.SP_AUTHOR, chainWhitelist = { Practitioner.SP_FAMILY, Practitioner.SP_GIVEN, Practitioner.SP_IDENTIFIER }) ReferenceAndListParam author,
@@ -126,6 +129,7 @@ public IBundleProvider documentReferenceSearch(
126129
var searchParameters = Iti67SearchParameters.builder()
127130
.status(status)
128131
.identifier(identifier)
132+
.creation(creation)
129133
.date(dateParam)
130134
.category(categoryParam)
131135
.type(type)

‎commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti67/Iti67SearchParameters.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import ca.uhn.fhir.context.FhirContext;
2020
import ca.uhn.fhir.model.api.Include;
2121
import ca.uhn.fhir.rest.api.SortSpec;
22+
import ca.uhn.fhir.rest.param.DateParam;
2223
import ca.uhn.fhir.rest.param.DateRangeParam;
2324
import ca.uhn.fhir.rest.param.ReferenceAndListParam;
2425
import ca.uhn.fhir.rest.param.ReferenceOrListParam;
@@ -57,6 +58,7 @@ public class Iti67SearchParameters extends FhirSearchAndSortParameters<DocumentR
5758

5859
@Getter @Setter private ReferenceParam patientReference;
5960
@Getter @Setter private TokenParam patientIdentifier;
61+
@Getter @Setter private DateParam creation;
6062
@Getter @Setter private DateRangeParam date;
6163
@Getter @Setter private StringParam authorFamilyName;
6264
@Getter @Setter private StringParam authorGivenName;

‎commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti67/Iti67StrictResourceProvider.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@
2727
import ca.uhn.fhir.rest.api.SortSpec;
2828
import ca.uhn.fhir.rest.api.server.IBundleProvider;
2929
import ca.uhn.fhir.rest.api.server.RequestDetails;
30+
import ca.uhn.fhir.rest.param.DateParam;
3031
import ca.uhn.fhir.rest.param.DateRangeParam;
3132
import ca.uhn.fhir.rest.param.ReferenceAndListParam;
3233
import ca.uhn.fhir.rest.param.ReferenceOrListParam;
3334
import ca.uhn.fhir.rest.param.ReferenceParam;
3435
import ca.uhn.fhir.rest.param.TokenOrListParam;
3536
import ca.uhn.fhir.rest.param.TokenParam;
3637
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
38+
import jakarta.servlet.http.HttpServletRequest;
39+
import jakarta.servlet.http.HttpServletResponse;
3740
import org.hl7.fhir.instance.model.api.IAnyResource;
3841
import org.hl7.fhir.r4.model.DocumentReference;
3942
import org.hl7.fhir.r4.model.IdType;
@@ -42,8 +45,6 @@
4245
import org.hl7.fhir.r4.model.ResourceType;
4346
import org.openehealth.ipf.commons.ihe.fhir.AbstractPlainProvider;
4447

45-
import jakarta.servlet.http.HttpServletRequest;
46-
import jakarta.servlet.http.HttpServletResponse;
4748
import java.util.Set;
4849

4950
/**
@@ -54,13 +55,15 @@
5455
*/
5556
public class Iti67StrictResourceProvider extends AbstractPlainProvider {
5657

58+
private static final String SP_CREATION = "creation";
5759

5860
@SuppressWarnings("unused")
5961
@Search(type = DocumentReference.class)
6062
public IBundleProvider documentReferenceSearch(
6163
@RequiredParam(name = DocumentReference.SP_PATIENT, chainWhitelist = {"", Patient.SP_IDENTIFIER}) ReferenceParam patient,
6264
@RequiredParam(name = DocumentReference.SP_STATUS) TokenOrListParam status,
6365
@OptionalParam(name = DocumentReference.SP_IDENTIFIER) TokenParam identifier,
66+
@OptionalParam(name = SP_CREATION) DateParam creation,
6467
@OptionalParam(name = DocumentReference.SP_DATE) DateRangeParam date,
6568
@OptionalParam(name = DocumentReference.SP_AUTHOR, chainWhitelist = { Practitioner.SP_FAMILY, Practitioner.SP_GIVEN }) ReferenceAndListParam author,
6669
@OptionalParam(name = DocumentReference.SP_CATEGORY) TokenOrListParam category,
@@ -103,6 +106,7 @@ public IBundleProvider documentReferenceSearch(
103106
var searchParameters = Iti67SearchParameters.builder()
104107
.status(status)
105108
.identifier(identifier)
109+
.creation(creation)
106110
.date(date)
107111
.category(category)
108112
.type(type)

0 commit comments

Comments
 (0)