Updated CPLCCR0 to include a more comprehensive medication section.

p/GPLCCR0.m

@@ -271,21 +271,17 @@ LOAD(ARY)       ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<CCRDataObjectID>@@MEDICATIONOBJECTID@@</CCRDataObjectID>
  ;;<DateTime>
  ;;<Type>
- ;;<Text>@@MEDICATIONDATETIMETEXT@@</Text>
+ ;;<Text>@@MEDICATIONISSUEDATETXT@@</Text>
  ;;</Type>
- ;;<Age>
+ ;;<ExactDateTime>@@MEDICATIONISSUEDATE@@</ExactDateTime>
- ;;<Value>@@MEDICATIONDATETIMEAGE@@</Value>
+ ;;<Type>
- ;;<Units>
+ ;;<Text>@@MEDICATIONLASTFILLDATETXT@@</Text>
- ;;<Unit>@@MEDICATIONDATETIMEAGEUNITS@@</Unit>
+ ;;</Type>
- ;;</Units>
+ ;;<ExactDateTime>@@MEDICATIONLASTFILLDATE@@</ExactDateTime>
- ;;</Age>
  ;;</DateTime>
  ;;<Type>
  ;;<Text>@@MEDICATIONTYPETEXT@@</Text>
  ;;</Type>
- ;;<Description>
- ;;<Text>@@MEDICATIONDESCRIPTIONTEXT@@</Text>
- ;;</Description>
  ;;<Status>
  ;;<Text>@@MEDICATIONSTATUSTEXT@@</Text>
  ;;</Status>
@@ -305,11 +301,6 @@ LOAD(ARY)       ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;</ProductName>
  ;;<BrandName>
  ;;<Text>@@MEDICATIONBRANDNAMETEXT@@</Text>
- ;;<Code>
- ;;<Value>@@MEDICATIONBRANDNAMECODEVALUE@@</Value>
- ;;<CodingSystem>@@MEDICATIONBRANDNAMECODINGSYSTEM@@</CodingSystem>
- ;;<Version>@@MEDICATIONBRANDNAMECODEVERSION@@</Version>
- ;;</Code>
  ;;</BrandName>
  ;;<Strength>
  ;;<Value>@@MEDICATIONSTRENGTHVALUE@@</Value>
@@ -320,21 +311,60 @@ LOAD(ARY)       ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<Form>
  ;;<Text>@@MEDICATIONFORMTEXT@@</Text>
  ;;</Form>
+ ;;<Concentration>
+ ;;<Text>@@MEDICATIONCONCENTRATIONTEXT@@</Text>
+ ;;</Concentration>
+ ;;<Size>
+ ;;<Text>@@MEDICATIONSIZETEXT</Text>
+ ;;</Size>
  ;;</Product>
+ ;;<Quantity>
+ ;;<Value>@@MEDICATIONQUANTITYVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONQUANTITYUNIT@@</Unit>
+ ;;</Units>
  ;;<Directions>
  ;;<Direction>
  ;;<Description>
  ;;<Text>@@MEDICATIONDIRECTIONDESCRIPTIONTEXT@@</Text>
  ;;</Description>
+ ;;<DoseIndicator>@@MEDICATIONDOSEINDICATOR@@</DoseIndicator>
+ ;;<DeliveryMethod>@@MEDICATIONDELIVERYMETHOD@@</DeliveryMethod>
  ;;<Dose>
  ;;<Value>@@MEDICATIONDIRECTIONDOSEVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONDOSEUNIT@@</Unit>
+ ;;</Units>
+ ;;<Rate>
+ ;;<Value>@@MEDICATIONDIRECTIONRATEVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONRATEUNIT@@</Unit>
+ ;;</Units>
+ ;;</Rate>
  ;;</Dose>
+ ;;<Vehicle>
+ ;;<Text>@@MEDICATIONVEHICLETEXT@@</Text>
+ ;;</Vehicle>
  ;;<Route>
  ;;<Text>@@MEDICATIONDIRECTIONROUTETEXT@@</Text>
  ;;</Route>
  ;;<Frequency>
- ;;<Value>@@MEDICATIONDIRECTIONFREQUENCYVALUE@@</Value>
+ ;;<Value>@@MEDICATIONFREQUENCYVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONFREQUENCYUNIT@@</Unit>
+ ;;<Units>
  ;;</Frequency>
+ ;;<Interval>
+ ;;<Value>@@MEDICATIONINTERVALVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONINTERVALUNIT@@</Unit>
+ ;;<Units>
+ ;;</Interval>
+ ;;<Duration>
+ ;;<Value>@@MEDICATIONDURATIONVALUE@@</Value>
+ ;;<Units>
+ ;;<Unit>@@MEDICATIONDURATIONUNIT@@</Unit>
+ ;;</Duration>
  ;;</Direction>
  ;;</Directions>
  ;;</Medication>