cql_qdm_patientapi 1.1.4 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +2 -2
  3. data/app/assets/javascripts/datatypes/adverseevent.js.coffee +2 -2
  4. data/app/assets/javascripts/datatypes/allergyintolerance.js.coffee +2 -2
  5. data/app/assets/javascripts/datatypes/assessment.js.coffee +9 -7
  6. data/app/assets/javascripts/datatypes/careexperience.js.coffee +1 -0
  7. data/app/assets/javascripts/datatypes/caregoal.js.coffee +1 -1
  8. data/app/assets/javascripts/datatypes/communication.js.coffee +6 -3
  9. data/app/assets/javascripts/datatypes/datatype.js.coffee +8 -2
  10. data/app/assets/javascripts/datatypes/device.js.coffee +10 -8
  11. data/app/assets/javascripts/datatypes/diagnosis.js.coffee +2 -2
  12. data/app/assets/javascripts/datatypes/diagnosticstudy.js.coffee +11 -9
  13. data/app/assets/javascripts/datatypes/encounter.js.coffee +10 -8
  14. data/app/assets/javascripts/datatypes/familyhistory.js.coffee +2 -1
  15. data/app/assets/javascripts/datatypes/immunization.js.coffee +16 -8
  16. data/app/assets/javascripts/datatypes/intervention.js.coffee +9 -7
  17. data/app/assets/javascripts/datatypes/laboratorytest.js.coffee +11 -9
  18. data/app/assets/javascripts/datatypes/medication.js.coffee +38 -22
  19. data/app/assets/javascripts/datatypes/physicalexam.js.coffee +14 -12
  20. data/app/assets/javascripts/datatypes/procedure.js.coffee +21 -19
  21. data/app/assets/javascripts/datatypes/substance.js.coffee +27 -16
  22. data/app/assets/javascripts/datatypes/symptom.js.coffee +1 -1
  23. data/app/assets/javascripts/types/component.js.coffee +2 -1
  24. data/app/assets/javascripts/types/id.js.coffee +1 -1
  25. data/app/assets/javascripts/utils/helpers.js.coffee +9 -5
  26. data/lib/cql_qdm_patientapi/version.rb +1 -1
  27. data/vendor/assets/javascripts/cql4browsers.js +32 -0
  28. metadata +3 -3
@@ -23,13 +23,14 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
23
23
  @_method = @entry.method
24
24
  @_negationRationale = @entry.negationReason
25
25
  @_reason = @entry.reason
26
+ delete @entry.end_time
26
27
 
27
28
  ###
28
29
  @returns {Code}
29
30
  ###
30
31
  anatomicalLocationSite: ->
31
32
  if @_anatomicalLocationSite?
32
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
33
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
33
34
  else
34
35
  null
35
36
 
@@ -44,7 +45,7 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
44
45
  ###
45
46
  method: ->
46
47
  if @_method?
47
- new cql.Code(@_method.code, @_method.code_system)
48
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
48
49
  else
49
50
  null
50
51
 
@@ -53,7 +54,7 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
53
54
  ###
54
55
  negationRationale: ->
55
56
  if @_negationRationale?
56
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
57
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
57
58
  else
58
59
  null
59
60
 
@@ -62,7 +63,7 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
62
63
  ###
63
64
  reason: ->
64
65
  if @_reason?
65
- new cql.Code(@_reason.code, @_reason.code_system)
66
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
66
67
  else
67
68
  null
68
69
 
@@ -98,7 +99,7 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
98
99
  ###
99
100
  anatomicalLocationSite: ->
100
101
  if @_anatomicalLocationSite?
101
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
102
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
102
103
  else
103
104
  null
104
105
 
@@ -114,7 +115,7 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
114
115
  ###
115
116
  method: ->
116
117
  if @_method?
117
- new cql.Code(@_method.code, @_method.code_system)
118
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
118
119
  else
119
120
  null
120
121
 
@@ -123,7 +124,7 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
123
124
  ###
124
125
  negationRationale: ->
125
126
  if @_negationRationale?
126
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
127
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
127
128
  else
128
129
  null
129
130
 
@@ -132,7 +133,7 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
132
133
  ###
133
134
  reason: ->
134
135
  if @_reason?
135
- new cql.Code(@_reason.code, @_reason.code_system)
136
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
136
137
  else
137
138
  null
138
139
 
@@ -179,13 +180,14 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
179
180
  @_method = @entry.method
180
181
  @_negationRationale = @entry.negationReason
181
182
  @_reason = @entry.reason
183
+ delete @entry.end_time
182
184
 
183
185
  ###
184
186
  @returns {Code}
185
187
  ###
186
188
  anatomicalLocationSite: ->
187
189
  if @_anatomicalLocationSite?
188
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
190
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
189
191
  else
190
192
  null
191
193
 
@@ -200,7 +202,7 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
200
202
  ###
201
203
  method: ->
202
204
  if @_method?
203
- new cql.Code(@_method.code, @_method.code_system)
205
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
204
206
  else
205
207
  null
206
208
 
@@ -209,7 +211,7 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
209
211
  ###
