lib/fhir_models/definitions/schema/specimen.xsd in fhir_models-3.0.4 vs lib/fhir_models/definitions/schema/specimen.xsd in fhir_models-4.0.0

- old
+ new

@@ -25,11 +25,11 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Generated on Wed, Apr 26, 2017 18:33-0400 for FHIR v3.0.0 + Generated on Thu, Dec 27, 2018 22:37+1100 for FHIR v4.0.0 Note: the schemas &amp; schematrons do not contain all of the rules about what makes resources valid. Implementers will still need to be familiar with the content of the specification and with any profiles that apply to the resources in order to make a conformant implementation. @@ -54,11 +54,11 @@ </xs:element> <xs:element name="type" minOccurs="0" maxOccurs="1" type="CodeableConcept"> </xs:element> - <xs:element name="subject" minOccurs="1" maxOccurs="1" type="Reference"> + <xs:element name="subject" minOccurs="0" maxOccurs="1" type="Reference"> </xs:element> <xs:element name="receivedTime" minOccurs="0" maxOccurs="1" type="dateTime"> </xs:element> @@ -75,10 +75,13 @@ </xs:element> <xs:element name="container" type="Specimen.Container" minOccurs="0" maxOccurs="unbounded"> </xs:element> + <xs:element name="condition" minOccurs="0" maxOccurs="unbounded" type="CodeableConcept"> + + </xs:element> <xs:element name="note" minOccurs="0" maxOccurs="unbounded" type="Annotation"> </xs:element> </xs:sequence> </xs:extension> @@ -95,18 +98,26 @@ <xs:choice minOccurs="0" maxOccurs="1"> <xs:element name="collectedDateTime" type="dateTime"/> <xs:element name="collectedPeriod" type="Period"/> </xs:choice> + <xs:element name="duration" minOccurs="0" maxOccurs="1" type="Duration"> + + </xs:element> <xs:element name="quantity" minOccurs="0" maxOccurs="1" type="Quantity"> </xs:element> <xs:element name="method" minOccurs="0" maxOccurs="1" type="CodeableConcept"> </xs:element> <xs:element name="bodySite" minOccurs="0" maxOccurs="1" type="CodeableConcept"> </xs:element> + <xs:choice minOccurs="0" maxOccurs="1"> + + <xs:element name="fastingStatusCodeableConcept" type="CodeableConcept"/> + <xs:element name="fastingStatusDuration" type="Duration"/> + </xs:choice> </xs:sequence> </xs:extension> </xs:complexContent> </xs:complexType> <xs:complexType name="Specimen.Processing">