Skip to content

Commit

Permalink
Fixes + best practices applied to NIST examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmandel
jmandel committed Dec 15, 2012
1 parent de85080 commit 3c6357f
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 435 deletions.
152 changes: 8 additions & 144 deletions files/CCDA_CCD_b1_Ambulatory_v2.xml
View file
Expand Up @@ -1377,7 +1377,7 @@ IMMUNIZATIONS
<tr>
<td><content
ID="immun4"/>Tetanus and diphtheria toxoids, IM</td>
<td>Aor 2012</td>
<td>Apr 2012</td>
<td>Completed</td>
</tr>
</tbody>
Expand Down Expand Up @@ -2526,7 +2526,7 @@ PROBLEM LIST
<low
value="20120806"/>
<high
value="20120806"/>
value="20120813"/>
</effectiveTime>
<entryRelationship
typeCode="SUBJ">
Expand All @@ -2549,45 +2549,14 @@ PROBLEM LIST
<statusCode
code="completed"/>
<effectiveTime>
<low
value="20120806"/>
<low value="20120806"/>
<high value="20120813"/>
</effectiveTime>
<value
xsi:type="CD"
code="233604007"
codeSystem="2.16.840.1.113883.6.96"
displayName="Pneumonia"/>
<entryRelationship
typeCode="REFR">
<observation
classCode="OBS"
moodCode="EVN">
<!-- Problem observation template -->
<templateId
root="2.16.840.1.113883.10.20.22.4.68"/>
<id
root="ab1791b0-5c71-11db-b0de-0800200c9a66"/>
<code
code="409586006"
codeSystem="2.16.840.1.113883.6.96"
displayName="Complaint"/>
<text>
<reference
value="#problem1"/>
</text>
<statusCode
code="completed"/>
<effectiveTime>
<low
value="20120806"/>
</effectiveTime>
<value
xsi:type="CD"
code="233604007"
codeSystem="2.16.840.1.113883.6.96"
displayName="Pneumonia"/>
</observation>
</entryRelationship>
<entryRelationship
typeCode="SUBJ"
inversionInd="true">
Expand Down Expand Up @@ -2672,12 +2641,10 @@ PROBLEM LIST
codeSystem="2.16.840.1.113883.5.6"
displayName="Concern"/>
<statusCode
code="completed"/>
code="active"/>
<effectiveTime>
<low
value="20070103"/>
<high
value="20120806"/>
</effectiveTime>
<entryRelationship
typeCode="SUBJ">
Expand Down Expand Up @@ -2708,37 +2675,6 @@ PROBLEM LIST
code="195967001"
codeSystem="2.16.840.1.113883.6.96"
displayName="Asthma"/>
<entryRelationship
typeCode="REFR">
<observation
classCode="OBS"
moodCode="EVN">
<!-- Problem observation template -->
<templateId
root="2.16.840.1.113883.10.20.22.4.68"/>
<id
root="ab1791b0-5c71-11db-b0de-0800200c9a66"/>
<code
code="409586006"
codeSystem="2.16.840.1.113883.6.96"
displayName="Complaint"/>
<text>
<reference
value="#problem2"/>
</text>
<statusCode
code="completed"/>
<effectiveTime>
<low
value="20120806"/>
</effectiveTime>
<value
xsi:type="CD"
code="195967001"
codeSystem="2.16.840.1.113883.6.96"
displayName="Asthma"/>
</observation>
</entryRelationship>
<entryRelationship
typeCode="SUBJ"
inversionInd="true">
Expand All @@ -2756,7 +2692,7 @@ PROBLEM LIST
code="completed"/>
<value
xsi:type="PQ"
value="65"
value="59"
unit="a"/>
</observation>
</entryRelationship>
Expand Down Expand Up @@ -3331,16 +3267,8 @@ SOCIAL HISTORY
<tr>
<td>
<content
ID="soc1"/> smoking</td>
<td>Former Smoker (1 pack per day</td>
<td>20050501 to 20110227</td>
</tr>
<tr>
<td>
<content
ID="soc2"/> smoking</td>
<td>Current Everyday Smoker 2 packs per day</td>
<td>20110227 - today</td>
ID="smok1"/> Former smoker (smoked from 2005-2011)
</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -3374,70 +3302,6 @@ SOCIAL HISTORY
codeSystem="2.16.840.1.113883.6.96"/>
</observation>
</entry>
<entry
typeCode="DRIV">
<observation
classCode="OBS"
moodCode="EVN">
<templateId
root="2.16.840.1.113883.10.20.22.4.38"/>
<!-- ******** Social history observation template ******** -->
<id
root="9b56c25d-9104-45ee-9fa4-e0f3afaa01c1"/>
<code
code="230056004"
codeSystem="2.16.840.1.113883.6.96"
displayName="Cigarette smoking">
<originalText>
<reference
value="#soc1"/>
</originalText>
</code>
<statusCode
code="completed"/>
<effectiveTime>
<low
value="20050501"/>
<high
value="20110227"/>
</effectiveTime>
<value
xsi:type="ST">1 pack per day</value>
</observation>
</entry>
<entry
typeCode="DRIV">
<observation
classCode="OBS"
moodCode="EVN">
<templateId
root="2.16.840.1.113883.10.20.22.4.38"/>
<!-- ******** Social history observation template ******** -->
<id
root="45efb604-7049-4a2e-ad33-d38556c9636c"/>
<code
code="230056004"
codeSystem="2.16.840.1.113883.6.96"
displayName="Cigarette smoking">
<originalText>
<reference
value="#soc2"/>
</originalText>
</code>
<statusCode
code="completed"/>
<effectiveTime>
<low
value="20110227"/>
<high nullFlavor="UNK"/>
</effectiveTime>
<value
xsi:type="CD"
code="449868002"
displayName="Current Everyday Smoker"
codeSystem="2.16.840.1.113883.6.96"/>
</observation>
</entry>
</section>
</component>
<!--
Expand Down

0 comments on commit 3c6357f

Please sign in to comment.