Big push.

Finishes implementation, and rolled in a few bug fixes.
amida-tech · Jun 16, 2014 · d8a0bdc · d8a0bdc
1 parent 2992245
commit d8a0bdc
Show file tree

Hide file tree

Showing 27 changed files with 945 additions and 1,127 deletions.
diff --git a/docs/sections/immunizations.md b/docs/sections/immunizations.md
@@ -15,7 +15,7 @@
     "administration": {
       "route": {cda_coded_entry},
       "body_site": {type:string, required: false},
-      "quantity": {
+      "dose": {
       	"value": {type:string, required: false},
       	"units": {type:string, required: false}
       },
@@ -31,8 +31,8 @@
         "name": {type:string, required: false},
         "address": {cda_address},
 	    "phone": [{cda_phone}],
-       "email": [{cda_email}],
-       "identifiers": [{cda_id}]
+        "email": [{cda_email}],
+        "identifiers": [{cda_id}]
     },
     "refusal_reason": {type:string, required: false}
   }
@@ -106,7 +106,7 @@
 - Always coded to SNOMED-CT if present.
 - No demo files, can fake it for now and take displayName.
 
-####Immunization.administration.quantity
+####Immunization.administration.dose
 - 0..1
 - /ClinicalDocument/component/structuredBody/component/section/entry/substanceAdministration/doseQuantity
 - This is a value/units pair, where units aren't required.

