@ampath/esm-reports-app 1.0.0-next.52 → 1.0.0-next.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/907.js +1 -1
  2. package/dist/907.js.map +1 -1
  3. package/dist/ampath-esm-reports-app.js +1 -1
  4. package/dist/routes.json +1 -1
  5. package/package.json +1 -1
  6. package/src/reports/moh-706/sub-reports/blood-chemistry/blood-chemistry.component.tsx +227 -307
  7. package/src/reports/moh-740/moh-740.component.tsx +1 -1
  8. package/src/reports/moh-740/registers/moh-222-daily-register/moh-222-daily-register.tsx +1 -1
  9. package/src/reports/moh-740/registers/moh-740.columns.ts +2 -2
package/src/reports/moh-706/sub-reports/blood-chemistry/blood-chemistry.component.tsx CHANGED
@@ -1,318 +1,238 @@
1
- import React, { useMemo } from "react";
2
- import TableWrapper from "../../../table-wrapper/table-wrapper.component";
1
+ import React, { useMemo } from 'react';
2
+ import TableWrapper from '../../../table-wrapper/table-wrapper.component';
3
3
  import styles from '../../../table-wrapper/table-wrapper.scss';
4
- import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
5
- import { getCell } from "../../../../utils/utils";
4
+ import TableRowMapper from '../../../table-wrapper/table-row-mapper.component';
5
+ import { getCell } from '../../../../utils/utils';
6
6
 
7
7
  interface BloodChemistryProps {
8
- data?: any,
9
- locationUuids?: string,
10
- startDate?: string,
11
- endDate?: string
8
+ data?: any;
9
+ locationUuids?: string;
10
+ startDate?: string;
11
+ endDate?: string;
12
12
  }
13
13
 