210
212
  negationRationale: ->
211
213
  if @_negationRationale?
212
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
214
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
213
215
  else
214
216
  null
215
217
 
@@ -218,6 +220,6 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
218
220
  ###
219
221
  reason: ->
220
222
  if @_reason?
221
- new cql.Code(@_reason.code, @_reason.code_system)
223
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
222
224
  else
223
225
  null
@@ -21,13 +21,14 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
21
21
  @_negationRationale = @entry.negationReason
22
22
  @_ordinality = @entry.ordinality
23
23
  @_reason = @entry.reason
24
+ delete @entry.end_time
24
25
 
25
26
  ###
26
27
  @returns {Code}
27
28
  ###
28
29
  anatomicalApproachSite: ->
29
30
  if @_anatomicalApproachSite?
30
- new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system)
31
+ new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
31
32
  else
32
33
  null
33
34
 
@@ -36,7 +37,7 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
36
37
  ###
37
38
  anatomicalLocationSite: ->
38
39
  if @_anatomicalLocationSite?
39
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
40
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
40
41
  else
41
42
  null
42
43
 
@@ -51,7 +52,7 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
51
52
  ###
52
53
  method: ->
53
54
  if @_method?
54
- new cql.Code(@_method.code, @_method.code_system)
55
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
55
56
  else
56
57
  null
57
58
 
@@ -60,7 +61,7 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
60
61
  ###
61
62
  negationRationale: ->
62
63
  if @_negationRationale?
63
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
64
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
64
65
  else
65
66
  null
66
67
 
@@ -69,7 +70,7 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
69
70
  ###
70
71
  ordinality: ->
71
72
  if @_ordinality?
72
- new cql.Code(@_ordinality.code, @_ordinality.code_system)
73
+ new cql.Code(@_ordinality.code, @_ordinality.code_system, null, @_ordinality.title || null)
73
74
  else
74
75
  null
75
76
 
@@ -78,7 +79,7 @@ class CQL_QDM.ProcedureOrder extends CQL_QDM.QDMDatatype
78
79
  ###
79
80
  reason: ->
80
81
  if @_reason?
81
- new cql.Code(@_reason.code, @_reason.code_system)
82
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
82
83
  else
83
84
  null
84
85
 
@@ -118,7 +119,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
118
119
  ###
119
120
  anatomicalApproachSite: ->
120
121
  if @_anatomicalApproachSite?
121
- new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system)
122
+ new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
122
123
  else
123
124
  null
124
125
 
@@ -127,7 +128,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
127
128
  ###
128
129
  anatomicalLocationSite: ->
129
130
  if @_anatomicalLocationSite?
130
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
131
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
131
132
  else
132
133
  null
133
134
 
@@ -149,7 +150,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
149
150
  ###
150
151
  method: ->
151
152
  if @_method?
152
- new cql.Code(@_method.code, @_method.code_system)
153
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
153
154
  else
154
155
  null
155
156
 
@@ -158,7 +159,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
158
159
  ###
159
160
  negationRationale: ->
160
161
  if @_negationRationale?
161
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
162
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
162
163
  else
163
164
  null
164
165
 
@@ -167,7 +168,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
167
168
  ###
168
169
  ordinality: ->
169
170
  if @_ordinality?
170
- new cql.Code(@_ordinality.code, @_ordinality.code_system)
171
+ new cql.Code(@_ordinality.code, @_ordinality.code_system, null, @_ordinality.title || null)
171
172
  else
172
173
  null
173
174
 
@@ -176,7 +177,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
176
177
  ###
177
178
  reason: ->
178
179
  if @_reason?
179
- new cql.Code(@_reason.code, @_reason.code_system)
180
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
180
181
  else
181
182
  null
182
183
 
@@ -205,7 +206,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
205
206
  ###
206
207
  status: ->
207
208
  if @_status?
208
- new cql.Code(@_status.code, @_status.code_system)
209
+ new cql.Code(@_status.code, @_status.code_system, null, @_status.title || null)
209
210
  else
210
211
  null
211
212
 
@@ -234,13 +235,14 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
234
235
  @_ordinality = @entry.ordinality
235
236
  @_reason = @entry.reason
236
237
  @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
238
+ delete @entry.end_time
237
239
 
238
240
  ###
239
241
  @returns {Code}
240
242
  ###
241
243
  anatomicalApproachSite: ->
242
244
  if @_anatomicalApproachSite?
243
- new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system)
245
+ new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
244
246
  else
245
247
  null
246
248
 
@@ -249,7 +251,7 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
249
251
  ###
250
252
  anatomicalLocationSite: ->
251
253
  if @_anatomicalLocationSite?
252
- new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
254
+ new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
253
255
  else
254
256
  null
255
257
 
@@ -264,7 +266,7 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
264
266
  ###
265
267
  method: ->
266
268
  if @_method?
267
- new cql.Code(@_method.code, @_method.code_system)
269
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
268
270
  else
269
271
  null
270
272
 
@@ -273,7 +275,7 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
273
275
  ###
274
276
  negationRationale: ->
