Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts: hapi-fhir-base/src/changes/changes.xml
This commit is contained in:
James Agnew
commit
efb14397df
|
|
@ -8,6 +8,24 @@
|
|||
<body>
|
||||
<release version="0.5" date="TBD">
|
||||
<action type="add">
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
RESTful search method parameters have been overhauled to reduce confusing duplicate names and
|
||||
having multiple ways of accomplishing the same thing. This means that a number of existing classes
|
||||
have been deprocated in favour of new naming schemes.
|
||||
<![CDATA[<br/><br/>]]>
|
||||
All annotation-based clients and all server search method parameters are now named
|
||||
(type)Param, for example: StringParam, TokenParam, etc.
|
||||
<![CDATA[<br/><br/>]]>
|
||||
All generic/fluent client method parameters are now named
|
||||
(type)ClientParam, for example: StringClientParam, TokenClientParam, etc.
|
||||
<![CDATA[<br/><br/>]]>
|
||||
All renamed classes have been retained and deprocated, so this change should not cause any issues
|
||||
for existing applications but those applications should be refactored to use the
|
||||
new parameters when possible.
|
||||
</action>
|
||||
<action type="add">
|
||||
>>>>>>> af3c35cbc07df69c760e200b4a80f4bcc3d183e9
|
||||
Allow server methods to return wildcard generic types (e.g. List<? extends IResource>)
|
||||
</action>
|
||||
<action type="add">
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class AdverseReaction extends BaseResource implements IResource {
|
|||
* Path: <b>AdverseReaction.symptom.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SYMPTOM = new TokenParam(SP_SYMPTOM);
|
||||
public static final TokenClientParam SYMPTOM = new TokenClientParam(SP_SYMPTOM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>substance</b>
|
||||
|
|
@ -131,7 +131,7 @@ public class AdverseReaction extends BaseResource implements IResource {
|
|||
* Path: <b>AdverseReaction.exposure.substance</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
|
||||
public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -158,7 +158,7 @@ public class AdverseReaction extends BaseResource implements IResource {
|
|||
* Path: <b>AdverseReaction.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -179,7 +179,7 @@ public class AdverseReaction extends BaseResource implements IResource {
|
|||
* Path: <b>AdverseReaction.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -100,7 +100,7 @@ public class Alert extends BaseResource implements IResource {
|
|||
* Path: <b>Alert.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.sensitivityType</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>substance</b>
|
||||
|
|
@ -126,7 +126,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.substance</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
|
||||
public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -153,7 +153,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.recordedDate</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -222,7 +222,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
|
|||
* Path: <b>AllergyIntolerance.recorder</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RECORDER = new ReferenceParam(SP_RECORDER);
|
||||
public static final ReferenceClientParam RECORDER = new ReferenceClientParam(SP_RECORDER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -64,10 +64,10 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
|
|||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -112,7 +112,7 @@ public class Appointment extends BaseResource implements IResource {
|
|||
* Path: <b>Appointment.start</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -133,7 +133,7 @@ public class Appointment extends BaseResource implements IResource {
|
|||
* Path: <b>Appointment.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam STATUS = new StringParam(SP_STATUS);
|
||||
public static final StringClientParam STATUS = new StringClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -154,7 +154,7 @@ public class Appointment extends BaseResource implements IResource {
|
|||
* Path: <b>Appointment.participant.individual</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -181,7 +181,7 @@ public class Appointment extends BaseResource implements IResource {
|
|||
* Path: <b>Appointment.participant.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PARTSTATUS = new TokenParam(SP_PARTSTATUS);
|
||||
public static final TokenClientParam PARTSTATUS = new TokenClientParam(SP_PARTSTATUS);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
|
|||
* Path: <b>AppointmentResponse.participantStatus</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PARTSTATUS = new StringParam(SP_PARTSTATUS);
|
||||
public static final StringClientParam PARTSTATUS = new StringClientParam(SP_PARTSTATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -127,7 +127,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
|
|||
* Path: <b>AppointmentResponse.individual</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -154,7 +154,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
|
|||
* Path: <b>AppointmentResponse.appointment</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam APPOINTMENT = new ReferenceParam(SP_APPOINTMENT);
|
||||
public static final ReferenceClientParam APPOINTMENT = new ReferenceClientParam(SP_APPOINTMENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -102,7 +102,7 @@ public class Availability extends BaseResource implements IResource {
|
|||
* Path: <b>Availability.individual</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam INDIVIDUAL = new ReferenceParam(SP_INDIVIDUAL);
|
||||
public static final ReferenceClientParam INDIVIDUAL = new ReferenceClientParam(SP_INDIVIDUAL);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -129,7 +129,7 @@ public class Availability extends BaseResource implements IResource {
|
|||
* Path: <b>Availability.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE);
|
||||
public static final TokenClientParam SLOTTYPE = new TokenClientParam(SP_SLOTTYPE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -71,9 +71,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IdrefDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -118,7 +118,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -145,7 +145,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.concern</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam CONDITION = new ReferenceParam(SP_CONDITION);
|
||||
public static final ReferenceClientParam CONDITION = new ReferenceClientParam(SP_CONDITION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -172,7 +172,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.period</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>participant</b>
|
||||
|
|
@ -193,7 +193,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.participant.member</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PARTICIPANT = new ReferenceParam(SP_PARTICIPANT);
|
||||
public static final ReferenceClientParam PARTICIPANT = new ReferenceClientParam(SP_PARTICIPANT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -220,7 +220,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.activity.simple.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACTIVITYCODE = new TokenParam(SP_ACTIVITYCODE);
|
||||
public static final TokenClientParam ACTIVITYCODE = new TokenClientParam(SP_ACTIVITYCODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>activitydate</b>
|
||||
|
|
@ -241,7 +241,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.activity.simple.timing[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam ACTIVITYDATE = new DateParam(SP_ACTIVITYDATE);
|
||||
public static final DateClientParam ACTIVITYDATE = new DateClientParam(SP_ACTIVITYDATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>activitydetail</b>
|
||||
|
|
@ -262,7 +262,7 @@ public class CarePlan extends BaseResource implements IResource {
|
|||
* Path: <b>CarePlan.activity.detail</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ACTIVITYDETAIL = new ReferenceParam(SP_ACTIVITYDETAIL);
|
||||
public static final ReferenceClientParam ACTIVITYDETAIL = new ReferenceClientParam(SP_ACTIVITYDETAIL);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import ca.uhn.fhir.model.primitive.DateDt;
|
|||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -108,7 +108,7 @@ public class Claim extends BaseResource implements IResource {
|
|||
* Path: <b>Claim.number</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NUMBER = new TokenParam(SP_NUMBER);
|
||||
public static final TokenClientParam NUMBER = new TokenClientParam(SP_NUMBER);
|
||||
|
||||
|
||||
@Child(name="number", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>class</b>
|
||||
|
|
@ -132,7 +132,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.class</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CLASS = new TokenParam(SP_CLASS);
|
||||
public static final TokenClientParam CLASS = new TokenClientParam(SP_CLASS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -201,7 +201,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.author</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
|
||||
public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -228,7 +228,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.attester.party</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ATTESTER = new ReferenceParam(SP_ATTESTER);
|
||||
public static final ReferenceClientParam ATTESTER = new ReferenceClientParam(SP_ATTESTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -255,7 +255,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.event.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CONTEXT = new TokenParam(SP_CONTEXT);
|
||||
public static final TokenClientParam CONTEXT = new TokenClientParam(SP_CONTEXT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>section-type</b>
|
||||
|
|
@ -276,7 +276,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.section.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SECTION_TYPE = new TokenParam(SP_SECTION_TYPE);
|
||||
public static final TokenClientParam SECTION_TYPE = new TokenClientParam(SP_SECTION_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>section-content</b>
|
||||
|
|
@ -297,7 +297,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.section.content</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SECTION_CONTENT = new ReferenceParam(SP_SECTION_CONTENT);
|
||||
public static final ReferenceClientParam SECTION_CONTENT = new ReferenceClientParam(SP_SECTION_CONTENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -324,7 +324,7 @@ public class Composition extends BaseResource implements IResource {
|
|||
* Path: <b>Composition.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -63,10 +63,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>version</b>
|
||||
|
|
@ -132,7 +132,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.version</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
|
||||
public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>publisher</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.publisher</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
|
||||
public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>description</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -216,7 +216,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -237,7 +237,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>source</b>
|
||||
|
|
@ -258,7 +258,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.source</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
|
||||
public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -285,7 +285,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
|
||||
public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -312,7 +312,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.concept.map.system</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM);
|
||||
public static final TokenClientParam SYSTEM = new TokenClientParam(SP_SYSTEM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dependson</b>
|
||||
|
|
@ -333,7 +333,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.concept.dependsOn.concept</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DEPENDSON = new TokenParam(SP_DEPENDSON);
|
||||
public static final TokenClientParam DEPENDSON = new TokenClientParam(SP_DEPENDSON);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>product</b>
|
||||
|
|
@ -354,7 +354,7 @@ public class ConceptMap extends BaseResource implements IResource {
|
|||
* Path: <b>ConceptMap.concept.map.product.concept</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PRODUCT = new TokenParam(SP_PRODUCT);
|
||||
public static final TokenClientParam PRODUCT = new TokenClientParam(SP_PRODUCT);
|
||||
|
||||
|
||||
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -112,7 +112,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -133,7 +133,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>severity</b>
|
||||
|
|
@ -154,7 +154,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.severity</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SEVERITY = new TokenParam(SP_SEVERITY);
|
||||
public static final TokenClientParam SEVERITY = new TokenClientParam(SP_SEVERITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>category</b>
|
||||
|
|
@ -175,7 +175,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.category</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CATEGORY = new TokenParam(SP_CATEGORY);
|
||||
public static final TokenClientParam CATEGORY = new TokenClientParam(SP_CATEGORY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>onset</b>
|
||||
|
|
@ -196,7 +196,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.onset[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam ONSET = new DateParam(SP_ONSET);
|
||||
public static final DateClientParam ONSET = new DateClientParam(SP_ONSET);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -217,7 +217,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -244,7 +244,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.encounter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
|
||||
public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -271,7 +271,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.asserter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ASSERTER = new ReferenceParam(SP_ASSERTER);
|
||||
public static final ReferenceClientParam ASSERTER = new ReferenceClientParam(SP_ASSERTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -298,7 +298,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.dateAsserted</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE_ASSERTED = new DateParam(SP_DATE_ASSERTED);
|
||||
public static final DateClientParam DATE_ASSERTED = new DateClientParam(SP_DATE_ASSERTED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>evidence</b>
|
||||
|
|
@ -319,7 +319,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.evidence.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EVIDENCE = new TokenParam(SP_EVIDENCE);
|
||||
public static final TokenClientParam EVIDENCE = new TokenClientParam(SP_EVIDENCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>location</b>
|
||||
|
|
@ -340,7 +340,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.location.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam LOCATION = new TokenParam(SP_LOCATION);
|
||||
public static final TokenClientParam LOCATION = new TokenClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>related-item</b>
|
||||
|
|
@ -361,7 +361,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.relatedItem.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RELATED_ITEM = new ReferenceParam(SP_RELATED_ITEM);
|
||||
public static final ReferenceClientParam RELATED_ITEM = new ReferenceClientParam(SP_RELATED_ITEM);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -388,7 +388,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.stage.summary</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STAGE = new TokenParam(SP_STAGE);
|
||||
public static final TokenClientParam STAGE = new TokenClientParam(SP_STAGE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>related-code</b>
|
||||
|
|
@ -409,7 +409,7 @@ public class Condition extends BaseResource implements IResource {
|
|||
* Path: <b>Condition.relatedItem.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RELATED_CODE = new TokenParam(SP_RELATED_CODE);
|
||||
public static final TokenClientParam RELATED_CODE = new TokenClientParam(SP_RELATED_CODE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -77,10 +77,10 @@ import ca.uhn.fhir.model.primitive.IdDt;
|
|||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -125,7 +125,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>version</b>
|
||||
|
|
@ -146,7 +146,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.version</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
|
||||
public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -167,7 +167,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>publisher</b>
|
||||
|
|
@ -188,7 +188,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.publisher</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
|
||||
public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>description</b>
|
||||
|
|
@ -209,7 +209,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -230,7 +230,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -251,7 +251,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>software</b>
|
||||
|
|
@ -272,7 +272,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.software.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam SOFTWARE = new StringParam(SP_SOFTWARE);
|
||||
public static final StringClientParam SOFTWARE = new StringClientParam(SP_SOFTWARE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>fhirversion</b>
|
||||
|
|
@ -293,7 +293,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.version</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FHIRVERSION = new TokenParam(SP_FHIRVERSION);
|
||||
public static final TokenClientParam FHIRVERSION = new TokenClientParam(SP_FHIRVERSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>resource</b>
|
||||
|
|
@ -314,7 +314,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.rest.resource.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RESOURCE = new TokenParam(SP_RESOURCE);
|
||||
public static final TokenClientParam RESOURCE = new TokenClientParam(SP_RESOURCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>event</b>
|
||||
|
|
@ -335,7 +335,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.messaging.event.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EVENT = new TokenParam(SP_EVENT);
|
||||
public static final TokenClientParam EVENT = new TokenClientParam(SP_EVENT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>mode</b>
|
||||
|
|
@ -356,7 +356,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.rest.mode</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam MODE = new TokenParam(SP_MODE);
|
||||
public static final TokenClientParam MODE = new TokenClientParam(SP_MODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>profile</b>
|
||||
|
|
@ -377,7 +377,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.rest.resource.profile</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PROFILE = new ReferenceParam(SP_PROFILE);
|
||||
public static final ReferenceClientParam PROFILE = new ReferenceClientParam(SP_PROFILE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -404,7 +404,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.format</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FORMAT = new TokenParam(SP_FORMAT);
|
||||
public static final TokenClientParam FORMAT = new TokenClientParam(SP_FORMAT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>security</b>
|
||||
|
|
@ -425,7 +425,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.rest.security</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SECURITY = new TokenParam(SP_SECURITY);
|
||||
public static final TokenClientParam SECURITY = new TokenClientParam(SP_SECURITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>supported-profile</b>
|
||||
|
|
@ -446,7 +446,7 @@ public class Conformance extends BaseResource implements IResource {
|
|||
* Path: <b>Conformance.profile</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUPPORTED_PROFILE = new ReferenceParam(SP_SUPPORTED_PROFILE);
|
||||
public static final ReferenceClientParam SUPPORTED_PROFILE = new ReferenceClientParam(SP_SUPPORTED_PROFILE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.issuer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ISSUER = new ReferenceParam(SP_ISSUER);
|
||||
public static final ReferenceClientParam ISSUER = new ReferenceClientParam(SP_ISSUER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -134,7 +134,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>type</b>
|
||||
|
|
@ -155,7 +155,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>plan</b>
|
||||
|
|
@ -176,7 +176,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.plan</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PLAN = new TokenParam(SP_PLAN);
|
||||
public static final TokenClientParam PLAN = new TokenClientParam(SP_PLAN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subplan</b>
|
||||
|
|
@ -197,7 +197,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.subplan</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SUBPLAN = new TokenParam(SP_SUBPLAN);
|
||||
public static final TokenClientParam SUBPLAN = new TokenClientParam(SP_SUBPLAN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>group</b>
|
||||
|
|
@ -218,7 +218,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.group</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam GROUP = new TokenParam(SP_GROUP);
|
||||
public static final TokenClientParam GROUP = new TokenClientParam(SP_GROUP);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dependent</b>
|
||||
|
|
@ -239,7 +239,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.dependent</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DEPENDENT = new TokenParam(SP_DEPENDENT);
|
||||
public static final TokenClientParam DEPENDENT = new TokenClientParam(SP_DEPENDENT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>sequence</b>
|
||||
|
|
@ -260,7 +260,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.sequence</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SEQUENCE = new TokenParam(SP_SEQUENCE);
|
||||
public static final TokenClientParam SEQUENCE = new TokenClientParam(SP_SEQUENCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -281,7 +281,7 @@ public class Coverage extends BaseResource implements IResource {
|
|||
* Path: <b>Coverage.subscriber.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NAME = new TokenParam(SP_NAME);
|
||||
public static final TokenClientParam NAME = new TokenClientParam(SP_NAME);
|
||||
|
||||
|
||||
@Child(name="issuer", order=0, min=0, max=1, type={
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
|||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>manufacturer</b>
|
||||
|
|
@ -126,7 +126,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.manufacturer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam MANUFACTURER = new StringParam(SP_MANUFACTURER);
|
||||
public static final StringClientParam MANUFACTURER = new StringClientParam(SP_MANUFACTURER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>model</b>
|
||||
|
|
@ -147,7 +147,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.model</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam MODEL = new StringParam(SP_MODEL);
|
||||
public static final StringClientParam MODEL = new StringClientParam(SP_MODEL);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>organization</b>
|
||||
|
|
@ -168,7 +168,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.owner</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION);
|
||||
public static final ReferenceClientParam ORGANIZATION = new ReferenceClientParam(SP_ORGANIZATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -195,7 +195,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>location</b>
|
||||
|
|
@ -216,7 +216,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.location</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
|
||||
public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -243,7 +243,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -270,7 +270,7 @@ public class Device extends BaseResource implements IResource {
|
|||
* Path: <b>Device.udi</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam UDI = new StringParam(SP_UDI);
|
||||
public static final StringClientParam UDI = new StringClientParam(SP_UDI);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
|||
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
||||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -103,7 +103,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
|
|||
* Path: <b>DeviceObservationReport.source</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
|
||||
public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -130,7 +130,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
|
|||
* Path: <b>DeviceObservationReport.virtualDevice.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>channel</b>
|
||||
|
|
@ -151,7 +151,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
|
|||
* Path: <b>DeviceObservationReport.virtualDevice.channel.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CHANNEL = new TokenParam(SP_CHANNEL);
|
||||
public static final TokenClientParam CHANNEL = new TokenClientParam(SP_CHANNEL);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>observation</b>
|
||||
|
|
@ -172,7 +172,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
|
|||
* Path: <b>DeviceObservationReport.virtualDevice.channel.metric.observation</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam OBSERVATION = new ReferenceParam(SP_OBSERVATION);
|
||||
public static final ReferenceClientParam OBSERVATION = new ReferenceClientParam(SP_OBSERVATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -199,7 +199,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
|
|||
* Path: <b>DeviceObservationReport.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -62,10 +62,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ACTOR = new ReferenceParam(SP_ACTOR);
|
||||
public static final ReferenceClientParam ACTOR = new ReferenceClientParam(SP_ACTOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -143,7 +143,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.item.bodySite</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE);
|
||||
public static final TokenClientParam BODYSITE = new TokenClientParam(SP_BODYSITE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -164,7 +164,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.item.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>event-date</b>
|
||||
|
|
@ -185,7 +185,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.event.dateTime</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam EVENT_DATE = new DateParam(SP_EVENT_DATE);
|
||||
public static final DateClientParam EVENT_DATE = new DateClientParam(SP_EVENT_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>encounter</b>
|
||||
|
|
@ -206,7 +206,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.encounter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
|
||||
public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -233,7 +233,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>item-date</b>
|
||||
|
|
@ -254,7 +254,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.item.event.dateTime</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam ITEM_DATE = new DateParam(SP_ITEM_DATE);
|
||||
public static final DateClientParam ITEM_DATE = new DateClientParam(SP_ITEM_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>item-past-status</b>
|
||||
|
|
@ -275,7 +275,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.item.event.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ITEM_PAST_STATUS = new TokenParam(SP_ITEM_PAST_STATUS);
|
||||
public static final TokenClientParam ITEM_PAST_STATUS = new TokenClientParam(SP_ITEM_PAST_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>item-status</b>
|
||||
|
|
@ -296,7 +296,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.item.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ITEM_STATUS = new TokenParam(SP_ITEM_STATUS);
|
||||
public static final TokenClientParam ITEM_STATUS = new TokenClientParam(SP_ITEM_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>item-status-date</b>
|
||||
|
|
@ -317,7 +317,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>item-past-status & item-date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam ITEM_STATUS_DATE = new CompositeParam(SP_ITEM_STATUS_DATE);
|
||||
public static final CompositeClientParam ITEM_STATUS_DATE = new CompositeClientParam(SP_ITEM_STATUS_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>orderer</b>
|
||||
|
|
@ -338,7 +338,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.orderer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ORDERER = new ReferenceParam(SP_ORDERER);
|
||||
public static final ReferenceClientParam ORDERER = new ReferenceClientParam(SP_ORDERER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -365,7 +365,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.event.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EVENT_STATUS = new TokenParam(SP_EVENT_STATUS);
|
||||
public static final TokenClientParam EVENT_STATUS = new TokenClientParam(SP_EVENT_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>specimen</b>
|
||||
|
|
@ -386,7 +386,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.specimen | DiagnosticOrder.item.specimen</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
|
||||
public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -419,7 +419,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>event-status-date</b>
|
||||
|
|
@ -440,7 +440,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>event-status & event-date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam EVENT_STATUS_DATE = new CompositeParam(SP_EVENT_STATUS_DATE);
|
||||
public static final CompositeClientParam EVENT_STATUS_DATE = new CompositeClientParam(SP_EVENT_STATUS_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -461,7 +461,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticOrder.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>issued</b>
|
||||
|
|
@ -132,7 +132,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.issued</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam ISSUED = new DateParam(SP_ISSUED);
|
||||
public static final DateClientParam ISSUED = new DateClientParam(SP_ISSUED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -180,7 +180,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.performer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
|
||||
public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -207,7 +207,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>service</b>
|
||||
|
|
@ -228,7 +228,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.serviceCategory</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SERVICE = new TokenParam(SP_SERVICE);
|
||||
public static final TokenClientParam SERVICE = new TokenClientParam(SP_SERVICE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -249,7 +249,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.diagnostic[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>specimen</b>
|
||||
|
|
@ -270,7 +270,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.specimen</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
|
||||
public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -297,7 +297,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NAME = new TokenParam(SP_NAME);
|
||||
public static final TokenClientParam NAME = new TokenClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>result</b>
|
||||
|
|
@ -318,7 +318,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.result</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RESULT = new ReferenceParam(SP_RESULT);
|
||||
public static final ReferenceClientParam RESULT = new ReferenceClientParam(SP_RESULT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -345,7 +345,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.codedDiagnosis</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DIAGNOSIS = new TokenParam(SP_DIAGNOSIS);
|
||||
public static final TokenClientParam DIAGNOSIS = new TokenClientParam(SP_DIAGNOSIS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>image</b>
|
||||
|
|
@ -366,7 +366,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.image.link</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam IMAGE = new ReferenceParam(SP_IMAGE);
|
||||
public static final ReferenceClientParam IMAGE = new ReferenceClientParam(SP_IMAGE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -393,7 +393,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
|
|||
* Path: <b>DiagnosticReport.requestDetail</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST);
|
||||
public static final ReferenceClientParam REQUEST = new ReferenceClientParam(SP_REQUEST);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -59,10 +59,10 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.masterIdentifier | DocumentManifest.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -128,7 +128,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -155,7 +155,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>recipient</b>
|
||||
|
|
@ -176,7 +176,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.recipient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RECIPIENT = new ReferenceParam(SP_RECIPIENT);
|
||||
public static final ReferenceClientParam RECIPIENT = new ReferenceClientParam(SP_RECIPIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -203,7 +203,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.author</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
|
||||
public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -230,7 +230,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.created</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam CREATED = new DateParam(SP_CREATED);
|
||||
public static final DateClientParam CREATED = new DateClientParam(SP_CREATED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -251,7 +251,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>supersedes</b>
|
||||
|
|
@ -272,7 +272,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.supercedes</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUPERSEDES = new ReferenceParam(SP_SUPERSEDES);
|
||||
public static final ReferenceClientParam SUPERSEDES = new ReferenceClientParam(SP_SUPERSEDES);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -299,7 +299,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>confidentiality</b>
|
||||
|
|
@ -320,7 +320,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.confidentiality</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY);
|
||||
public static final TokenClientParam CONFIDENTIALITY = new TokenClientParam(SP_CONFIDENTIALITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>content</b>
|
||||
|
|
@ -341,7 +341,7 @@ public class DocumentManifest extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentManifest.content</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT);
|
||||
public static final ReferenceClientParam CONTENT = new ReferenceClientParam(SP_CONTENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -66,12 +66,12 @@ import ca.uhn.fhir.model.primitive.InstantDt;
|
|||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -116,7 +116,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.masterIdentifier | DocumentReference.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -137,7 +137,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -164,7 +164,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>class</b>
|
||||
|
|
@ -185,7 +185,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.class</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CLASS = new TokenParam(SP_CLASS);
|
||||
public static final TokenClientParam CLASS = new TokenClientParam(SP_CLASS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>author</b>
|
||||
|
|
@ -206,7 +206,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.author</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
|
||||
public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -233,7 +233,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.custodian</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam CUSTODIAN = new ReferenceParam(SP_CUSTODIAN);
|
||||
public static final ReferenceClientParam CUSTODIAN = new ReferenceClientParam(SP_CUSTODIAN);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -260,7 +260,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.authenticator</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHENTICATOR = new ReferenceParam(SP_AUTHENTICATOR);
|
||||
public static final ReferenceClientParam AUTHENTICATOR = new ReferenceClientParam(SP_AUTHENTICATOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -287,7 +287,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.created</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam CREATED = new DateParam(SP_CREATED);
|
||||
public static final DateClientParam CREATED = new DateClientParam(SP_CREATED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>indexed</b>
|
||||
|
|
@ -308,7 +308,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.indexed</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam INDEXED = new DateParam(SP_INDEXED);
|
||||
public static final DateClientParam INDEXED = new DateClientParam(SP_INDEXED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -329,7 +329,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>relatesto</b>
|
||||
|
|
@ -350,7 +350,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.relatesTo.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RELATESTO = new ReferenceParam(SP_RELATESTO);
|
||||
public static final ReferenceClientParam RELATESTO = new ReferenceClientParam(SP_RELATESTO);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -377,7 +377,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.relatesTo.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RELATION = new TokenParam(SP_RELATION);
|
||||
public static final TokenClientParam RELATION = new TokenClientParam(SP_RELATION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>relationship</b>
|
||||
|
|
@ -398,7 +398,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>relatesto & relation</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam RELATIONSHIP = new CompositeParam(SP_RELATIONSHIP);
|
||||
public static final CompositeClientParam RELATIONSHIP = new CompositeClientParam(SP_RELATIONSHIP);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>description</b>
|
||||
|
|
@ -419,7 +419,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>confidentiality</b>
|
||||
|
|
@ -440,7 +440,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.confidentiality</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY);
|
||||
public static final TokenClientParam CONFIDENTIALITY = new TokenClientParam(SP_CONFIDENTIALITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>language</b>
|
||||
|
|
@ -461,7 +461,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.primaryLanguage</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE);
|
||||
public static final TokenClientParam LANGUAGE = new TokenClientParam(SP_LANGUAGE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>format</b>
|
||||
|
|
@ -482,7 +482,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.format</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FORMAT = new TokenParam(SP_FORMAT);
|
||||
public static final TokenClientParam FORMAT = new TokenClientParam(SP_FORMAT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>size</b>
|
||||
|
|
@ -503,7 +503,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.size</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam SIZE = new NumberParam(SP_SIZE);
|
||||
public static final NumberClientParam SIZE = new NumberClientParam(SP_SIZE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>location</b>
|
||||
|
|
@ -524,7 +524,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.location</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam LOCATION = new StringParam(SP_LOCATION);
|
||||
public static final StringClientParam LOCATION = new StringClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>event</b>
|
||||
|
|
@ -545,7 +545,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.context.event</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EVENT = new TokenParam(SP_EVENT);
|
||||
public static final TokenClientParam EVENT = new TokenClientParam(SP_EVENT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>period</b>
|
||||
|
|
@ -566,7 +566,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.context.period</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam PERIOD = new DateParam(SP_PERIOD);
|
||||
public static final DateClientParam PERIOD = new DateClientParam(SP_PERIOD);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>facility</b>
|
||||
|
|
@ -587,7 +587,7 @@ public class DocumentReference extends BaseResource implements IResource {
|
|||
* Path: <b>DocumentReference.context.facilityType</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FACILITY = new TokenParam(SP_FACILITY);
|
||||
public static final TokenClientParam FACILITY = new TokenClientParam(SP_FACILITY);
|
||||
|
||||
|
||||
@Child(name="masterIdentifier", type=IdentifierDt.class, order=0, min=1, max=1)
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -114,7 +114,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -135,7 +135,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -156,7 +156,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.period</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -177,7 +177,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -204,7 +204,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.length</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam LENGTH = new NumberParam(SP_LENGTH);
|
||||
public static final NumberClientParam LENGTH = new NumberClientParam(SP_LENGTH);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>indication</b>
|
||||
|
|
@ -225,7 +225,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.indication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam INDICATION = new ReferenceParam(SP_INDICATION);
|
||||
public static final ReferenceClientParam INDICATION = new ReferenceClientParam(SP_INDICATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -252,7 +252,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.location.location</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
|
||||
public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -279,7 +279,7 @@ public class Encounter extends BaseResource implements IResource {
|
|||
* Path: <b>Encounter.location.period</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam LOCATION_PERIOD = new DateParam(SP_LOCATION_PERIOD);
|
||||
public static final DateClientParam LOCATION_PERIOD = new DateClientParam(SP_LOCATION_PERIOD);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
|||
import ca.uhn.fhir.model.primitive.BooleanDt;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class FamilyHistory extends BaseResource implements IResource {
|
|||
* Path: <b>FamilyHistory.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ import ca.uhn.fhir.model.primitive.DateDt;
|
|||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class GVFMeta extends BaseResource implements IResource {
|
|||
* Path: <b>GVFMeta.subject.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -132,7 +132,7 @@ public class GVFMeta extends BaseResource implements IResource {
|
|||
* Path: <b>GVFMeta.sourceFile</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam FILE = new StringParam(SP_FILE);
|
||||
public static final StringClientParam FILE = new StringClientParam(SP_FILE);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -102,7 +102,7 @@ public class GVFVariant extends BaseResource implements IResource {
|
|||
* Path: <b>GVFVariant.subject.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -129,7 +129,7 @@ public class GVFVariant extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
|
||||
public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -100,7 +100,7 @@ public class GeneExpression extends BaseResource implements IResource {
|
|||
* Path: <b>GeneExpression.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -127,7 +127,7 @@ public class GeneExpression extends BaseResource implements IResource {
|
|||
* Path: <b>GeneExpression.gene.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam GENE = new StringParam(SP_GENE);
|
||||
public static final StringClientParam GENE = new StringClientParam(SP_GENE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>coordinate</b>
|
||||
|
|
@ -148,7 +148,7 @@ public class GeneExpression extends BaseResource implements IResource {
|
|||
* Path: <b>GeneExpression.gene.coordinate</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
|
||||
public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=1, type={
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -103,7 +103,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>GeneticAnalysis.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -130,7 +130,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>GeneticAnalysis.author</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
|
||||
public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -157,7 +157,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>GeneticAnalysis.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=1, type={
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -131,7 +131,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>actual</b>
|
||||
|
|
@ -152,7 +152,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.actual</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACTUAL = new TokenParam(SP_ACTUAL);
|
||||
public static final TokenClientParam ACTUAL = new TokenClientParam(SP_ACTUAL);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -173,7 +173,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>member</b>
|
||||
|
|
@ -194,7 +194,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.member</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MEMBER = new ReferenceParam(SP_MEMBER);
|
||||
public static final ReferenceClientParam MEMBER = new ReferenceClientParam(SP_MEMBER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -221,7 +221,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.characteristic.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CHARACTERISTIC = new TokenParam(SP_CHARACTERISTIC);
|
||||
public static final TokenClientParam CHARACTERISTIC = new TokenClientParam(SP_CHARACTERISTIC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>value</b>
|
||||
|
|
@ -242,7 +242,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.characteristic.value[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VALUE = new TokenParam(SP_VALUE);
|
||||
public static final TokenClientParam VALUE = new TokenClientParam(SP_VALUE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>exclude</b>
|
||||
|
|
@ -263,7 +263,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>Group.characteristic.exclude</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EXCLUDE = new TokenParam(SP_EXCLUDE);
|
||||
public static final TokenClientParam EXCLUDE = new TokenClientParam(SP_EXCLUDE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>characteristic-value</b>
|
||||
|
|
@ -284,7 +284,7 @@ public class Group extends BaseResource implements IResource {
|
|||
* Path: <b>characteristic & value</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam CHARACTERISTIC_VALUE = new CompositeParam(SP_CHARACTERISTIC_VALUE);
|
||||
public static final CompositeClientParam CHARACTERISTIC_VALUE = new CompositeClientParam(SP_CHARACTERISTIC_VALUE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
|
|||
import ca.uhn.fhir.model.primitive.OidDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -114,7 +114,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -141,7 +141,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.dateTime</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>accession</b>
|
||||
|
|
@ -162,7 +162,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.accessionNo</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACCESSION = new TokenParam(SP_ACCESSION);
|
||||
public static final TokenClientParam ACCESSION = new TokenClientParam(SP_ACCESSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>study</b>
|
||||
|
|
@ -183,7 +183,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.uid</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STUDY = new TokenParam(SP_STUDY);
|
||||
public static final TokenClientParam STUDY = new TokenClientParam(SP_STUDY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>series</b>
|
||||
|
|
@ -204,7 +204,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.series.uid</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SERIES = new TokenParam(SP_SERIES);
|
||||
public static final TokenClientParam SERIES = new TokenClientParam(SP_SERIES);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>modality</b>
|
||||
|
|
@ -225,7 +225,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.series.modality</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam MODALITY = new TokenParam(SP_MODALITY);
|
||||
public static final TokenClientParam MODALITY = new TokenClientParam(SP_MODALITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>size</b>
|
||||
|
|
@ -246,7 +246,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam SIZE = new NumberParam(SP_SIZE);
|
||||
public static final NumberClientParam SIZE = new NumberClientParam(SP_SIZE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>bodysite</b>
|
||||
|
|
@ -267,7 +267,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.series.bodySite</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE);
|
||||
public static final TokenClientParam BODYSITE = new TokenClientParam(SP_BODYSITE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>uid</b>
|
||||
|
|
@ -288,7 +288,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.series.instance.uid</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam UID = new TokenParam(SP_UID);
|
||||
public static final TokenClientParam UID = new TokenClientParam(SP_UID);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dicom-class</b>
|
||||
|
|
@ -309,7 +309,7 @@ public class ImagingStudy extends BaseResource implements IResource {
|
|||
* Path: <b>ImagingStudy.series.instance.sopclass</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DICOM_CLASS = new TokenParam(SP_DICOM_CLASS);
|
||||
public static final TokenClientParam DICOM_CLASS = new TokenClientParam(SP_DICOM_CLASS);
|
||||
|
||||
|
||||
@Child(name="dateTime", type=DateTimeDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -66,11 +66,11 @@ import ca.uhn.fhir.model.primitive.DateDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -115,7 +115,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dose-sequence</b>
|
||||
|
|
@ -136,7 +136,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.vaccinationProtocol.doseSequence</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam DOSE_SEQUENCE = new NumberParam(SP_DOSE_SEQUENCE);
|
||||
public static final NumberClientParam DOSE_SEQUENCE = new NumberClientParam(SP_DOSE_SEQUENCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -157,7 +157,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>location</b>
|
||||
|
|
@ -178,7 +178,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.location</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
|
||||
public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -205,7 +205,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.lotNumber</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam LOT_NUMBER = new StringParam(SP_LOT_NUMBER);
|
||||
public static final StringClientParam LOT_NUMBER = new StringClientParam(SP_LOT_NUMBER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>manufacturer</b>
|
||||
|
|
@ -226,7 +226,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.manufacturer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER);
|
||||
public static final ReferenceClientParam MANUFACTURER = new ReferenceClientParam(SP_MANUFACTURER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -253,7 +253,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.performer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
|
||||
public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -280,7 +280,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.reaction.detail</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam REACTION = new ReferenceParam(SP_REACTION);
|
||||
public static final ReferenceClientParam REACTION = new ReferenceClientParam(SP_REACTION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -307,7 +307,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.reaction.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam REACTION_DATE = new DateParam(SP_REACTION_DATE);
|
||||
public static final DateClientParam REACTION_DATE = new DateClientParam(SP_REACTION_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>reason</b>
|
||||
|
|
@ -328,7 +328,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.explanation.reason</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam REASON = new TokenParam(SP_REASON);
|
||||
public static final TokenClientParam REASON = new TokenClientParam(SP_REASON);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>refusal-reason</b>
|
||||
|
|
@ -349,7 +349,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.explanation.refusalReason</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam REFUSAL_REASON = new TokenParam(SP_REFUSAL_REASON);
|
||||
public static final TokenClientParam REFUSAL_REASON = new TokenClientParam(SP_REFUSAL_REASON);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>refused</b>
|
||||
|
|
@ -370,7 +370,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.refusedIndicator</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam REFUSED = new TokenParam(SP_REFUSED);
|
||||
public static final TokenClientParam REFUSED = new TokenClientParam(SP_REFUSED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>requester</b>
|
||||
|
|
@ -391,7 +391,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.requester</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam REQUESTER = new ReferenceParam(SP_REQUESTER);
|
||||
public static final ReferenceClientParam REQUESTER = new ReferenceClientParam(SP_REQUESTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -418,7 +418,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -445,7 +445,7 @@ public class Immunization extends BaseResource implements IResource {
|
|||
* Path: <b>Immunization.vaccineType</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE);
|
||||
public static final TokenClientParam VACCINE_TYPE = new TokenClientParam(SP_VACCINE_TYPE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -62,10 +62,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -137,7 +137,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.vaccineType</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE);
|
||||
public static final TokenClientParam VACCINE_TYPE = new TokenClientParam(SP_VACCINE_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -158,7 +158,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -179,7 +179,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dose-number</b>
|
||||
|
|
@ -200,7 +200,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.doseNumber</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam DOSE_NUMBER = new NumberParam(SP_DOSE_NUMBER);
|
||||
public static final NumberClientParam DOSE_NUMBER = new NumberClientParam(SP_DOSE_NUMBER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -221,7 +221,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.forecastStatus</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dose-sequence</b>
|
||||
|
|
@ -242,7 +242,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.protocol.doseSequence</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DOSE_SEQUENCE = new TokenParam(SP_DOSE_SEQUENCE);
|
||||
public static final TokenClientParam DOSE_SEQUENCE = new TokenClientParam(SP_DOSE_SEQUENCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>support</b>
|
||||
|
|
@ -263,7 +263,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.supportingImmunization</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUPPORT = new ReferenceParam(SP_SUPPORT);
|
||||
public static final ReferenceClientParam SUPPORT = new ReferenceClientParam(SP_SUPPORT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -290,7 +290,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
|
|||
* Path: <b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam INFORMATION = new ReferenceParam(SP_INFORMATION);
|
||||
public static final ReferenceClientParam INFORMATION = new ReferenceClientParam(SP_INFORMATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -108,7 +108,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.source</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
|
||||
public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -135,7 +135,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.entry.item</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ITEM = new ReferenceParam(SP_ITEM);
|
||||
public static final ReferenceClientParam ITEM = new ReferenceClientParam(SP_ITEM);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -162,7 +162,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.emptyReason</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EMPTY_REASON = new TokenParam(SP_EMPTY_REASON);
|
||||
public static final TokenClientParam EMPTY_REASON = new TokenClientParam(SP_EMPTY_REASON);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -183,7 +183,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -204,7 +204,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -225,7 +225,7 @@ public class ListResource extends BaseResource implements IResource {
|
|||
* Path: <b>List.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -112,7 +112,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -133,7 +133,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>type</b>
|
||||
|
|
@ -154,7 +154,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>address</b>
|
||||
|
|
@ -175,7 +175,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.address</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
|
||||
public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -196,7 +196,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>partof</b>
|
||||
|
|
@ -217,7 +217,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b>Location.partOf</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF);
|
||||
public static final ReferenceClientParam PARTOF = new ReferenceClientParam(SP_PARTOF);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -244,7 +244,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NEAR = new TokenParam(SP_NEAR);
|
||||
public static final TokenClientParam NEAR = new TokenClientParam(SP_NEAR);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>near-distance</b>
|
||||
|
|
@ -265,7 +265,7 @@ public class Location extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NEAR_DISTANCE = new TokenParam(SP_NEAR_DISTANCE);
|
||||
public static final TokenClientParam NEAR_DISTANCE = new TokenClientParam(SP_NEAR_DISTANCE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subtype</b>
|
||||
|
|
@ -128,7 +128,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.subtype</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE);
|
||||
public static final TokenClientParam SUBTYPE = new TokenClientParam(SP_SUBTYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -149,7 +149,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -170,7 +170,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.dateTime</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -191,7 +191,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -218,7 +218,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.operator</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam OPERATOR = new ReferenceParam(SP_OPERATOR);
|
||||
public static final ReferenceClientParam OPERATOR = new ReferenceClientParam(SP_OPERATOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -245,7 +245,7 @@ public class Media extends BaseResource implements IResource {
|
|||
* Path: <b>Media.view</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VIEW = new TokenParam(SP_VIEW);
|
||||
public static final TokenClientParam VIEW = new TokenClientParam(SP_VIEW);
|
||||
|
||||
|
||||
@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -126,7 +126,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>manufacturer</b>
|
||||
|
|
@ -147,7 +147,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.manufacturer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER);
|
||||
public static final ReferenceClientParam MANUFACTURER = new ReferenceClientParam(SP_MANUFACTURER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -174,7 +174,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.product.form</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FORM = new TokenParam(SP_FORM);
|
||||
public static final TokenClientParam FORM = new TokenClientParam(SP_FORM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>ingredient</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.product.ingredient.item</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam INGREDIENT = new ReferenceParam(SP_INGREDIENT);
|
||||
public static final ReferenceClientParam INGREDIENT = new ReferenceClientParam(SP_INGREDIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -222,7 +222,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.package.container</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CONTAINER = new TokenParam(SP_CONTAINER);
|
||||
public static final TokenClientParam CONTAINER = new TokenClientParam(SP_CONTAINER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>content</b>
|
||||
|
|
@ -243,7 +243,7 @@ public class Medication extends BaseResource implements IResource {
|
|||
* Path: <b>Medication.package.content.item</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT);
|
||||
public static final ReferenceClientParam CONTENT = new ReferenceClientParam(SP_CONTENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.device</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE);
|
||||
public static final ReferenceClientParam DEVICE = new ReferenceClientParam(SP_DEVICE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -138,7 +138,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.encounter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
|
||||
public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -165,7 +165,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>medication</b>
|
||||
|
|
@ -186,7 +186,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.medication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
|
||||
public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -213,7 +213,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.wasNotGiven</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NOTGIVEN = new TokenParam(SP_NOTGIVEN);
|
||||
public static final TokenClientParam NOTGIVEN = new TokenClientParam(SP_NOTGIVEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>patient</b>
|
||||
|
|
@ -234,7 +234,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -261,7 +261,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.prescription</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION);
|
||||
public static final ReferenceClientParam PRESCRIPTION = new ReferenceClientParam(SP_PRESCRIPTION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -288,7 +288,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>whengiven</b>
|
||||
|
|
@ -309,7 +309,7 @@ public class MedicationAdministration extends BaseResource implements IResource
|
|||
* Path: <b>MedicationAdministration.whenGiven</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam WHENGIVEN = new DateParam(SP_WHENGIVEN);
|
||||
public static final DateClientParam WHENGIVEN = new DateClientParam(SP_WHENGIVEN);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -114,7 +114,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.destination</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam DESTINATION = new ReferenceParam(SP_DESTINATION);
|
||||
public static final ReferenceClientParam DESTINATION = new ReferenceClientParam(SP_DESTINATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -141,7 +141,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispenser</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam DISPENSER = new ReferenceParam(SP_DISPENSER);
|
||||
public static final ReferenceClientParam DISPENSER = new ReferenceClientParam(SP_DISPENSER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -168,7 +168,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>medication</b>
|
||||
|
|
@ -189,7 +189,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.medication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
|
||||
public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -216,7 +216,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -243,7 +243,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.authorizingPrescription</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION);
|
||||
public static final ReferenceClientParam PRESCRIPTION = new ReferenceClientParam(SP_PRESCRIPTION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -270,7 +270,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.substitution.responsibleParty</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RESPONSIBLEPARTY = new ReferenceParam(SP_RESPONSIBLEPARTY);
|
||||
public static final ReferenceClientParam RESPONSIBLEPARTY = new ReferenceClientParam(SP_RESPONSIBLEPARTY);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -297,7 +297,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>type</b>
|
||||
|
|
@ -318,7 +318,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>whenhandedover</b>
|
||||
|
|
@ -339,7 +339,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.whenHandedOver</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam WHENHANDEDOVER = new DateParam(SP_WHENHANDEDOVER);
|
||||
public static final DateClientParam WHENHANDEDOVER = new DateClientParam(SP_WHENHANDEDOVER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>whenprepared</b>
|
||||
|
|
@ -360,7 +360,7 @@ public class MedicationDispense extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationDispense.dispense.whenPrepared</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam WHENPREPARED = new DateParam(SP_WHENPREPARED);
|
||||
public static final DateClientParam WHENPREPARED = new DateClientParam(SP_WHENPREPARED);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -70,9 +70,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -117,7 +117,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.dateWritten</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATEWRITTEN = new DateParam(SP_DATEWRITTEN);
|
||||
public static final DateClientParam DATEWRITTEN = new DateClientParam(SP_DATEWRITTEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>encounter</b>
|
||||
|
|
@ -138,7 +138,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.encounter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
|
||||
public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -165,7 +165,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>medication</b>
|
||||
|
|
@ -186,7 +186,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.medication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
|
||||
public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -213,7 +213,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -240,7 +240,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationPrescription.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ import ca.uhn.fhir.model.dstu.composite.ScheduleDt;
|
|||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
|
||||
import ca.uhn.fhir.model.primitive.BooleanDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -108,7 +108,7 @@ public class MedicationStatement extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationStatement.device</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE);
|
||||
public static final ReferenceClientParam DEVICE = new ReferenceClientParam(SP_DEVICE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -135,7 +135,7 @@ public class MedicationStatement extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationStatement.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>medication</b>
|
||||
|
|
@ -156,7 +156,7 @@ public class MedicationStatement extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationStatement.medication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION);
|
||||
public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -183,7 +183,7 @@ public class MedicationStatement extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationStatement.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -210,7 +210,7 @@ public class MedicationStatement extends BaseResource implements IResource {
|
|||
* Path: <b>MedicationStatement.whenGiven</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam WHEN_GIVEN = new DateParam(SP_WHEN_GIVEN);
|
||||
public static final DateClientParam WHEN_GIVEN = new DateClientParam(SP_WHEN_GIVEN);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ import ca.uhn.fhir.model.primitive.DateDt;
|
|||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class Microarray extends BaseResource implements IResource {
|
|||
* Path: <b>Microarray.subject.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -132,7 +132,7 @@ public class Microarray extends BaseResource implements IResource {
|
|||
* Path: <b>Microarray.sample.gene.identity</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam GENE = new StringParam(SP_GENE);
|
||||
public static final StringClientParam GENE = new StringClientParam(SP_GENE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>coordinate</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class Microarray extends BaseResource implements IResource {
|
|||
* Path: <b>Microarray.sample.gene.coordinate</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam COORDINATE = new StringParam(SP_COORDINATE);
|
||||
public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -74,12 +74,12 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.QuantityParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.CompositeClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.QuantityClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -124,7 +124,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NAME = new TokenParam(SP_NAME);
|
||||
public static final TokenClientParam NAME = new TokenClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>value-quantity</b>
|
||||
|
|
@ -145,7 +145,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.value[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final QuantityParam VALUE_QUANTITY = new QuantityParam(SP_VALUE_QUANTITY);
|
||||
public static final QuantityClientParam VALUE_QUANTITY = new QuantityClientParam(SP_VALUE_QUANTITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>value-concept</b>
|
||||
|
|
@ -166,7 +166,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.value[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VALUE_CONCEPT = new TokenParam(SP_VALUE_CONCEPT);
|
||||
public static final TokenClientParam VALUE_CONCEPT = new TokenClientParam(SP_VALUE_CONCEPT);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>value-date</b>
|
||||
|
|
@ -187,7 +187,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.value[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam VALUE_DATE = new DateParam(SP_VALUE_DATE);
|
||||
public static final DateClientParam VALUE_DATE = new DateClientParam(SP_VALUE_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>value-string</b>
|
||||
|
|
@ -208,7 +208,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.value[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam VALUE_STRING = new StringParam(SP_VALUE_STRING);
|
||||
public static final StringClientParam VALUE_STRING = new StringClientParam(SP_VALUE_STRING);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name-value-[x]</b>
|
||||
|
|
@ -229,7 +229,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>name & value-[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam NAME_VALUE_X = new CompositeParam(SP_NAME_VALUE_X);
|
||||
public static final CompositeClientParam NAME_VALUE_X = new CompositeClientParam(SP_NAME_VALUE_X);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -250,7 +250,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.applies[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -271,7 +271,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>reliability</b>
|
||||
|
|
@ -292,7 +292,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.reliability</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RELIABILITY = new TokenParam(SP_RELIABILITY);
|
||||
public static final TokenClientParam RELIABILITY = new TokenClientParam(SP_RELIABILITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -313,7 +313,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -340,7 +340,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.performer</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER);
|
||||
public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -367,7 +367,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.specimen</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN);
|
||||
public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -394,7 +394,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.related.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RELATED_TYPE = new TokenParam(SP_RELATED_TYPE);
|
||||
public static final TokenClientParam RELATED_TYPE = new TokenClientParam(SP_RELATED_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>related-target</b>
|
||||
|
|
@ -415,7 +415,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>Observation.related.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam RELATED_TARGET = new ReferenceParam(SP_RELATED_TARGET);
|
||||
public static final ReferenceClientParam RELATED_TARGET = new ReferenceClientParam(SP_RELATED_TARGET);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -442,7 +442,7 @@ public class Observation extends BaseResource implements IResource {
|
|||
* Path: <b>related-target & related-type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final CompositeParam RELATED = new CompositeParam(SP_RELATED);
|
||||
public static final CompositeClientParam RELATED = new CompositeClientParam(SP_RELATED);
|
||||
|
||||
|
||||
@Child(name="name", type=CodeableConceptDt.class, order=0, min=1, max=1)
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.dstu.composite.ScheduleDt;
|
||||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -127,7 +127,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -154,7 +154,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.source</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE);
|
||||
public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -181,7 +181,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
|
||||
public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -208,7 +208,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.authority</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHORITY = new ReferenceParam(SP_AUTHORITY);
|
||||
public static final ReferenceClientParam AUTHORITY = new ReferenceClientParam(SP_AUTHORITY);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -235,7 +235,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.when.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam WHEN_CODE = new TokenParam(SP_WHEN_CODE);
|
||||
public static final TokenClientParam WHEN_CODE = new TokenClientParam(SP_WHEN_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>when</b>
|
||||
|
|
@ -256,7 +256,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.when.schedule</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam WHEN = new DateParam(SP_WHEN);
|
||||
public static final DateClientParam WHEN = new DateClientParam(SP_WHEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>detail</b>
|
||||
|
|
@ -277,7 +277,7 @@ public class Order extends BaseResource implements IResource {
|
|||
* Path: <b>Order.detail</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam DETAIL = new ReferenceParam(SP_DETAIL);
|
||||
public static final ReferenceClientParam DETAIL = new ReferenceClientParam(SP_DETAIL);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class OrderResponse extends BaseResource implements IResource {
|
|||
* Path: <b>OrderResponse.request</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST);
|
||||
public static final ReferenceClientParam REQUEST = new ReferenceClientParam(SP_REQUEST);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -133,7 +133,7 @@ public class OrderResponse extends BaseResource implements IResource {
|
|||
* Path: <b>OrderResponse.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>who</b>
|
||||
|
|
@ -154,7 +154,7 @@ public class OrderResponse extends BaseResource implements IResource {
|
|||
* Path: <b>OrderResponse.who</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam WHO = new ReferenceParam(SP_WHO);
|
||||
public static final ReferenceClientParam WHO = new ReferenceClientParam(SP_WHO);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -181,7 +181,7 @@ public class OrderResponse extends BaseResource implements IResource {
|
|||
* Path: <b>OrderResponse.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>fulfillment</b>
|
||||
|
|
@ -202,7 +202,7 @@ public class OrderResponse extends BaseResource implements IResource {
|
|||
* Path: <b>OrderResponse.fulfillment</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam FULFILLMENT = new ReferenceParam(SP_FULFILLMENT);
|
||||
public static final ReferenceClientParam FULFILLMENT = new ReferenceClientParam(SP_FULFILLMENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
|
|||
import ca.uhn.fhir.model.primitive.BooleanDt;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b>Organization.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>phonetic</b>
|
||||
|
|
@ -131,7 +131,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
|
||||
public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>type</b>
|
||||
|
|
@ -152,7 +152,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b>Organization.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -173,7 +173,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b>Organization.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>partof</b>
|
||||
|
|
@ -194,7 +194,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b>Organization.partOf</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF);
|
||||
public static final ReferenceClientParam PARTOF = new ReferenceClientParam(SP_PARTOF);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -221,7 +221,7 @@ public class Organization extends BaseResource implements IResource {
|
|||
* Path: <b>Organization.active</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE);
|
||||
public static final TokenClientParam ACTIVE = new TokenClientParam(SP_ACTIVE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
|||
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
||||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -101,7 +101,7 @@ public class Other extends BaseResource implements IResource {
|
|||
* Path: <b>Other.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -128,7 +128,7 @@ public class Other extends BaseResource implements IResource {
|
|||
* Path: <b>Other.created</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam CREATED = new DateParam(SP_CREATED);
|
||||
public static final DateClientParam CREATED = new DateClientParam(SP_CREATED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -149,7 +149,7 @@ public class Other extends BaseResource implements IResource {
|
|||
* Path: <b>Other.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -72,10 +72,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -120,7 +120,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -141,7 +141,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>family</b>
|
||||
|
|
@ -162,7 +162,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.name.family</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam FAMILY = new StringParam(SP_FAMILY);
|
||||
public static final StringClientParam FAMILY = new StringClientParam(SP_FAMILY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>given</b>
|
||||
|
|
@ -183,7 +183,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.name.given</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam GIVEN = new StringParam(SP_GIVEN);
|
||||
public static final StringClientParam GIVEN = new StringClientParam(SP_GIVEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>phonetic</b>
|
||||
|
|
@ -204,7 +204,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
|
||||
public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>telecom</b>
|
||||
|
|
@ -225,7 +225,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.telecom</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
|
||||
public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>address</b>
|
||||
|
|
@ -246,7 +246,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.address</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
|
||||
public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>gender</b>
|
||||
|
|
@ -267,7 +267,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.gender</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
|
||||
public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>language</b>
|
||||
|
|
@ -288,7 +288,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.communication</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE);
|
||||
public static final TokenClientParam LANGUAGE = new TokenClientParam(SP_LANGUAGE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>birthdate</b>
|
||||
|
|
@ -309,7 +309,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.birthDate</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam BIRTHDATE = new DateParam(SP_BIRTHDATE);
|
||||
public static final DateClientParam BIRTHDATE = new DateClientParam(SP_BIRTHDATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>provider</b>
|
||||
|
|
@ -330,7 +330,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.managingOrganization</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PROVIDER = new ReferenceParam(SP_PROVIDER);
|
||||
public static final ReferenceClientParam PROVIDER = new ReferenceClientParam(SP_PROVIDER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -357,7 +357,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.active</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE);
|
||||
public static final TokenClientParam ACTIVE = new TokenClientParam(SP_ACTIVE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>animal-species</b>
|
||||
|
|
@ -378,7 +378,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.animal.species</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ANIMAL_SPECIES = new TokenParam(SP_ANIMAL_SPECIES);
|
||||
public static final TokenClientParam ANIMAL_SPECIES = new TokenClientParam(SP_ANIMAL_SPECIES);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>animal-breed</b>
|
||||
|
|
@ -399,7 +399,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.animal.breed</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ANIMAL_BREED = new TokenParam(SP_ANIMAL_BREED);
|
||||
public static final TokenClientParam ANIMAL_BREED = new TokenClientParam(SP_ANIMAL_BREED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>link</b>
|
||||
|
|
@ -420,7 +420,7 @@ public class Patient extends BaseResource implements IResource {
|
|||
* Path: <b>Patient.link.other</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam LINK = new ReferenceParam(SP_LINK);
|
||||
public static final ReferenceClientParam LINK = new ReferenceClientParam(SP_LINK);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
|
|||
import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -114,7 +114,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -135,7 +135,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>family</b>
|
||||
|
|
@ -156,7 +156,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam FAMILY = new StringParam(SP_FAMILY);
|
||||
public static final StringClientParam FAMILY = new StringClientParam(SP_FAMILY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>given</b>
|
||||
|
|
@ -177,7 +177,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam GIVEN = new StringParam(SP_GIVEN);
|
||||
public static final StringClientParam GIVEN = new StringClientParam(SP_GIVEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>phonetic</b>
|
||||
|
|
@ -198,7 +198,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
|
||||
public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>telecom</b>
|
||||
|
|
@ -219,7 +219,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.telecom</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
|
||||
public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>address</b>
|
||||
|
|
@ -240,7 +240,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.address</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
|
||||
public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>gender</b>
|
||||
|
|
@ -261,7 +261,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.gender</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
|
||||
public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>organization</b>
|
||||
|
|
@ -282,7 +282,7 @@ public class Practitioner extends BaseResource implements IResource {
|
|||
* Path: <b>Practitioner.organization</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION);
|
||||
public static final ReferenceClientParam ORGANIZATION = new ReferenceClientParam(SP_ORGANIZATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class Procedure extends BaseResource implements IResource {
|
|||
* Path: <b>Procedure.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -127,7 +127,7 @@ public class Procedure extends BaseResource implements IResource {
|
|||
* Path: <b>Procedure.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -154,7 +154,7 @@ public class Procedure extends BaseResource implements IResource {
|
|||
* Path: <b>Procedure.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -75,10 +75,10 @@ import ca.uhn.fhir.model.primitive.IdDt;
|
|||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -123,7 +123,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>version</b>
|
||||
|
|
@ -144,7 +144,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.version</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
|
||||
public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -165,7 +165,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>publisher</b>
|
||||
|
|
@ -186,7 +186,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.publisher</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
|
||||
public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>description</b>
|
||||
|
|
@ -207,7 +207,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -228,7 +228,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -249,7 +249,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -270,7 +270,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>extension</b>
|
||||
|
|
@ -291,7 +291,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.extensionDefn.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam EXTENSION = new TokenParam(SP_EXTENSION);
|
||||
public static final TokenClientParam EXTENSION = new TokenClientParam(SP_EXTENSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>valueset</b>
|
||||
|
|
@ -312,7 +312,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.structure.element.definition.binding.reference[x]</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam VALUESET = new ReferenceParam(SP_VALUESET);
|
||||
public static final ReferenceClientParam VALUESET = new ReferenceClientParam(SP_VALUESET);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -339,7 +339,7 @@ public class Profile extends BaseResource implements IResource {
|
|||
* Path: <b>Profile.structure.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -62,9 +62,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -109,7 +109,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.target</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET);
|
||||
public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -136,7 +136,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.period.start</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam START = new DateParam(SP_START);
|
||||
public static final DateClientParam START = new DateClientParam(SP_START);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>end</b>
|
||||
|
|
@ -157,7 +157,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.period.end</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam END = new DateParam(SP_END);
|
||||
public static final DateClientParam END = new DateClientParam(SP_END);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>location</b>
|
||||
|
|
@ -178,7 +178,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.location</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION);
|
||||
public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -205,7 +205,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.agent.reference</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PARTY = new TokenParam(SP_PARTY);
|
||||
public static final TokenClientParam PARTY = new TokenClientParam(SP_PARTY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>partytype</b>
|
||||
|
|
@ -226,7 +226,7 @@ public class Provenance extends BaseResource implements IResource {
|
|||
* Path: <b>Provenance.agent.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PARTYTYPE = new TokenParam(SP_PARTYTYPE);
|
||||
public static final TokenClientParam PARTYTYPE = new TokenClientParam(SP_PARTYTYPE);
|
||||
|
||||
|
||||
@Child(name="target", order=0, min=1, max=Child.MAX_UNLIMITED, type={
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -101,7 +101,7 @@ public class Query extends BaseResource implements IResource {
|
|||
* Path: <b>Query.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>response</b>
|
||||
|
|
@ -122,7 +122,7 @@ public class Query extends BaseResource implements IResource {
|
|||
* Path: <b>Query.response.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam RESPONSE = new TokenParam(SP_RESPONSE);
|
||||
public static final TokenClientParam RESPONSE = new TokenClientParam(SP_RESPONSE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=UriDt.class, order=0, min=1, max=1)
|
||||
|
|
|
|||
|
|
@ -71,9 +71,9 @@ import ca.uhn.fhir.model.primitive.DecimalDt;
|
|||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -118,7 +118,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>authored</b>
|
||||
|
|
@ -139,7 +139,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.authored</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam AUTHORED = new DateParam(SP_AUTHORED);
|
||||
public static final DateClientParam AUTHORED = new DateClientParam(SP_AUTHORED);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subject</b>
|
||||
|
|
@ -160,7 +160,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -187,7 +187,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.author</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR);
|
||||
public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -214,7 +214,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -235,7 +235,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam NAME = new TokenParam(SP_NAME);
|
||||
public static final TokenClientParam NAME = new TokenClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>encounter</b>
|
||||
|
|
@ -256,7 +256,7 @@ public class Questionnaire extends BaseResource implements IResource {
|
|||
* Path: <b>Questionnaire.encounter</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER);
|
||||
public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
|
|||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +106,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -127,7 +127,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>phonetic</b>
|
||||
|
|
@ -148,7 +148,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PHONETIC = new StringParam(SP_PHONETIC);
|
||||
public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>telecom</b>
|
||||
|
|
@ -169,7 +169,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.telecom</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam TELECOM = new StringParam(SP_TELECOM);
|
||||
public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>address</b>
|
||||
|
|
@ -190,7 +190,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.address</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam ADDRESS = new StringParam(SP_ADDRESS);
|
||||
public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>gender</b>
|
||||
|
|
@ -211,7 +211,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.gender</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam GENDER = new TokenParam(SP_GENDER);
|
||||
public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>patient</b>
|
||||
|
|
@ -232,7 +232,7 @@ public class RelatedPerson extends BaseResource implements IResource {
|
|||
* Path: <b>RelatedPerson.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
|||
import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
|
||||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -99,7 +99,7 @@ public class Remittance extends BaseResource implements IResource {
|
|||
* Path: <b>Remittance.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>service</b>
|
||||
|
|
@ -120,7 +120,7 @@ public class Remittance extends BaseResource implements IResource {
|
|||
* Path: <b>Remittance.service.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SERVICE = new TokenParam(SP_SERVICE);
|
||||
public static final TokenClientParam SERVICE = new TokenClientParam(SP_SERVICE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -71,10 +71,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -119,7 +119,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.event.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>action</b>
|
||||
|
|
@ -140,7 +140,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.event.action</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ACTION = new TokenParam(SP_ACTION);
|
||||
public static final TokenClientParam ACTION = new TokenClientParam(SP_ACTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -161,7 +161,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.event.dateTime</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>subtype</b>
|
||||
|
|
@ -182,7 +182,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.event.subtype</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE);
|
||||
public static final TokenClientParam SUBTYPE = new TokenClientParam(SP_SUBTYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>user</b>
|
||||
|
|
@ -203,7 +203,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.participant.userId</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam USER = new TokenParam(SP_USER);
|
||||
public static final TokenClientParam USER = new TokenClientParam(SP_USER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -224,7 +224,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.participant.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>address</b>
|
||||
|
|
@ -245,7 +245,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.participant.network.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ADDRESS = new TokenParam(SP_ADDRESS);
|
||||
public static final TokenClientParam ADDRESS = new TokenClientParam(SP_ADDRESS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>source</b>
|
||||
|
|
@ -266,7 +266,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.source.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SOURCE = new TokenParam(SP_SOURCE);
|
||||
public static final TokenClientParam SOURCE = new TokenClientParam(SP_SOURCE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>site</b>
|
||||
|
|
@ -287,7 +287,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.source.site</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SITE = new TokenParam(SP_SITE);
|
||||
public static final TokenClientParam SITE = new TokenClientParam(SP_SITE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>object-type</b>
|
||||
|
|
@ -308,7 +308,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.object.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam OBJECT_TYPE = new TokenParam(SP_OBJECT_TYPE);
|
||||
public static final TokenClientParam OBJECT_TYPE = new TokenClientParam(SP_OBJECT_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identity</b>
|
||||
|
|
@ -329,7 +329,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.object.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTITY = new TokenParam(SP_IDENTITY);
|
||||
public static final TokenClientParam IDENTITY = new TokenClientParam(SP_IDENTITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>reference</b>
|
||||
|
|
@ -350,7 +350,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.object.reference</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam REFERENCE = new ReferenceParam(SP_REFERENCE);
|
||||
public static final ReferenceClientParam REFERENCE = new ReferenceClientParam(SP_REFERENCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -377,7 +377,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.object.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESC = new StringParam(SP_DESC);
|
||||
public static final StringClientParam DESC = new StringClientParam(SP_DESC);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>patientid</b>
|
||||
|
|
@ -398,7 +398,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b></b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PATIENTID = new TokenParam(SP_PATIENTID);
|
||||
public static final TokenClientParam PATIENTID = new TokenClientParam(SP_PATIENTID);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>altid</b>
|
||||
|
|
@ -419,7 +419,7 @@ public class SecurityEvent extends BaseResource implements IResource {
|
|||
* Path: <b>SecurityEvent.participant.altId</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam ALTID = new TokenParam(SP_ALTID);
|
||||
public static final TokenClientParam ALTID = new TokenClientParam(SP_ALTID);
|
||||
|
||||
|
||||
@Child(name="event", order=0, min=1, max=1)
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -104,7 +104,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingAnalysis.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -131,7 +131,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingAnalysis.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>genome</b>
|
||||
|
|
@ -152,7 +152,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingAnalysis.genome.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam GENOME = new StringParam(SP_GENOME);
|
||||
public static final StringClientParam GENOME = new StringClientParam(SP_GENOME);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=1, type={
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +105,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -132,7 +132,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.specimen.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam SPECIMEN = new StringParam(SP_SPECIMEN);
|
||||
public static final StringClientParam SPECIMEN = new StringClientParam(SP_SPECIMEN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>organization</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.organization</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam ORGANIZATION = new StringParam(SP_ORGANIZATION);
|
||||
public static final StringClientParam ORGANIZATION = new StringClientParam(SP_ORGANIZATION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>system-class</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.system.class</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam SYSTEM_CLASS = new StringParam(SP_SYSTEM_CLASS);
|
||||
public static final StringClientParam SYSTEM_CLASS = new StringClientParam(SP_SYSTEM_CLASS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>system-name</b>
|
||||
|
|
@ -216,7 +216,7 @@ public class SequencingLab extends BaseResource implements IResource {
|
|||
* Path: <b>SequencingLab.system.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam SYSTEM_NAME = new StringParam(SP_SYSTEM_NAME);
|
||||
public static final StringClientParam SYSTEM_NAME = new StringClientParam(SP_SYSTEM_NAME);
|
||||
|
||||
|
||||
@Child(name="subject", order=0, min=0, max=1, type={
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -104,7 +104,7 @@ public class Slot extends BaseResource implements IResource {
|
|||
* Path: <b>Slot.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE);
|
||||
public static final TokenClientParam SLOTTYPE = new TokenClientParam(SP_SLOTTYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>availability</b>
|
||||
|
|
@ -125,7 +125,7 @@ public class Slot extends BaseResource implements IResource {
|
|||
* Path: <b>Slot.availability</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam AVAILABILITY = new ReferenceParam(SP_AVAILABILITY);
|
||||
public static final ReferenceClientParam AVAILABILITY = new ReferenceClientParam(SP_AVAILABILITY);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -152,7 +152,7 @@ public class Slot extends BaseResource implements IResource {
|
|||
* Path: <b>Slot.start</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam START = new DateParam(SP_START);
|
||||
public static final DateClientParam START = new DateClientParam(SP_START);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>fbtype</b>
|
||||
|
|
@ -173,7 +173,7 @@ public class Slot extends BaseResource implements IResource {
|
|||
* Path: <b>Slot.freeBusyType</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam FBTYPE = new TokenParam(SP_FBTYPE);
|
||||
public static final TokenClientParam FBTYPE = new TokenClientParam(SP_FBTYPE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
|||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -113,7 +113,7 @@ public class Specimen extends BaseResource implements IResource {
|
|||
* Path: <b>Specimen.subject</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT);
|
||||
public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -63,10 +63,10 @@ import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class Substance extends BaseResource implements IResource {
|
|||
* Path: <b>Substance.type</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam TYPE = new TokenParam(SP_TYPE);
|
||||
public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -132,7 +132,7 @@ public class Substance extends BaseResource implements IResource {
|
|||
* Path: <b>Substance.instance.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>expiry</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class Substance extends BaseResource implements IResource {
|
|||
* Path: <b>Substance.instance.expiry</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam EXPIRY = new DateParam(SP_EXPIRY);
|
||||
public static final DateClientParam EXPIRY = new DateClientParam(SP_EXPIRY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>quantity</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class Substance extends BaseResource implements IResource {
|
|||
* Path: <b>Substance.instance.quantity</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final NumberParam QUANTITY = new NumberParam(SP_QUANTITY);
|
||||
public static final NumberClientParam QUANTITY = new NumberClientParam(SP_QUANTITY);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>substance</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class Substance extends BaseResource implements IResource {
|
|||
* Path: <b>Substance.ingredient.substance</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE);
|
||||
public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum;
|
|||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.kind</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam KIND = new TokenParam(SP_KIND);
|
||||
public static final TokenClientParam KIND = new TokenClientParam(SP_KIND);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>identifier</b>
|
||||
|
|
@ -131,7 +131,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -152,7 +152,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>patient</b>
|
||||
|
|
@ -173,7 +173,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -200,7 +200,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.dispense.supplier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam SUPPLIER = new ReferenceParam(SP_SUPPLIER);
|
||||
public static final ReferenceClientParam SUPPLIER = new ReferenceClientParam(SP_SUPPLIER);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
@ -227,7 +227,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.dispense.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DISPENSEID = new TokenParam(SP_DISPENSEID);
|
||||
public static final TokenClientParam DISPENSEID = new TokenClientParam(SP_DISPENSEID);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>dispensestatus</b>
|
||||
|
|
@ -248,7 +248,7 @@ public class Supply extends BaseResource implements IResource {
|
|||
* Path: <b>Supply.dispense.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam DISPENSESTATUS = new TokenParam(SP_DISPENSESTATUS);
|
||||
public static final TokenClientParam DISPENSESTATUS = new TokenClientParam(SP_DISPENSESTATUS);
|
||||
|
||||
|
||||
@Child(name="kind", type=CodeableConceptDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ import ca.uhn.fhir.model.primitive.CodeDt;
|
|||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.ReferenceClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -102,7 +102,7 @@ public class User extends BaseResource implements IResource {
|
|||
* Path: <b>User.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>provider</b>
|
||||
|
|
@ -123,7 +123,7 @@ public class User extends BaseResource implements IResource {
|
|||
* Path: <b>User.provider</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam PROVIDER = new TokenParam(SP_PROVIDER);
|
||||
public static final TokenClientParam PROVIDER = new TokenClientParam(SP_PROVIDER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>login</b>
|
||||
|
|
@ -144,7 +144,7 @@ public class User extends BaseResource implements IResource {
|
|||
* Path: <b>User.login</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam LOGIN = new StringParam(SP_LOGIN);
|
||||
public static final StringClientParam LOGIN = new StringClientParam(SP_LOGIN);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>level</b>
|
||||
|
|
@ -165,7 +165,7 @@ public class User extends BaseResource implements IResource {
|
|||
* Path: <b>User.level</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam LEVEL = new TokenParam(SP_LEVEL);
|
||||
public static final TokenClientParam LEVEL = new TokenClientParam(SP_LEVEL);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>patient</b>
|
||||
|
|
@ -186,7 +186,7 @@ public class User extends BaseResource implements IResource {
|
|||
* Path: <b>User.patient</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT);
|
||||
public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT);
|
||||
|
||||
/**
|
||||
* Constant for fluent queries to be used to add include statements. Specifies
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.DateTimeDt;
|
|||
import ca.uhn.fhir.model.primitive.InstantDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
import ca.uhn.fhir.rest.gclient.DateParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenParam;
|
||||
import ca.uhn.fhir.rest.gclient.DateClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.gclient.TokenClientParam;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.identifier</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER);
|
||||
public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>version</b>
|
||||
|
|
@ -132,7 +132,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.version</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam VERSION = new TokenParam(SP_VERSION);
|
||||
public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>name</b>
|
||||
|
|
@ -153,7 +153,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.name</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam NAME = new StringParam(SP_NAME);
|
||||
public static final StringClientParam NAME = new StringClientParam(SP_NAME);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>publisher</b>
|
||||
|
|
@ -174,7 +174,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.publisher</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER);
|
||||
public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>description</b>
|
||||
|
|
@ -195,7 +195,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.description</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION);
|
||||
public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>status</b>
|
||||
|
|
@ -216,7 +216,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.status</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam STATUS = new TokenParam(SP_STATUS);
|
||||
public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>date</b>
|
||||
|
|
@ -237,7 +237,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.date</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final DateParam DATE = new DateParam(SP_DATE);
|
||||
public static final DateClientParam DATE = new DateClientParam(SP_DATE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>system</b>
|
||||
|
|
@ -258,7 +258,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.define.system</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM);
|
||||
public static final TokenClientParam SYSTEM = new TokenClientParam(SP_SYSTEM);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>code</b>
|
||||
|
|
@ -279,7 +279,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.define.concept.code</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam CODE = new TokenParam(SP_CODE);
|
||||
public static final TokenClientParam CODE = new TokenClientParam(SP_CODE);
|
||||
|
||||
/**
|
||||
* Search parameter constant for <b>reference</b>
|
||||
|
|
@ -300,7 +300,7 @@ public class ValueSet extends BaseResource implements IResource {
|
|||
* Path: <b>ValueSet.compose.include.system</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final TokenParam REFERENCE = new TokenParam(SP_REFERENCE);
|
||||
public static final TokenClientParam REFERENCE = new TokenClientParam(SP_REFERENCE);
|
||||
|
||||
|
||||
@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
/**
|
||||
* Composite params are not yet supported - This is a placeholder. Help welcome!
|
||||
*
|
||||
* TODO: implement
|
||||
*/
|
||||
public class CompositeClientParam {
|
||||
|
||||
public CompositeClientParam(String theName) {
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
/**
|
||||
* Composite params are not yet supported - This is a placeholder. Help welcome!
|
||||
*
|
||||
* TODO: implement
|
||||
*/
|
||||
public void notYetSupported() {
|
||||
//nothig
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,24 +20,16 @@ package ca.uhn.fhir.rest.gclient;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
/**
|
||||
* Composite params are not yet supported - This is a placeholder. Help welcome!
|
||||
*
|
||||
* TODO: implement
|
||||
*/
|
||||
public class CompositeParam {
|
||||
|
||||
public CompositeParam(@SuppressWarnings("unused") String theName) {
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
/**
|
||||
* Composite params are not yet supported - This is a placeholder. Help welcome!
|
||||
*
|
||||
* TODO: implement
|
||||
* @deprecated Use {@link CompositeClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public void notYetSupported() {
|
||||
//nothig
|
||||
public class CompositeParam extends CompositeClientParam {
|
||||
|
||||
public CompositeParam(String theParamName) {
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
|
||||
/**
|
||||
* Date parameter type for use in fluent client interfaces
|
||||
*/
|
||||
public class DateClientParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public DateClientParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
public IDateSpecifier after() {
|
||||
return new DateWithPrefix(">");
|
||||
}
|
||||
|
||||
public IDateSpecifier afterOrEquals() {
|
||||
return new DateWithPrefix(">=");
|
||||
}
|
||||
|
||||
public IDateSpecifier before() {
|
||||
return new DateWithPrefix("<=");
|
||||
}
|
||||
|
||||
public IDateSpecifier beforeOrEquals() {
|
||||
return new DateWithPrefix("<=");
|
||||
}
|
||||
|
||||
public IDateSpecifier exactly() {
|
||||
return new DateWithPrefix("");
|
||||
}
|
||||
|
||||
private class Criterion implements ICriterion, ICriterionInternal {
|
||||
|
||||
private String myValue;
|
||||
|
||||
public Criterion(String theValue) {
|
||||
myValue = theValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterValue() {
|
||||
return myValue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private class DateWithPrefix implements IDateSpecifier {
|
||||
private String myPrefix;
|
||||
|
||||
public DateWithPrefix(String thePrefix) {
|
||||
myPrefix = thePrefix;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion day(Date theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion day(String theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion now() {
|
||||
DateTimeDt dt = new DateTimeDt();
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion second(Date theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion second(String theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public interface IDateSpecifier {
|
||||
|
||||
ICriterion day(Date theValue);
|
||||
|
||||
ICriterion day(String theValue);
|
||||
|
||||
ICriterion now();
|
||||
|
||||
ICriterion second(Date theValue);
|
||||
|
||||
ICriterion second(String theValue);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,123 +20,16 @@ package ca.uhn.fhir.rest.gclient;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
|
||||
import ca.uhn.fhir.model.primitive.DateTimeDt;
|
||||
|
||||
/**
|
||||
* Date parameter type for use in fluent client interfaces
|
||||
* @deprecated Use {@link DateClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public class DateParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
public class DateParam extends DateClientParam {
|
||||
|
||||
public DateParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
public IDateSpecifier after() {
|
||||
return new DateWithPrefix(">");
|
||||
}
|
||||
|
||||
public IDateSpecifier afterOrEquals() {
|
||||
return new DateWithPrefix(">=");
|
||||
}
|
||||
|
||||
public IDateSpecifier before() {
|
||||
return new DateWithPrefix("<=");
|
||||
}
|
||||
|
||||
public IDateSpecifier beforeOrEquals() {
|
||||
return new DateWithPrefix("<=");
|
||||
}
|
||||
|
||||
public IDateSpecifier exactly() {
|
||||
return new DateWithPrefix("");
|
||||
}
|
||||
|
||||
private class Criterion implements ICriterion, ICriterionInternal {
|
||||
|
||||
private String myValue;
|
||||
|
||||
public Criterion(String theValue) {
|
||||
myValue = theValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterValue() {
|
||||
return myValue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private class DateWithPrefix implements IDateSpecifier {
|
||||
private String myPrefix;
|
||||
|
||||
public DateWithPrefix(String thePrefix) {
|
||||
myPrefix = thePrefix;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion day(Date theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion day(String theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion now() {
|
||||
DateTimeDt dt = new DateTimeDt();
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion second(Date theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion second(String theValue) {
|
||||
DateTimeDt dt = new DateTimeDt(theValue);
|
||||
dt.setPrecision(TemporalPrecisionEnum.DAY);
|
||||
return new Criterion(myPrefix + dt.getValueAsString());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public interface IDateSpecifier {
|
||||
|
||||
ICriterion day(Date theValue);
|
||||
|
||||
ICriterion day(String theValue);
|
||||
|
||||
ICriterion now();
|
||||
|
||||
ICriterion second(Date theValue);
|
||||
|
||||
ICriterion second(String theValue);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,129 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
*/
|
||||
public class NumberClientParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
public NumberClientParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> exactly() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> greaterThan() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), ">" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), ">" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> greaterThanOrEqual() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), ">=" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), ">=" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> lessThan() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), "<" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), "<" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> lessThanOrEqual() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), "<=" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), "<=" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IMatches<T> {
|
||||
/**
|
||||
* Creates a search criterion that matches against the given number
|
||||
*
|
||||
* @param theNumber
|
||||
* The number
|
||||
* @return A criterion
|
||||
*/
|
||||
T number(long theNumber);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given number
|
||||
*
|
||||
* @param theNumber
|
||||
* The number
|
||||
* @return A criterion
|
||||
*/
|
||||
T number(String theNumber);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,110 +20,16 @@ package ca.uhn.fhir.rest.gclient;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
*/
|
||||
public class NumberParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
/**
|
||||
* @deprecated Use {@link NumberClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public class NumberParam extends NumberClientParam {
|
||||
|
||||
public NumberParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> exactly() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> greaterThan() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), ">" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), ">" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> greaterThanOrEqual() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), ">=" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), ">=" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> lessThan() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), "<" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), "<" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<ICriterion> lessThanOrEqual() {
|
||||
return new IMatches<ICriterion>() {
|
||||
@Override
|
||||
public ICriterion number(long theNumber) {
|
||||
return new StringCriterion(getParamName(), "<=" + Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion number(String theNumber) {
|
||||
return new StringCriterion(getParamName(), "<=" + (theNumber));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IMatches<T> {
|
||||
/**
|
||||
* Creates a search criterion that matches against the given number
|
||||
*
|
||||
* @param theNumber
|
||||
* The number
|
||||
* @return A criterion
|
||||
*/
|
||||
T number(long theNumber);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given number
|
||||
*
|
||||
* @param theNumber
|
||||
* The number
|
||||
* @return A criterion
|
||||
*/
|
||||
T number(String theNumber);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,176 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.*;
|
||||
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
|
||||
import ca.uhn.fhir.rest.gclient.NumberClientParam.IMatches;
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
*/
|
||||
public class QuantityClientParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
public QuantityClientParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> approximately() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("~", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("~", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> exactly() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> greaterThan() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(">", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(">", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> greaterThanOrEquals() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(">=", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(">=", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> lessThan() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("<", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("<", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> lessThanOrEquals() {
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("<=", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("<=", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> withComparator(QuantityCompararatorEnum theComparator) {
|
||||
final String cmp = theComparator != null ? theComparator.getCode() : "";
|
||||
return new NumberClientParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(cmp, Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(cmp, theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IAndUnits {
|
||||
|
||||
ICriterion andNoUnits();
|
||||
|
||||
ICriterion andUnits(String theUnits);
|
||||
|
||||
ICriterion andUnits(String theSystem, String theUnits);
|
||||
}
|
||||
|
||||
private class AndUnits implements IAndUnits {
|
||||
|
||||
private String myToken1;
|
||||
|
||||
public AndUnits(String theComparator, String theNumber) {
|
||||
myToken1 = defaultString(theComparator) + defaultString(theNumber);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andNoUnits() {
|
||||
return andUnits(null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andUnits(String theUnits) {
|
||||
return andUnits(theUnits, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andUnits(String theSystem, String theUnits) {
|
||||
return new StringCriterion(getParamName(), myToken1 + "|" + defaultString(theSystem) + "|" + defaultString(theUnits));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,157 +20,16 @@ package ca.uhn.fhir.rest.gclient;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.*;
|
||||
import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
|
||||
import ca.uhn.fhir.rest.gclient.NumberParam.IMatches;
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
* @deprecated Use {@link QuantityClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public class QuantityParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
public class QuantityParam extends QuantityClientParam {
|
||||
|
||||
public QuantityParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> approximately() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("~", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("~", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> exactly() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> greaterThan() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(">", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(">", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> greaterThanOrEquals() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(">=", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(">=", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> lessThan() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("<", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("<", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> lessThanOrEquals() {
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits("<=", Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits("<=", theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public IMatches<IAndUnits> withComparator(QuantityCompararatorEnum theComparator) {
|
||||
final String cmp = theComparator != null ? theComparator.getCode() : "";
|
||||
return new NumberParam.IMatches<IAndUnits>() {
|
||||
@Override
|
||||
public IAndUnits number(long theNumber) {
|
||||
return new AndUnits(cmp, Long.toString(theNumber));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAndUnits number(String theNumber) {
|
||||
return new AndUnits(cmp, theNumber);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IAndUnits {
|
||||
|
||||
ICriterion andNoUnits();
|
||||
|
||||
ICriterion andUnits(String theUnits);
|
||||
|
||||
ICriterion andUnits(String theSystem, String theUnits);
|
||||
}
|
||||
|
||||
private class AndUnits implements IAndUnits {
|
||||
|
||||
private String myToken1;
|
||||
|
||||
public AndUnits(String theComparator, String theNumber) {
|
||||
myToken1 = defaultString(theComparator) + defaultString(theNumber);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andNoUnits() {
|
||||
return andUnits(null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andUnits(String theUnits) {
|
||||
return andUnits(theUnits, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion andUnits(String theSystem, String theUnits) {
|
||||
return new StringCriterion(getParamName(), myToken1 + "|" + defaultString(theSystem) + "|" + defaultString(theUnits));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,81 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
|
||||
public class ReferenceClientParam implements IParam {
|
||||
|
||||
private String myName;
|
||||
|
||||
public ReferenceClientParam(String theName) {
|
||||
myName = theName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myName;
|
||||
}
|
||||
|
||||
public ICriterion hasChainedProperty(ICriterion theICriterion) {
|
||||
return new ReferenceChainCriterion(getParamName(), theICriterion);
|
||||
}
|
||||
|
||||
/**
|
||||
* Match the referenced resource if the resource has the given ID (this can be
|
||||
* the logical ID or the absolute URL of the resource)
|
||||
*/
|
||||
public ICriterion hasId(IdDt theId) {
|
||||
return new StringCriterion(getParamName(), theId.getValue());
|
||||
}
|
||||
|
||||
/**
|
||||
* Match the referenced resource if the resource has the given ID (this can be
|
||||
* the logical ID or the absolute URL of the resource)
|
||||
*/
|
||||
public ICriterion hasId(String theId) {
|
||||
return new StringCriterion(getParamName(), theId);
|
||||
}
|
||||
|
||||
private static class ReferenceChainCriterion implements ICriterion, ICriterionInternal {
|
||||
|
||||
private String myParamName;
|
||||
private ICriterionInternal myWrappedCriterion;
|
||||
|
||||
public ReferenceChainCriterion(String theParamName, ICriterion theWrappedCriterion) {
|
||||
myParamName = theParamName;
|
||||
myWrappedCriterion = (ICriterionInternal) theWrappedCriterion;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterName() {
|
||||
return myParamName + "." + myWrappedCriterion.getParameterName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterValue() {
|
||||
return myWrappedCriterion.getParameterValue();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
|
|
@ -23,59 +21,15 @@ import ca.uhn.fhir.model.primitive.IdDt;
|
|||
*/
|
||||
|
||||
|
||||
public class ReferenceParam implements IParam {
|
||||
|
||||
private String myName;
|
||||
|
||||
public ReferenceParam(String theName) {
|
||||
myName = theName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myName;
|
||||
}
|
||||
|
||||
public ICriterion hasChainedProperty(ICriterion theICriterion) {
|
||||
return new ReferenceChainCriterion(getParamName(), theICriterion);
|
||||
}
|
||||
|
||||
/**
|
||||
* Match the referenced resource if the resource has the given ID (this can be
|
||||
* the logical ID or the absolute URL of the resource)
|
||||
* @deprecated Use {@link ReferenceClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public ICriterion hasId(IdDt theId) {
|
||||
return new StringCriterion(getParamName(), theId.getValue());
|
||||
public class ReferenceParam extends ReferenceClientParam {
|
||||
|
||||
public ReferenceParam(String theParamName) {
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Match the referenced resource if the resource has the given ID (this can be
|
||||
* the logical ID or the absolute URL of the resource)
|
||||
*/
|
||||
public ICriterion hasId(String theId) {
|
||||
return new StringCriterion(getParamName(), theId);
|
||||
}
|
||||
|
||||
private static class ReferenceChainCriterion implements ICriterion, ICriterionInternal {
|
||||
|
||||
private String myParamName;
|
||||
private ICriterionInternal myWrappedCriterion;
|
||||
|
||||
public ReferenceChainCriterion(String theParamName, ICriterion theWrappedCriterion) {
|
||||
myParamName = theParamName;
|
||||
myWrappedCriterion = (ICriterionInternal) theWrappedCriterion;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterName() {
|
||||
return myParamName + "." + myWrappedCriterion.getParameterName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameterValue() {
|
||||
return myWrappedCriterion.getParameterValue();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author james
|
||||
*
|
||||
*/
|
||||
public class StringClientParam implements IParam {
|
||||
|
||||
private final String myParamName;
|
||||
|
||||
public StringClientParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The string matches the given value (servers will often, but are not required to) implement this as a left match,
|
||||
* meaning that a value of "smi" would match "smi" and "smith".
|
||||
*/
|
||||
public IStringMatch matches() {
|
||||
return new StringMatches();
|
||||
}
|
||||
|
||||
/**
|
||||
* The string matches exactly the given value
|
||||
*/
|
||||
public IStringMatch matchesExactly() {
|
||||
return new StringExactly();
|
||||
}
|
||||
|
||||
public interface IStringMatch {
|
||||
|
||||
ICriterion value(String theValue);
|
||||
|
||||
ICriterion value(StringDt theValue);
|
||||
|
||||
}
|
||||
|
||||
private class StringExactly implements IStringMatch {
|
||||
@Override
|
||||
public ICriterion value(String theValue) {
|
||||
return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion value(StringDt theValue) {
|
||||
return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private class StringMatches implements IStringMatch {
|
||||
@Override
|
||||
public ICriterion value(String theValue) {
|
||||
return new StringCriterion(getParamName(), theValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion value(StringDt theValue) {
|
||||
return new StringCriterion(getParamName(), theValue.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,73 +20,16 @@ package ca.uhn.fhir.rest.gclient;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author james
|
||||
*
|
||||
* @deprecated Use {@link StringClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public class StringParam implements IParam {
|
||||
|
||||
private final String myParamName;
|
||||
public class StringParam extends StringClientParam {
|
||||
|
||||
public StringParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The string matches the given value (servers will often, but are not required to) implement this as a left match,
|
||||
* meaning that a value of "smi" would match "smi" and "smith".
|
||||
*/
|
||||
public IStringMatch matches() {
|
||||
return new StringMatches();
|
||||
}
|
||||
|
||||
/**
|
||||
* The string matches exactly the given value
|
||||
*/
|
||||
public IStringMatch matchesExactly() {
|
||||
return new StringExactly();
|
||||
}
|
||||
|
||||
public interface IStringMatch {
|
||||
|
||||
ICriterion value(String theValue);
|
||||
|
||||
ICriterion value(StringDt theValue);
|
||||
|
||||
}
|
||||
|
||||
private class StringExactly implements IStringMatch {
|
||||
@Override
|
||||
public ICriterion value(String theValue) {
|
||||
return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion value(StringDt theValue) {
|
||||
return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
private class StringMatches implements IStringMatch {
|
||||
@Override
|
||||
public ICriterion value(String theValue) {
|
||||
return new StringCriterion(getParamName(), theValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion value(StringDt theValue) {
|
||||
return new StringCriterion(getParamName(), theValue.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,122 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
*/
|
||||
public class TokenClientParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
|
||||
public TokenClientParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
}
|
||||
|
||||
public IMatches exactly() {
|
||||
return new IMatches() {
|
||||
@Override
|
||||
public ICriterion systemAndCode(String theSystem, String theCode) {
|
||||
return new TokenCriterion(getParamName(), theSystem, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion systemAndIdentifier(String theSystem, String theCode) {
|
||||
return new TokenCriterion(getParamName(), theSystem, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion code(String theCode) {
|
||||
return new TokenCriterion(getParamName(), null, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion identifier(String theIdentifier) {
|
||||
return new TokenCriterion(getParamName(), null, theIdentifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion identifier(IdentifierDt theIdentifier) {
|
||||
return new TokenCriterion(getParamName(), theIdentifier.getSystem().getValueAsString(), theIdentifier.getValue().getValue());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IMatches {
|
||||
/**
|
||||
* Creates a search criterion that matches against the given code system and code
|
||||
*
|
||||
* @param theSystem
|
||||
* The code system (should be a URI)
|
||||
* @param theCode
|
||||
* The code
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion systemAndCode(String theSystem, String theCode);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given system and identifier
|
||||
*
|
||||
* @param theSystem
|
||||
* The code system (should be a URI)
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion systemAndIdentifier(String theSystem, String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given identifier, with no system specified
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion identifier(String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given code, with no code system specified
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion code(String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given identifier (system and code if both are present, or whatever is present)
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion identifier(IdentifierDt theIdentifier);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
package ca.uhn.fhir.rest.gclient;
|
||||
|
||||
import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
|
|
@ -24,99 +22,14 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
|
|||
|
||||
|
||||
/**
|
||||
* Token parameter type for use in fluent client interfaces
|
||||
* @deprecated Use {@link TokenClientParam} instead. That class is identical to this one but was renamed to reduct
|
||||
* confusing duplicate names in the API. This class will be removed in a future release.
|
||||
*/
|
||||
public class TokenParam implements IParam {
|
||||
|
||||
private String myParamName;
|
||||
|
||||
@Override
|
||||
public String getParamName() {
|
||||
return myParamName;
|
||||
}
|
||||
public class TokenParam extends TokenClientParam {
|
||||
|
||||
public TokenParam(String theParamName) {
|
||||
myParamName = theParamName;
|
||||
super(theParamName);
|
||||
}
|
||||
|
||||
public IMatches exactly() {
|
||||
return new IMatches() {
|
||||
@Override
|
||||
public ICriterion systemAndCode(String theSystem, String theCode) {
|
||||
return new TokenCriterion(getParamName(), theSystem, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion systemAndIdentifier(String theSystem, String theCode) {
|
||||
return new TokenCriterion(getParamName(), theSystem, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion code(String theCode) {
|
||||
return new TokenCriterion(getParamName(), null, theCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion identifier(String theIdentifier) {
|
||||
return new TokenCriterion(getParamName(), null, theIdentifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ICriterion identifier(IdentifierDt theIdentifier) {
|
||||
return new TokenCriterion(getParamName(), theIdentifier.getSystem().getValueAsString(), theIdentifier.getValue().getValue());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public interface IMatches {
|
||||
/**
|
||||
* Creates a search criterion that matches against the given code system and code
|
||||
*
|
||||
* @param theSystem
|
||||
* The code system (should be a URI)
|
||||
* @param theCode
|
||||
* The code
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion systemAndCode(String theSystem, String theCode);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given system and identifier
|
||||
*
|
||||
* @param theSystem
|
||||
* The code system (should be a URI)
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion systemAndIdentifier(String theSystem, String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given identifier, with no system specified
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion identifier(String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given code, with no code system specified
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion code(String theIdentifier);
|
||||
|
||||
/**
|
||||
* Creates a search criterion that matches against the given identifier (system and code if both are present, or whatever is present)
|
||||
*
|
||||
* @param theIdentifier
|
||||
* The identifier
|
||||
* @return A criterion
|
||||
*/
|
||||
ICriterion identifier(IdentifierDt theIdentifier);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package example;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.annotation.Documented;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
|
@ -17,6 +18,7 @@ import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
|
|||
import ca.uhn.fhir.model.api.Tag;
|
||||
import ca.uhn.fhir.model.api.TagList;
|
||||
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
|
||||
import ca.uhn.fhir.model.api.annotation.Description;
|
||||
import ca.uhn.fhir.model.api.annotation.TagListParam;
|
||||
import ca.uhn.fhir.model.dstu.composite.CodingDt;
|
||||
import ca.uhn.fhir.model.dstu.resource.Conformance;
|
||||
|
|
@ -150,11 +152,34 @@ return retVal;
|
|||
//END SNIPPET: reference
|
||||
|
||||
|
||||
//START SNIPPET: referenceChain
|
||||
@Search
|
||||
public List<Patient> findObservations(
|
||||
@RequiredParam(name=Observation.SP_SUBJECT+'.'+Patient.SP_IDENTIFIER) TokenParam theProvider
|
||||
) {
|
||||
|
||||
String system = theProvider.getSystem();
|
||||
String identifier = theProvider.getValue();
|
||||
|
||||
// ...Do a search for all observations for the given subject...
|
||||
|
||||
List<Patient> retVal=new ArrayList<Patient>(); // populate this
|
||||
return retVal;
|
||||
|
||||
}
|
||||
//END SNIPPET: referenceChain
|
||||
|
||||
|
||||
//START SNIPPET: read
|
||||
@Read()
|
||||
public Patient getResourceById(@IdParam IdDt theId) {
|
||||
Patient retVal = new Patient();
|
||||
|
||||
// ...populate...
|
||||
retVal.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345");
|
||||
retVal.addName().addFamily("Smith").addGiven("Tester").addGiven("Q");
|
||||
// ...etc...
|
||||
|
||||
return retVal;
|
||||
}
|
||||
//END SNIPPET: read
|
||||
|
|
@ -196,7 +221,15 @@ public List<Patient> getPatientHistory(@IdParam IdDt theId) {
|
|||
@Read(version=true)
|
||||
public Patient readOrVread(@IdParam IdDt theId) {
|
||||
Patient retVal = new Patient();
|
||||
|
||||
if (theId.hasVersionIdPart()) {
|
||||
// this is a vread
|
||||
} else {
|
||||
// this is a read
|
||||
}
|
||||
|
||||
// ...populate...
|
||||
|
||||
return retVal;
|
||||
}
|
||||
//END SNIPPET: vread
|
||||
|
|
@ -204,8 +237,6 @@ public Patient readOrVread(@IdParam IdDt theId) {
|
|||
//START SNIPPET: searchStringParam
|
||||
@Search()
|
||||
public List<Patient> searchByLastName(@RequiredParam(name=Patient.SP_FAMILY) StringParam theFamily) {
|
||||
List<Patient> retVal = new ArrayList<Patient>();
|
||||
|
||||
String valueToMatch = theFamily.getValue();
|
||||
|
||||
if (theFamily.isExact()) {
|
||||
|
|
@ -215,6 +246,28 @@ public List<Patient> searchByLastName(@RequiredParam(name=Patient.SP_FAMILY) Str
|
|||
}
|
||||
|
||||
// ...populate...
|
||||
Patient patient = new Patient();
|
||||
patient.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345");
|
||||
patient.addName().addFamily("Smith").addGiven("Tester").addGiven("Q");
|
||||
// ...etc...
|
||||
|
||||
/*
|
||||
* Every returned resource must have its logical ID set. If the server
|
||||
* supports versioning, that should be set too
|
||||
*/
|
||||
String logicalId = "4325";
|
||||
String versionId = "2"; // optional
|
||||
patient.setId(new IdDt("Patient", logicalId, versionId));
|
||||
|
||||
/*
|
||||
* This is obviously a fairly contrived example since we are always
|
||||
* just returning the same hardcoded patient, but in a real scenario
|
||||
* you could return as many resources as you wanted, and they
|
||||
* should actually match the given search criteria.
|
||||
*/
|
||||
List<Patient> retVal = new ArrayList<Patient>();
|
||||
retVal.add(patient);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
//END SNIPPET: searchStringParam
|
||||
|
|
@ -253,6 +306,23 @@ public List<Patient> searchByNames( @RequiredParam(name=Patient.SP_FAMILY) Strin
|
|||
}
|
||||
//END SNIPPET: searchOptionalParam
|
||||
|
||||
//START SNIPPET: searchWithDocs
|
||||
@Description(shortDefinition="This search finds all patient resources matching a given name combination")
|
||||
@Search()
|
||||
public List<Patient> searchWithDocs(
|
||||
@Description(shortDefinition="This is the patient's last name - Supports partial matches")
|
||||
@RequiredParam(name=Patient.SP_FAMILY) StringParam theFamilyName,
|
||||
|
||||
@Description(shortDefinition="This is the patient's given names")
|
||||
@OptionalParam(name=Patient.SP_GIVEN) StringParam theGivenName ) {
|
||||
|
||||
List<Patient> retVal = new ArrayList<Patient>();
|
||||
// ...populate...
|
||||
return retVal;
|
||||
}
|
||||
//END SNIPPET: searchWithDocs
|
||||
|
||||
|
||||
//START SNIPPET: searchMultiple
|
||||
@Search()
|
||||
public List<Observation> searchByObservationNames( @RequiredParam(name=Observation.SP_NAME) TokenOrListParam theCodings ) {
|
||||
|
|
@ -498,10 +568,8 @@ public abstract MethodOutcome updateSomePatient(@IdParam IdDt theId, @ResourcePa
|
|||
@Validate
|
||||
public MethodOutcome validatePatient(@ResourceParam Patient thePatient) {
|
||||
|
||||
/*
|
||||
* Actually do our validation: The UnprocessableEntityException
|
||||
* results in an HTTP 422, which is appropriate for business rule failure
|
||||
*/
|
||||
// Actually do our validation: The UnprocessableEntityException
|
||||
// results in an HTTP 422, which is appropriate for business rule failure
|
||||
if (thePatient.getIdentifierFirstRep().isEmpty()) {
|
||||
/* It is also possible to pass an OperationOutcome resource
|
||||
* to the UnprocessableEntityException if you want to return
|
||||
|
|
|
|||
|
|
@ -488,8 +488,8 @@
|
|||
|
||||
<p>
|
||||
Parameters which take a string as their format should use the
|
||||
<a href="./apidocs/ca/uhn/fhir/rest/param/StringParameter.html">StringParameter</a>
|
||||
type. They may also use normal java Strings (or HAPI's StringDt), although it is
|
||||
<a href="./apidocs/ca/uhn/fhir/rest/param/StringParam.html">StringParam</a>
|
||||
type. They may also use normal java Strings, although it is
|
||||
not possible to use the ":exact" qualifier in that case.
|
||||
</p>
|
||||
|
||||
|
|
@ -507,11 +507,6 @@
|
|||
</subsection>
|
||||
<subsection name="Search Parameters: Token/Identifier">
|
||||
|
||||
<p>
|
||||
Searches method parameters may be of any type that implements the
|
||||
<a href="./apidocs/ca/uhn/fhir/model/api/IQueryParameterType.html">IQueryParameterType</a>
|
||||
interface.
|
||||
</p>
|
||||
<p>
|
||||
The "token" type is used for parameters which have two parts, such as
|
||||
an idnetifier (which has a system URI, as well as the actual identifier)
|
||||
|
|
@ -537,7 +532,7 @@
|
|||
|
||||
<p>
|
||||
The FHIR specification provides a sytax for specifying
|
||||
dates (and date/times as well, but for simplicity we will just say dates here)
|
||||
dates+times (but for simplicity we will just say dates here)
|
||||
as search criteria.
|
||||
</p>
|
||||
|
||||
|
|
@ -550,8 +545,7 @@
|
|||
|
||||
<p>
|
||||
To accept a qualified date parameter, use the
|
||||
QualifiedDateParam
|
||||
parameter type.
|
||||
DateParam parameter type.
|
||||
</p>
|
||||
|
||||
<macro name="snippet">
|
||||
|
|
@ -716,6 +710,21 @@
|
|||
Resource by chained parameter value: <code>http://fhir.example.com/Patient?provider:Organization.name=FooOrg</code>
|
||||
</p>
|
||||
|
||||
<h4>Static Chains</h4>
|
||||
|
||||
<p>
|
||||
It is also possible to explicitly state a chained value right in the parameter name.
|
||||
This is useful if you want to only support a search by a specific given chained
|
||||
parameter. It has the added bonus that you can use the correct parameter type of
|
||||
the chained parameter (in this case a TokenParameter because the Patient.identifier
|
||||
parameter is a token)
|
||||
</p>
|
||||
|
||||
<macro name="snippet">
|
||||
<param name="id" value="referenceChain" />
|
||||
<param name="file" value="src/site/example/java/example/RestfulPatientResourceProviderMore.java" />
|
||||
</macro>
|
||||
|
||||
</subsection>
|
||||
|
||||
<subsection name="Combining Multiple Parameters">
|
||||
|
|
@ -723,7 +732,6 @@
|
|||
<p>
|
||||
Search methods may take multiple parameters, and these parameters
|
||||
may (or may not) be optional.
|
||||
aaaa
|
||||
To add a second required parameter, annotate the
|
||||
parameter with
|
||||
<a href="./apidocs/ca/uhn/fhir/rest/server/parameters/RequiredParam.html">@RequiredParam</a>
|
||||
|
|
@ -743,6 +751,25 @@
|
|||
only @OptionalParam parameters, or any combination of the two.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you wish to create a server that can accept any combination of a large number
|
||||
of parameters, (this is how the various reference servers behave, as well as the
|
||||
<a href="http://fhirtest.uhn.ca">public HAPI server</a>)
|
||||
the easiest way to accomplish this is to simply create one method
|
||||
with all allowable parameters, each annotated as @OptionalParam.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
On the other hand, if you have specific combinations of parameters you wish to
|
||||
support (a common scenario if you are building FHIR on top of existing data sources
|
||||
and only have certain indexes you can use) you could create multiple search methods,
|
||||
each with specific required and optional parameters matching the database indexes.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
The following example shows a method with two parameters.
|
||||
</p>
|
||||
|
||||
<macro name="snippet">
|
||||
<param name="id" value="searchOptionalParam" />
|
||||
<param name="file" value="src/site/example/java/example/RestfulPatientResourceProviderMore.java" />
|
||||
|
|
@ -758,7 +785,7 @@
|
|||
|
||||
</subsection>
|
||||
|
||||
<subsection name="Composite (Multi-Valued) Parameters">
|
||||
<subsection name="Multi-Valued (AND/OR) Parameters">
|
||||
|
||||
<p>
|
||||
It is possible to accept multiple values of a single parameter
|
||||
|
|
@ -853,7 +880,7 @@
|
|||
<p>
|
||||
Example URL to invoke this method:
|
||||
<br />
|
||||
<code>http://fhir.example.com/DiagnosticReport?subject.identifier=7000135&_include=DiagnosticReport.subject</code>
|
||||
<code>http://fhir.example.com/DiagnosticReport?identifier=7000135&_include=DiagnosticReport.subject</code>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -869,6 +896,25 @@
|
|||
|
||||
</subsection>
|
||||
|
||||
<subsection name="Adding Descriptions">
|
||||
|
||||
<p>
|
||||
It is also possible to annotate search methods and/or parameters with
|
||||
the
|
||||
<a href="./apidocs/ca/uhn/fhir/model/api/annotation/Description.html">@Description</a>
|
||||
annotation. This annotation allows you to add a description of the method
|
||||
and the individual parameters. These descriptions will be placed in the
|
||||
server's metadata statement, which cam be helpful to anyone who is developing
|
||||
software against your server.
|
||||
</p>
|
||||
|
||||
<macro name="snippet">
|
||||
<param name="id" value="searchWithDocs" />
|
||||
<param name="file" value="src/site/example/java/example/RestfulPatientResourceProviderMore.java" />
|
||||
</macro>
|
||||
|
||||
</subsection>
|
||||
|
||||
<subsection name="Named Queries (_query)">
|
||||
|
||||
<p>
|
||||
|
|
@ -948,7 +994,7 @@
|
|||
<a href="http://hl7.org/implement/standards/fhir/http.html#validate">
|
||||
<b>validate</b>
|
||||
</a>
|
||||
tests whether a resource passes business validation, and would be
|
||||
operation tests whether a resource passes business validation, and would be
|
||||
acceptable for saving to a server (e.g. by a create or update method).
|
||||
</p>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -150,29 +150,28 @@ public class FhirResourceDao<T extends IResource> extends BaseFhirDao implements
|
|||
Predicate lb = null;
|
||||
if (lowerBound != null) {
|
||||
Predicate gt = builder.greaterThanOrEqualTo(from.<Date> get("myValueLow"), lowerBound);
|
||||
Predicate gin = builder.isNull(from.get("myValueLow"));
|
||||
Predicate lbo = builder.or(gt, gin);
|
||||
|
||||
Predicate lt = builder.greaterThanOrEqualTo(from.<Date> get("myValueHigh"), lowerBound);
|
||||
Predicate lin = builder.isNull(from.get("myValueHigh"));
|
||||
Predicate hbo = builder.or(lt, lin);
|
||||
|
||||
lb = builder.or(gt, lt);
|
||||
|
||||
// Predicate gin = builder.isNull(from.get("myValueLow"));
|
||||
// Predicate lbo = builder.or(gt, gin);
|
||||
// Predicate lin = builder.isNull(from.get("myValueHigh"));
|
||||
// Predicate hbo = builder.or(lt, lin);
|
||||
// lb = builder.and(lbo, hbo);
|
||||
}
|
||||
|
||||
Predicate ub = null;
|
||||
if (upperBound != null) {
|
||||
Predicate gt = builder.lessThanOrEqualTo(from.<Date> get("myValueLow"), upperBound);
|
||||
Predicate gin = builder.isNull(from.get("myValueLow"));
|
||||
Predicate lbo = builder.or(gt, gin);
|
||||
|
||||
Predicate lt = builder.lessThanOrEqualTo(from.<Date> get("myValueHigh"), upperBound);
|
||||
Predicate lin = builder.isNull(from.get("myValueHigh"));
|
||||
Predicate ubo = builder.or(lt, lin);
|
||||
|
||||
ub = builder.or(gt, lt);
|
||||
|
||||
// Predicate gin = builder.isNull(from.get("myValueLow"));
|
||||
// Predicate lbo = builder.or(gt, gin);
|
||||
// Predicate lin = builder.isNull(from.get("myValueHigh"));
|
||||
// Predicate ubo = builder.or(lt, lin);
|
||||
// ub = builder.and(ubo, lbo);
|
||||
|
||||
}
|
||||
|
||||
if (lb != null && ub != null) {
|
||||
|
|
@ -208,6 +207,9 @@ public class FhirResourceDao<T extends IResource> extends BaseFhirDao implements
|
|||
return found;
|
||||
}
|
||||
|
||||
// private Set<Long> addPredicateComposite(String theParamName, Set<Long> thePids, List<? extends IQueryParameterType> theList) {
|
||||
// }
|
||||
|
||||
private Set<Long> addPredicateQuantity(String theParamName, Set<Long> thePids, List<? extends IQueryParameterType> theList) {
|
||||
if (theList == null || theList.isEmpty()) {
|
||||
return thePids;
|
||||
|
|
@ -1189,7 +1191,6 @@ public class FhirResourceDao<T extends IResource> extends BaseFhirDao implements
|
|||
private MethodOutcome toMethodOutcome(final ResourceTable entity) {
|
||||
MethodOutcome outcome = new MethodOutcome();
|
||||
outcome.setId(entity.getIdDt());
|
||||
outcome.setVersionId(new IdDt(entity.getVersion()));
|
||||
return outcome;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@ package ca.uhn.fhir.jpa.test;
|
|||
import static org.hamcrest.Matchers.*;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
|
|
@ -17,29 +14,20 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
|
||||
import ca.uhn.fhir.jpa.dao.IFhirSystemDao;
|
||||
import ca.uhn.fhir.jpa.provider.JpaConformanceProvider;
|
||||
import ca.uhn.fhir.jpa.provider.JpaSystemProvider;
|
||||
import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
|
||||
import ca.uhn.fhir.model.api.Bundle;
|
||||
import ca.uhn.fhir.model.api.BundleEntry;
|
||||
import ca.uhn.fhir.model.api.ExtensionDt;
|
||||
import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
|
||||
import ca.uhn.fhir.model.dstu.resource.Conformance;
|
||||
import ca.uhn.fhir.model.dstu.resource.Conformance.Rest;
|
||||
import ca.uhn.fhir.model.dstu.resource.Conformance.RestResource;
|
||||
import ca.uhn.fhir.model.dstu.resource.Observation;
|
||||
import ca.uhn.fhir.model.dstu.resource.Organization;
|
||||
import ca.uhn.fhir.model.dstu.resource.Patient;
|
||||
import ca.uhn.fhir.model.dstu.resource.Questionnaire;
|
||||
import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
|
||||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
|
||||
import ca.uhn.fhir.rest.client.IGenericClient;
|
||||
import ca.uhn.fhir.rest.server.RestfulServer;
|
||||
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
|
||||
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
|
||||
import ca.uhn.fhir.util.ExtensionConstants;
|
||||
import ca.uhn.test.jpasrv.ObservationResourceProvider;
|
||||
import ca.uhn.test.jpasrv.OrganizationResourceProvider;
|
||||
import ca.uhn.test.jpasrv.PatientResourceProvider;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<dependent-module archiveName="hapi-fhir-base-0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&excludes=META-INF/MANIFEST.MF">
|
||||
<dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-tester-overlay?includes=**/**&excludes=META-INF/MANIFEST.MF">
|
||||
<dependency-type>consumes</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&excludes=META-INF/MANIFEST.MF">
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ import ca.uhn.fhir.rest.client.IGenericClient;
|
|||
import ca.uhn.fhir.rest.gclient.ICreateTyped;
|
||||
import ca.uhn.fhir.rest.gclient.IQuery;
|
||||
import ca.uhn.fhir.rest.gclient.IUntypedQuery;
|
||||
import ca.uhn.fhir.rest.gclient.StringParam;
|
||||
import ca.uhn.fhir.rest.gclient.StringClientParam;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
import ca.uhn.fhir.rest.server.EncodingEnum;
|
||||
import ca.uhn.fhir.to.model.HomeRequest;
|
||||
|
|
@ -907,7 +907,7 @@ public class Controller {
|
|||
theClientCodeJsonWriter.write("value", nextValue);
|
||||
theClientCodeJsonWriter.writeEnd();
|
||||
|
||||
theQuery.where(new StringParam(nextName + nextQualifier).matches().value(nextValue));
|
||||
theQuery.where(new StringClientParam(nextName + nextQualifier).matches().value(nextValue));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ public class ${className} extends BaseResource implements IResource {
|
|||
* Path: <b>${param.path}</b><br/>
|
||||
* </p>
|
||||
*/
|
||||
public static final ${param.typeCapitalized}Param ${param.fluentConstantName} = new ${param.typeCapitalized}Param(${param.constantName});
|
||||
public static final ${param.typeCapitalized}ClientParam ${param.fluentConstantName} = new ${param.typeCapitalized}ClientParam(${param.constantName});
|
||||
|
||||
#if( ${param.typeCapitalized} == 'Reference' )
|
||||
#foreach ( $include in $param.paths )
|
||||
|
|
|
|||
Loading…
Reference in New Issue