14
14
  const BloodChemistry: React.FC<BloodChemistryProps> = ({ data, locationUuids, startDate, endDate }) => {
15
- const tableRows = useMemo(() => {
16
- return [
17
- {
18
- tableCells: [
19
- getCell("", "2. BLOOD CHEMISTRY", 4, 1, true),
20
- ]
21
- },
22
- {
23
- tableCells: [
24
- getCell("", "", 4),
25
- ]
26
- },
27
- {
28
- tableCells: [
29
- getCell("", "Blood Sugar Test", 1, 1, true),
30
- getCell("", "Total Exam", 1, 1, true),
31
- getCell("", "Low", 1, 1, true),
32
- getCell("", "High", 1, 1, true),
33
- ]
34
- },
35
- {
36
- tableCells: [
37
- getCell("", "2.1 Blood sugar"),
38
- getCell("total_blood_sugar"),
39
- getCell("min_blood_sugar"),
40
- getCell("max_blood_sugar"),
41
- ]
42
- },
43
- {
44
- tableCells: [
45
- getCell("", "2.2 OGTT"),
46
- getCell("total_ogtt"),
47
- getCell("min_ogtt"),
48
- getCell("max_ogtt"),
49
- ]
50
- },
51
- {
52
- tableCells: [
53
- getCell("", "2.3 Renal Function Test", 1, 1, true),
54
- getCell(),
55
- getCell(),
56
- getCell(),
57
- ]
58
- },
59
- {
60
- tableCells: [
61
- getCell("", "2.4 Creatinine"),
62
- getCell("total_creatinine"),
63
- getCell("min_creatinine"),
64
- getCell("max_creatinine"),
65
- ]
66
- },
67
- {
68
- tableCells: [
69
- getCell("", "1.4 Proteins"),
70
- getCell(),
71
- getCell(),
72
- getCell(),
73
- ]
74
- },
75
- {
76
- tableCells: [
77
- getCell("", "2.5 Urea"),
78
- getCell("total_urea"),
79
- getCell("min_urea"),
80
- getCell("max_urea"),
81
- ]
82
- },
15
+ const tableRows = useMemo(() => {
16
+ return [
17
+ {
18
+ tableCells: [getCell('', '2. BLOOD CHEMISTRY', 4, 1, true)],
19
+ },
20
+ {
21
+ tableCells: [getCell('', '', 4)],
22
+ },
23
+ {
24
+ tableCells: [
25
+ getCell('', 'Blood Sugar Test', 1, 1, true),
26
+ getCell('', 'Total Exam', 1, 1, true),
27
+ getCell('', 'Low', 1, 1, true),
28
+ getCell('', 'High', 1, 1, true),
29
+ ],
30
+ },
31
+ {
32
+ tableCells: [
33
+ getCell('', '2.1 Blood sugar'),
34
+ getCell('total_blood_sugar'),
35
+ getCell('blood_sugar_low'),
36
+ getCell('blood_sugar_high'),
37
+ ],
38
+ },
39
+ {
40
+ tableCells: [getCell('', '2.2 OGTT'), getCell('total_ogtt'), getCell('ogtt_low'), getCell('ogtt_high')],
41
+ },
42
+ {
43
+ tableCells: [getCell('', '2.3 Renal Function Test', 1, 1, true), getCell(), getCell(), getCell()],
44
+ },
45
+ {
46
+ tableCells: [
47
+ getCell('', '2.4 Creatinine'),
48
+ getCell('total_creatinine'),
49
+ getCell('creatinine_low'),
50
+ getCell('creatinine_high'),
51
+ ],
52
+ },
53
+ {
54
+ tableCells: [getCell('', '1.4 Proteins'), getCell(), getCell(), getCell()],
55
+ },
56
+ {
57
+ tableCells: [getCell('', '2.5 Urea'), getCell('total_urea'), getCell('urea_low'), getCell('urea_high')],
58
+ },
83
59
 
84
- {
85
- tableCells: [
86
- getCell("", "2.6 Sodium"),
87
- getCell("total_sodium"),
88
- getCell("min_sodium"),
89
- getCell("max_sodium"),
90
- ]
91
- },
92
- {
93
- tableCells: [
94
- getCell("", "2.7 Potassium"),
95
- getCell("total_potassium"),
96
- getCell("min_potassium"),
97
- getCell("max_potassium"),
98
- ]
99
- },
100
- {
101
- tableCells: [
102
- getCell("", "2.8 Chlorides"),
103
- getCell("total_chlorides"),
104
- getCell("min_chlorides"),
105
- getCell("max_chlorides"),
106
- ]
107
- },
108
- {
109
- tableCells: [
110
- getCell("", "2.8 Liver Function Test", 1, 1, true),
111
- getCell(),
112
- getCell(),
113
- getCell(),
114
- ]
115
- },
116
- {
117
- tableCells: [
118
- getCell("", "2.9 Direct bilirubin"),
119
- getCell("total_direct_bili"),
120
- getCell("min_direct_bili"),
121
- getCell("max_direct_bili"),
122
- ]
123
- },
124
- {
125
- tableCells: [
126
- getCell("", "2.10 Total bilirubin"),
127
- getCell("total_total_bili"),
128
- getCell("min_total_bili"),
129
- getCell("max_total_bili"),
130
- ]
131
- },
132
- {
133
- tableCells: [
134
- getCell("", "2.11 ASAT (SGOT)"),
135
- getCell("total_ast"),
136
- getCell("min_ast"),
137
- getCell("max_ast"),
138
- ]
139
- },
140
- {
141
- tableCells: [
142
- getCell("", "2.12 ALAT (SGPT)"),
143
- getCell("total_alt"),
144
- getCell("min_alt"),
145
- getCell("max_alt"),
146
- ]
147
- },
148
- {
149
- tableCells: [
150
- getCell("", "2.13 Serum Protein"),
151
- getCell("total_total_protein"),
152
- getCell("min_total_protein"),
153
- getCell("max_total_protein"),
154
- ]
155
- },
156
- {
157
- tableCells: [
158
- getCell("", "2.14 Albumin"),
159
- getCell("total_albumin"),
160
- getCell("min_albumin"),
161
- getCell("max_albumin"),
162
- ]
163
- },
164
- {
165
- tableCells: [
166
- getCell("", "2.15 Alkaline Phosphatase"),
167
- getCell("total_alk_phos"),
168
- getCell("min_alk_phos"),
169
- getCell("max_alk_phos"),
170
- ]
171
- },
172
- {
173
- tableCells: [
174
- getCell("", "2.16 Lipid Profile", 1, 1, true),
175
- getCell("total_lipid_profile"),
176
- getCell("min_lipid_profile"),
177
- getCell("max_lipid_profile"),
178
- ]
179
- },
180
- {
181
- tableCells: [
182
- getCell("", "2.17 Total cholesterol"),
183
- getCell("total_total_cholesterol"),
184
- getCell("min_total_cholesterol"),
185
- getCell("max_total_cholesterol"),
186
- ]
187
- },
60
+ {
61
+ tableCells: [getCell('', '2.6 Sodium'), getCell('total_sodium'), getCell('sodium_low'), getCell('sodium_high')],
62
+ },
63
+ {
64
+ tableCells: [
65
+ getCell('', '2.7 Potassium'),
66
+ getCell('total_potassium'),
67
+ getCell('potassium_low'),
68
+ getCell('potassium_high'),
69
+ ],
70
+ },
71
+ {
72
+ tableCells: [
73
+ getCell('', '2.8 Chlorides'),
74
+ getCell('total_chlorides'),
75
+ getCell('chlorides_low'),
76
+ getCell('chlorides_high'),
77
+ ],
78
+ },
79
+ {
80
+ tableCells: [getCell('', '2.8 Liver Function Test', 1, 1, true), getCell(), getCell(), getCell()],
81
+ },
82
+ {
83
+ tableCells: [
84
+ getCell('', '2.9 Direct bilirubin'),
85
+ getCell('total_direct_bili'),
86
+ getCell('direct_bili_low'),
87
+ getCell('direct_bili_high'),
88
+ ],
89
+ },
90
+ {
91
+ tableCells: [
92
+ getCell('', '2.10 Total bilirubin'),
93
+ getCell('total_total_bili'),
94
+ getCell('total_bili_low'),
95
+ getCell('total_bili_high'),
96
+ ],
97
+ },
98
+ {
99
+ tableCells: [getCell('', '2.11 ASAT (SGOT)'), getCell('total_ast'), getCell('ast_low'), getCell('ast_high')],
100
+ },
101
+ {
102
+ tableCells: [getCell('', '2.12 ALAT (SGPT)'), getCell('total_alt'), getCell('alt_low'), getCell('alt_high')],
103
+ },
104
+ {
105
+ tableCells: [
106
+ getCell('', '2.13 Serum Protein'),
107
+ getCell('total_total_protein'),
108
+ getCell('total_protein_low'),
109
+ getCell('total_protein_high'),
110
+ ],
111
+ },
112
+ {
113
+ tableCells: [
114
+ getCell('', '2.14 Albumin'),
115
+ getCell('total_albumin'),
116
+ getCell('albumin_low'),
117
+ getCell('albumin_high'),
118
+ ],
119
+ },
120
+ {
121
+ tableCells: [
122
+ getCell('', '2.15 Alkaline Phosphatase'),
123
+ getCell('total_alk_phos'),
124
+ getCell('alk_phos_low'),
125
+ getCell('alk_phos_high'),
126
+ ],
127
+ },
128
+ {
129
+ tableCells: [
130
+ getCell('', '2.16 Lipid Profile', 1, 1, true),
131
+ getCell('total_lipid_profile'),
132
+ getCell('lipid_profile_low'),
133
+ getCell('lipid_profile_high'),
134
+ ],
135
+ },
136
+ {
137
+ tableCells: [
138
+ getCell('', '2.17 Total cholesterol'),
139
+ getCell('total_total_cholesterol'),
140
+ getCell('total_cholesterol_low'),
141
+ getCell('total_cholesterol_high'),
142
+ ],
143
+ },
188
144
 
189
- {
190
- tableCells: [
191
- getCell("", "2.18 Triglycerides"),
192
- getCell("total_triglycerides"),
193
- getCell("min_triglycerides"),
194
- getCell("max_triglycerides"),
195
- ]
196
- },
197
- {
198
- tableCells: [
199
- getCell("", "2.19 LDL"),
200
- getCell("total_ldl"),
201
- getCell("min_ldl"),
202
- getCell("max_ldl"),
203
- ]
204
- },
205
- {
206
- tableCells: [
207
- getCell("", "Hormonal Test", 1, 1, true),
208
- getCell("", "Total Exam", 1, 1, true),
209
- getCell("", "Low", 1, 1, true),
210
- getCell("", "High", 1, 1, true),
211
- ]
212
- },
213
- {
214
- tableCells: [
215
- getCell("", "2.20 T3"),
216
- getCell("total_t3"),
217
- getCell("min_t3"),
218
- getCell("max_t3"),
219
- ]
220
- },
221
- {
222
- tableCells: [
223
- getCell("", "2.21 T4"),
224
- getCell("total_t4"),
225
- getCell("min_t4"),
226
- getCell("max_t4"),
227
- ]
228
- },
229
- {
230
- tableCells: [
231
- getCell("", "2.22 TSH"),
232
- getCell("total_tsh"),
233
- getCell("min_tsh"),
234
- getCell("max_tsh"),
235
- ]
236
- },
237
- {
238
- tableCells: [
239
- getCell("", "Tumor Markers", 1, 1, true),
240
- getCell("", "Total Exam", 1, 1, true),
241
- getCell("", "Number Positive", 2, 1, true),
242
- ]
243
- },
244
- {
245
- tableCells: [
246
- getCell("", "2.23 PSA"),
247
- getCell("total_psa"),
248
- getCell("positive_psa", "", 2),
249
- ]
250
- },
251
- {
252
- tableCells: [
253
- getCell("", "2.24 CA 15-3"),
254
- getCell(),
255
- getCell("", "", 2),
256
- ]
257
- },
258
- {
259
- tableCells: [
260
- getCell("", "2.25 CA 19-9"),
261
- getCell("total_ca_19_9"),
262
- getCell("positive_ca_19_9", "", 2),
263
- ]
264
- },
265
- {
266
- tableCells: [
267
- getCell("", "2.26 CA 125"),
268
- getCell(),
269
- getCell("", "", 2),
270
- ]
271
- },
272
- {
273
- tableCells: [
274
- getCell("", "2.27 CEA"),
275
- getCell("total_cea"),
276
- getCell("positive_cea", "", 2),
277
- ]
278
- },
279
- {
280
- tableCells: [
281
- getCell("", "2.28 AFP"),
282
- getCell("total_afp"),
283
- getCell("positive_afp", "", 2),
284
- ]
285
- },
286
- {
287
- tableCells: [
288
- getCell("", "CSF Chemistry", 1, 1, true),
289
- getCell("", "Total Exam", 1, 1, true),
290
- getCell("", "Low", 1, 1, true),
291
- getCell("", "High", 1, 1, true),
292
- ]
293
- },
294
- {
295
- tableCells: [
296
- getCell("", "2.29 Proteins"),
297
- getCell("total_proteins"),
298
- getCell("min_proteins"),
299
- getCell("max_proteins"),
300
- ]
301
- },
302
- {
303
- tableCells: [
304
- getCell("", "2.30 Glucose"),
305
- getCell("total_glucose"),
306
- getCell("min_glucose"),
307
- getCell("max_glucose"),
308
- ]
309
- },
310
- ]
311
- }, []);
145
+ {
146
+ tableCells: [
147
+ getCell('', '2.18 Triglycerides'),
148
+ getCell('total_triglycerides'),
149
+ getCell('triglycerides_low'),
150
+ getCell('triglycerides_high'),
151
+ ],
152
+ },
153
+ {
154
+ tableCells: [getCell('', '2.19 LDL'), getCell('total_ldl'), getCell('ldl_low'), getCell('ldl_high')],
155
+ },
156
+ {
157
+ tableCells: [
158
+ getCell('', 'Hormonal Test', 1, 1, true),
159
+ getCell('', 'Total Exam', 1, 1, true),
160
+ getCell('', 'Low', 1, 1, true),
161
+ getCell('', 'High', 1, 1, true),
162
+ ],
163
+ },
164
+ {
165
+ tableCells: [getCell('', '2.20 T3'), getCell('total_t3'), getCell('t3_low'), getCell('t3_high')],
166
+ },
167
+ {
168
+ tableCells: [getCell('', '2.21 T4'), getCell('total_t4'), getCell('t4_low'), getCell('t4_high')],
169
+ },
170
+ {
171
+ tableCells: [getCell('', '2.22 TSH'), getCell('total_tsh'), getCell('tsh_low'), getCell('tsh_high')],
172
+ },
173
+ {
174
+ tableCells: [
175
+ getCell('', 'Tumor Markers', 1, 1, true),
176
+ getCell('', 'Total Exam', 1, 1, true),
177
+ getCell('', 'Number Positive', 2, 1, true),
178
+ ],
179
+ },
180
+ {
181
+ tableCells: [getCell('', '2.23 PSA'), getCell('total_psa'), getCell('positive_psa', '', 2)],
182
+ },
183
+ {
184
+ tableCells: [getCell('', '2.24 CA 15-3'), getCell(), getCell('', '', 2)],
185
+ },
186
+ {
187
+ tableCells: [getCell('', '2.25 CA 19-9'), getCell('total_ca_19_9'), getCell('positive_ca_19_9', '', 2)],
188
+ },
189
+ {
190
+ tableCells: [getCell('', '2.26 CA 125'), getCell(), getCell('', '', 2)],
191
+ },
192
+ {
193
+ tableCells: [getCell('', '2.27 CEA'), getCell('total_cea'), getCell('positive_cea', '', 2)],
194
+ },
195
+ {
196
+ tableCells: [getCell('', '2.28 AFP'), getCell('total_afp'), getCell('positive_afp', '', 2)],
197
+ },
198
+ {
199
+ tableCells: [
200
+ getCell('', 'CSF Chemistry', 1, 1, true),
201
+ getCell('', 'Total Exam', 1, 1, true),
202
+ getCell('', 'Low', 1, 1, true),
203
+ getCell('', 'High', 1, 1, true),
204
+ ],
205
+ },
206
+ {
207
+ tableCells: [
208
+ getCell('', '2.29 Proteins'),
209
+ getCell('total_proteins'),
210
+ getCell('proteins_low'),
211
+ getCell('proteins_high'),
212
+ ],
213
+ },
214
+ {
215
+ tableCells: [
216
+ getCell('', '2.30 Glucose'),
217
+ getCell('total_glucose'),
218
+ getCell('glucose_low'),
219
+ getCell('glucose_high'),
220
+ ],
221
+ },
222
+ ];
223
+ }, []);
312
224
 
313
- return <TableWrapper>
314
- <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
225
+ return (
226
+ <TableWrapper>
227
+ <TableRowMapper
228
+ tableRows={tableRows}
229
+ data={data}
230
+ locationUuids={locationUuids}
231
+ startDate={startDate}
232
+ endDate={endDate}
233
+ />
315
234
  </TableWrapper>
316
- }
235
+ );
236
+ };
317
237
 