275
277
  if @_negationRationale?
276
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
278
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
277
279
  else
278
280
  null
279
281
 
@@ -282,7 +284,7 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
282
284
  ###
283
285
  ordinality: ->
284
286
  if @_ordinality?
285
- new cql.Code(@_ordinality.code, @_ordinality.code_system)
287
+ new cql.Code(@_ordinality.code, @_ordinality.code_system, null, @_ordinality.title || null)
286
288
  else
287
289
  null
288
290
 
@@ -291,6 +293,6 @@ class CQL_QDM.ProcedureRecommended extends CQL_QDM.QDMDatatype
291
293
  ###
292
294
  reason: ->
293
295
  if @_reason?
294
- new cql.Code(@_reason.code, @_reason.code_system)
296
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
295
297
  else
296
298
  null
@@ -41,7 +41,10 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
41
41
  ###
42
42
  dosage: ->
43
43
  if @_dosage?
44
- new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
44
+ if @_dosage['unit']? || @_dosage['value']?
45
+ new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
46
+ else
47
+ new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
45
48
  else
46
49
  null
47
50
 
@@ -50,7 +53,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
50
53
  ###
51
54
  frequency: ->
52
55
  if @_frequency?
53
- new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
56
+ new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
54
57
  else
55
58
  null
56
59
 
@@ -59,7 +62,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
59
62
  ###
60
63
  negationRationale: ->
61
64
  if @_negationRationale?
62
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
65
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
63
66
  else
64
67
  null
65
68
 
@@ -79,7 +82,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
79
82
  ###
80
83
  route: ->
81
84
  if @_route?
82
- new cql.Code(@_route.code, @_route.code_system)
85
+ new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
83
86
  else
84
87
  null
85
88
 
@@ -112,6 +115,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
112
115
  @_refills = @entry.refills
113
116
  @_route = @entry.route
114
117
  @_supply = @entry.supply
118
+ delete @entry.end_time
115
119
 
116
120
  ###
117
121
  @returns {Date}
@@ -124,7 +128,10 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
124
128
  ###
125
129
  dosage: ->
126
130
  if @_dosage?
127
- new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
131
+ if @_dosage['unit']? || @_dosage['value']?
132
+ new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
133
+ else
134
+ new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
128
135
  else
129
136
  null
130
137
 
@@ -133,7 +140,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
133
140
  ###
134
141
  frequency: ->
135
142
  if @_frequency?
136
- new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
143
+ new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
137
144
  else
138
145
  null
139
146
 
@@ -142,7 +149,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
142
149
  ###
143
150
  method: ->
144
151
  if @_method?
145
- new cql.Code(@_method.code, @_method.code_system)
152
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
146
153
  else
147
154
  null
148
155
 
@@ -151,7 +158,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
151
158
  ###
152
159
  negationRationale: ->
153
160
  if @_negationRationale?
154
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
161
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
155
162
  else
156
163
  null
157
164
 
@@ -160,7 +167,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
160
167
  ###
161
168
  reason: ->
162
169
  if @_reason?
163
- new cql.Code(@_reason.code, @_reason.code_system)
170
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
164
171
  else
165
172
  null
166
173
 
@@ -178,7 +185,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
178
185
  ###
179
186
  route: ->
180
187
  if @_route?
181
- new cql.Code(@_route.code, @_route.code_system)
188
+ new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
182
189
  else
183
190
  null
184
191
 
@@ -212,6 +219,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
212
219
  @_refills = @entry.refills
213
220
  @_route = @entry.route
214
221
  @_supply = @entry.supply
222
+ delete @entry.end_time
215
223
 
216
224
  ###
217
225
  @returns {Date}
@@ -224,7 +232,10 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
224
232
  ###
225
233
  dosage: ->
226
234
  if @_dosage?
227
- new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
235
+ if @_dosage['unit']? || @_dosage['value']?
236
+ new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
237
+ else
238
+ new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
228
239
  else
229
240
  null
230
241
 
@@ -233,7 +244,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
233
244
  ###
234
245
  frequency: ->
235
246
  if @_frequency?
236
- new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
247
+ new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
237
248
  else
238
249
  null
239
250
 
@@ -242,7 +253,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
242
253
  ###
243
254
  method: ->
244
255
  if @_method?
245
- new cql.Code(@_method.code, @_method.code_system)
256
+ new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
246
257
  else
247
258
  null
248
259
 
@@ -251,7 +262,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
251
262
  ###
252
263
  negationRationale: ->
253
264
  if @_negationRationale?
254
- new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
265
+ new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
255
266
  else
256
267
  null
257
268
 
@@ -260,7 +271,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
260
271
  ###
261
272
  reason: ->
262
273
  if @_reason?
263
- new cql.Code(@_reason.code, @_reason.code_system)
274
+ new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
264
275
  else
265
276
  null
266
277
 
@@ -278,7 +289,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
278
289
  ###
279
290
  route: ->
280
291
  if @_route?
281
- new cql.Code(@_route.code, @_route.code_system)
292
+ new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
282
293
  else
283
294
  null
284
295