@@ -101,7 +101,8 @@ def immunisation_import_columns
101
101
} ,
102
102
{
103
103
name : "DATE_OF_VACCINATION" ,
104
- notes : "#{ tag . strong ( "Required" ) } , must use #{ tag . i ( "YYYYMMDD" ) } format"
104
+ notes :
105
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y" ) } , must use #{ tag . i ( "YYYYMMDD" ) } format"
105
106
} ,
106
107
{
107
108
name : "TIME_OF_VACCINATION" ,
@@ -110,7 +111,7 @@ def immunisation_import_columns
110
111
{
111
112
name : "VACCINE_GIVEN" ,
112
113
notes :
113
- "#{ tag . strong ( "Required ") } , must be " +
114
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y ") } , must be " +
114
115
@programme
115
116
. vaccines
116
117
. pluck ( :nivs_name )
@@ -120,20 +121,36 @@ def immunisation_import_columns
120
121
two_words_connector : " or "
121
122
)
122
123
} ,
123
- { name : "BATCH_NUMBER" , notes : tag . strong ( "Required" ) } ,
124
+ {
125
+ name : "BATCH_NUMBER" ,
126
+ notes : "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y" ) } "
127
+ } ,
124
128
{
125
129
name : "BATCH_EXPIRY_DATE" ,
126
- notes : "#{ tag . strong ( "Required" ) } , must use #{ tag . i ( "YYYYMMDD" ) } format"
130
+ notes :
131
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y" ) } , must use #{ tag . i ( "YYYYMMDD" ) } format"
127
132
} ,
128
133
{
129
134
name : "ANATOMICAL_SITE" ,
130
135
notes :
131
- "#{ tag . strong ( "Required ") } , must be #{ tag . i ( "Left Buttock" ) } , " \
136
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y ") } , must be #{ tag . i ( "Left Buttock" ) } , " \
132
137
"#{ tag . i ( "Right Buttock" ) } , #{ tag . i ( "Left Thigh" ) } , " \
133
138
"#{ tag . i ( "Right Thigh" ) } , #{ tag . i ( "Left Upper Arm" ) } , " \
134
139
"#{ tag . i ( "Right Upper Arm" ) } or #{ tag . i ( "Nasal" ) } "
140
+ } ,
141
+ {
142
+ name : "VACCINATED" ,
143
+ notes :
144
+ "Optional, must be #{ tag . i ( "Y" ) } or #{ tag . i ( "N" ) } . If omitted, " \
145
+ "#{ tag . i ( "Y" ) } is assumed."
146
+ } ,
147
+ {
148
+ name : "REASON" ,
149
+ notes :
150
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "N" ) } , must be #{ tag . i ( "did not attend" ) } , " \
151
+ "#{ tag . i ( "vaccination contraindicated" ) } or #{ tag . i ( "unwell" ) } "
135
152
}
136
- ] + dose_sequence + vaccinated + care_setting + performing_professional
153
+ ] + dose_sequence + care_setting + performing_professional
137
154
end
138
155
139
156
def child_columns
@@ -196,8 +213,8 @@ def dose_sequence
196
213
{
197
214
name : "DOSE_SEQUENCE" ,
198
215
notes :
199
- "#{ tag . strong ( " Required" ) } , must be #{ tag . i ( "1 ") } , #{ tag . i ( "2 " ) } or " \
200
- "#{ tag . i ( "3" ) } "
216
+ "Required if #{ tag . code ( "VACCINATED ") } is #{ tag . i ( "Y " ) } , " \
217
+ "must be #{ tag . i ( "1" ) } , #{ tag . i ( "2" ) } or #{ tag . i ( "3" ) } "
201
218
}
202
219
]
203
220
end
@@ -208,23 +225,12 @@ def care_setting
208
225
{
209
226
name : "CARE_SETTING" ,
210
227
notes :
211
- "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y" ) } . Must be " \
228
+ "Required if #{ tag . code ( "VACCINATED" ) } is #{ tag . i ( "Y" ) } , must be " \
212
229
"#{ tag . i ( "1" ) } (school) or #{ tag . i ( "2" ) } (care setting)"
213
230
}
214
231
]
215
232
end
216
233
217
- def vaccinated
218
- [
219
- {
220
- name : "VACCINATED" ,
221
- notes :
222
- "Optional, must be #{ tag . i ( "Y" ) } or #{ tag . i ( "N" ) } . If omitted, " \
223
- "#{ tag . i ( "Y" ) } is assumed."
224
- }
225
- ]
226
- end
227
-
228
234
def performing_professional
229
235
[
230
236
{
0 commit comments