318
- export default BloodChemistry;
238
+ export default BloodChemistry;
package/src/reports/moh-740/moh-740.component.tsx CHANGED
@@ -1186,7 +1186,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
1186
1186
  </td>
1187
1187
  </tr>
1188
1188
  <tr>
1189
- <td className={styles.darkBorder}>No. enrolled with NHIF</td>
1189
+ <td className={styles.darkBorder}>No. enrolled with SHA</td>
1190
1190
  <td className={styles.darkBorder}>
1191
1191
  <DataCell
1192
1192
  value={moh740Data?.dc__gender__M__covered_by_shif}
package/src/reports/moh-740/registers/moh-222-daily-register/moh-222-daily-register.tsx CHANGED
@@ -39,7 +39,7 @@ const Moh222DailyRegister: React.FC<Moh222DailyRegisterProps> = ({ moh222Patient
39
39
  <TableHeader>Footcare Outcome</TableHeader>
40
40
  <TableHeader>Screened for TB</TableHeader>
41
41
  <TableHeader>TB Status after Screening</TableHeader>
42
- <TableHeader>Active NHIF(Y/N)</TableHeader>
42
+ <TableHeader>Active SHA(Y/N)</TableHeader>
43
43
  <TableHeader>TCA Date</TableHeader>
44
44
  <TableHeader>Remarks</TableHeader>
45
45
  </TableRow>
package/src/reports/moh-740/registers/moh-740.columns.ts CHANGED
@@ -29,7 +29,7 @@ export const MOH_222_COLUMNS: RegisterColumn[] = [
29
29
  { header: 'Footcare Outcome', value: (r) => r.footcare_outcome ?? '' },
30
30
  { header: 'Screened for TB', value: (r) => r.screened_for_tb ?? '' },
31
31
  { header: 'TB Status after Screening', value: (r) => r.tbs_status ?? '' },
32
- { header: 'Active NHIF(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
32
+ { header: 'Active SHA(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
33
33
  ];
34
34
 
35
35
  /** MOH 270, in the order the register prints its columns */
@@ -48,5 +48,5 @@ export const MOH_270_COLUMNS: RegisterColumn[] = [
48
48
  { header: 'Diagnosis at enrolment', value: (r) => r.diagnosis_at_enrolment ?? '' },
49
49
  { header: 'Year of diagnosis', value: (r) => r.diagnosis_year ?? '' },
50
50
  { header: 'Complications/Co-morbidities at enrollment(2)', value: (r) => r.complications_at_enrollment ?? '' },
51
- { header: 'NHIF(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
51
+ { header: 'SHA(Y/N)', value: (r) => (r.covered_by_shif ? 'Y' : 'N') },
52
52
  ];