diff --git a/docs/sections/medications.md b/docs/sections/medications.md
@@ -9,6 +9,7 @@
     "sig": {type:string, required:false},
     "product": {
       "product": {cda_coded_entry},
+      "unencoded_name": {type: string, required: false},
       "identifiers": [{cda_id}]
     },
     "administration": {
@@ -76,6 +77,10 @@
 - 0..1
 - /ClinicalDocument/component/structuredBody/component/section/entry/substanceAdministration/consumable/manufacturedProduct/manufacturedMaterial/code
 
+####Medication.product.unencoded_name
+- 0..1
+- /ClinicalDocument/component/structuredBody/component/section/entry/substanceAdministration/consumable/manufacturedProduct/manufacturedMaterial/code@originalText
+
 ####Medication.product.identifiers
 - 0..*
 - /ClinicalDocument/component/structuredBody/component/section/entry/substanceAdministration/consumable/manufacturedProduct/id

diff --git a/docs/sections/results.md b/docs/sections/results.md
@@ -61,7 +61,7 @@ var cda_result = {
 
 ####Result_set.results.status
 - 1..1
-- //ClinicalDocument/component/structuredBody/component/section/entry/organizer/component/observation/status
+- //ClinicalDocument/component/structuredBody/component/section/entry/organizer/component/observation/statusCode
 - Should be looked up from set 2.16.840.1.113883.11.20.9.39
 
 ####Result_set.results.result

diff --git a/docs/sections/samples/allergies.md b/docs/sections/samples/allergies.md
@@ -5,86 +5,76 @@ Data model description - [Allergies](../allergies.md)
 ##JSON model sample
 
 ```javascript
-[
-        {
-            "date": [
-                {
-                    "date": "2007-05-01T00:00:00.000Z",
-                    "precision": "day"
-                }
-            ],
-            "identifiers": [
-                {
-                    "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
-                }
-            ],
-            "severity": "Moderate to severe",
-            "status": "Inactive",
-            "reaction": [
-                {
-                    "severity": "Mild",
-                    "name": "Nausea",
-                    "code": "422587007",
-                    "code_system_name": "SNOMED CT"
-                }
-            ],
-            "name": "ALLERGENIC EXTRACT, PENICILLIN",
-            "code": "314422",
-            "code_system_name": "RXNORM"
+[{
+    "date": [{
+        "date": "2007-05-01T00:00:00.000Z",
+        "precision": "day"
+    }],
+    "identifiers": [{
+        "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
+    }],
+    "allergen": {
+        "name": "ALLERGENIC EXTRACT, PENICILLIN",
+        "code": "314422",
+        "code_system_name": "RXNORM"
+    },
+    "severity": "Moderate to severe",
+    "status": "Inactive",
+    "reaction": [{
+        "reaction": {
+            "name": "Nausea",
+            "code": "422587007",
+            "code_system_name": "SNOMED CT"
         },
-        {
-            "date": [
-                {
-                    "date": "2006-05-01T00:00:00.000Z",
-                    "precision": "day"
-                }
-            ],
-            "identifiers": [
-                {
-                    "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
-                }
-            ],
-            "severity": "Moderate",
-            "status": "Active",
-            "reaction": [
-                {
-                    "severity": "Mild",
-                    "name": "Wheezing",
-                    "code": "56018004",
-                    "code_system_name": "SNOMED CT"
-                }
-            ],
-            "name": "Codeine",
-            "code": "2670",
-            "code_system_name": "RXNORM"
+        "severity": "Mild"
+    }]
+}, {
+    "date": [{
+        "date": "2006-05-01T00:00:00.000Z",
+        "precision": "day"
+    }],
+    "identifiers": [{
+        "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
+    }],
+    "allergen": {
+        "name": "Codeine",
+        "code": "2670",
+        "code_system_name": "RXNORM"
+    },
+    "severity": "Moderate",
+    "status": "Active",
+    "reaction": [{
+        "reaction": {
+            "name": "Wheezing",
+            "code": "56018004",
+            "code_system_name": "SNOMED CT"
         },
-        {
-            "date": [
-                {
-                    "date": "2008-05-01T00:00:00.000Z",
-                    "precision": "day"
-                }
-            ],
-            "identifiers": [
-                {
-                    "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
-                }
-            ],
-            "severity": "Mild to moderate",
-            "status": "Active",
-            "reaction": [
-                {
-                    "severity": "Mild to moderate",
-                    "name": "Hives",
-                    "code": "247472004",
-                    "code_system_name": "SNOMED CT"
-                }
-            ],
-            "name": "Aspirin",
-            "code": "1191",
-            "code_system_name": "RXNORM"
-        }
-    ]
+        "severity": "Mild"
+    }]
+}, {
+    "date": [{
+        "date": "2008-05-01T00:00:00.000Z",
+        "precision": "day"
+    }],
+    "identifiers": [{
+        "identifier": "4adc1020-7b14-11db-9fe1-0800200c9a66"
+    }],
+    "allergen": {
+        "name": "Aspirin",
+        "code": "1191",
+        "code_system_name": "RXNORM"
+    },
+    "severity": "Mild to moderate",
+    "status": "Active",
+    "reaction": [{
+        "reaction": {
+            "name": "Hives",
+            "code": "247472004",
+            "code_system_name": "SNOMED CT"
+        },
+        "severity": "Mild to moderate"
+    }]
+}]
 ```
 
 ##Original CCDA snippet

diff --git a/docs/sections/samples/encounters.md b/docs/sections/samples/encounters.md
@@ -5,59 +5,47 @@ Data model description - [Encounters](../encounters.md)
 ##JSON model sample
 
 ```javascript
-[
-        {
-            "identifiers": [
-                {
-                    "identifier": "2a620155-9d11-439e-92b3-5d9815ff4de8"
-                }
+[{
+    "encounter": {
+        "name": "Office outpatient visit 15 minutes",
+        "code": "99213",
+        "code_system_name": "CPT",
+        "translations": [{
+            "name": "Ambulatory",
+            "code": "AMB",
+            "code_system_name": "HL7ActCode"
+        }]
+    },
+    "identifiers": [{
+        "identifier": "2a620155-9d11-439e-92b3-5d9815ff4de8"
+    }],
+    "date": [{
+        "date": "2009-02-27T13:00:00.000Z",
+        "precision": "subsecond"
+    }],
+    "locations": [{
+        "name": "Community Urgent Care Center",
+        "loc_type": {
+            "name": "Urgent Care Center",
+            "code": "1160-1",
+            "code_system_name": "HealthcareServiceLocation"
+        },
+        "addresses": [{
+            "streetLines": [
+                "17 Daws Rd."
             ],
-            "date": [
-                {
-                    "date": "2009-02-27T13:00:00.000Z",
-                    "precision": "subsecond"
-                }
-            ],
-            "locations": [
-                {
-                    "name": "Community Urgent Care Center",
-                    "type": {
-                        "name": "Urgent Care Center",
-                        "code": "1160-1",
-                        "code_system_name": "HealthcareServiceLocation"
-                    },
-                    "addresses": [
-                        {
-                            "streetLines": [
-                                "17 Daws Rd."
-                            ],
-                            "city": "Blue Bell",
-                            "state": "MA",
-                            "zip": "02368",
-                            "country": "US"
-                        }
-                    ]
-                }
-            ],
-            "findings": [
-                {
-                    "name": "Pneumonia",
-                    "code": "233604007",
-                    "code_system_name": "SNOMED CT"
-                }
-            ],
-            "name": "Office outpatient visit 15 minutes",
-            "code": "99213",
-            "code_system_name": "CPT",
-            "translations": [
-                {
-                    "name": "Ambulatory",
-                    "code": "AMB",
-                    "code_system_name": "HL7ActCode"
-                }
-            ]
-        }
-    ]
+            "city": "Blue Bell",
+            "state": "MA",
+            "zip": "02368",
+            "country": "US"
+        }]
+    }],
+    "findings": [{
+        "name": "Pneumonia",
+        "code": "233604007",
+        "code_system_name": "SNOMED CT"
+    }]
+}]
 ```
 
 ##Original CCDA snippet