diff --git a/src/pages/receipts/csvFileReceipt.js b/src/pages/receipts/csvFileReceipt.js index 30e1c703..793af8ff 100644 --- a/src/pages/receipts/csvFileReceipt.js +++ b/src/pages/receipts/csvFileReceipt.js @@ -218,7 +218,7 @@ const materialTypeMapping = (specimenId) => { const tubeId = specimenId.split(' ')[1] const materialTypeObject = {'0001':'Serum', '0002':'Serum', '0011':'Serum', '0012':'Serum', '0021':'Serum', '0003': 'WHOLE BL', '0004': 'WHOLE BL', '0005': 'WHOLE BL', '0013': 'WHOLE BL', '0014' : 'WHOLE BL', '0024' : 'WHOLE BL', - '0006':'Urine', '0007': 'Saliva'} + '0006':'Urine', '0007': 'Saliva', '0060': 'WHOLE BL'} return materialTypeObject[tubeId] ?? ''; } @@ -232,6 +232,7 @@ const vialMapping = { '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10'], '0007': ['15 ml Nalgene jar', 'Crest Alcohol Free', 'Saliva', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, }, clinical: { @@ -242,6 +243,7 @@ const vialMapping = { '0004': ['10 ml Vacutainer', 'EDTA', 'WHOLE BL', '10'], '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, kpCO: { '0001': ['5 mL Serum separator tube', 'SST', 'Serum', '5'], @@ -254,6 +256,7 @@ const vialMapping = { '0014': ['4 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '4'], '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['6 ml Vacutainer', 'No Additive', 'Urine', '6'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, kpGA: { '0001': ['5 mL Serum separator tube', 'SST', 'Serum', '5'], @@ -266,6 +269,7 @@ const vialMapping = { '0014': ['4 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '4'], '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['15ml Nalgene jar', 'No Additive', 'Urine', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, kpHI: { '0001': ['5 mL Serum separator tube', 'SST', 'Serum', '5'], @@ -279,6 +283,7 @@ const vialMapping = { '0024': ['3 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '3'], '0005': ['10 ml Vacutainer', 'ACD', 'WHOLE BL', '10'], '0006': ['15ml Nalgene jar', 'No Additive', 'Urine', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, kpNW: { '0001': ['3.5 mL Serum separator tube', 'SST', 'Serum', '3.5'], @@ -292,6 +297,7 @@ const vialMapping = { '0014': ['4 ml Vacutainer', 'EDTA = K2', 'WHOLE BL', '4'], '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, default: { '0001': ['5 mL Serum separator tube', 'SST', 'Serum', '5'], @@ -307,6 +313,7 @@ const vialMapping = { '0005': ['6 ml Vacutainer', 'ACD', 'WHOLE BL', '6'], '0006': ['10 ml Vacutainer', 'No Additive', 'Urine', '10'], '0007': ['15ml Nalgene jar', 'Crest Alcohol Free', 'Saliva', '10'], + '0060': ['Streck Tube', 'Streck DNA', 'WHOLE BL', '10'], }, } }; diff --git a/src/shared.js b/src/shared.js index df2f081a..149af6e1 100644 --- a/src/shared.js +++ b/src/shared.js @@ -2290,7 +2290,8 @@ const tubeOrder = [ "0004", //"EDTA/Lavender" "0014", //"EDTA/Lavender" "0024", //"EDTA/Lavender" - "0005", //"ACD/Yellow" + "0005", //"ACD/Yellow", + "0060", //"Streck Tube" "0006", //"Urine/Yellow" "0016", //"Urine Cup" "0007", //"Mouthwash Container" @@ -2382,6 +2383,7 @@ export const translateNumToType = { "0003": "Heparin/Green", "0004": "EDTA/Lavender", "0005": "ACD/Yellow", + "0060": "Streck/Black-Tan", "0006": "Urine/Yellow", "0007": "Mouthwash Container", "0011": "SST/Gold or Red", diff --git a/src/tubeValidation.js b/src/tubeValidation.js index 3216489f..4017120c 100644 --- a/src/tubeValidation.js +++ b/src/tubeValidation.js @@ -54,6 +54,7 @@ export const specimenCollection = { '0013': '958646668', '0014': '677469051', '0024': '683613884', + '0060': '505347689', }, cidToNum: { 299553921: '0001', @@ -71,6 +72,7 @@ export const specimenCollection = { 958646668: '0013', 677469051: '0014', 683613884: '0024', + 505347689: '0060', }, tubeNumList: [ '0001', @@ -87,6 +89,7 @@ export const specimenCollection = { '0013', '0014', '0024', + '0060', ], tubeCidList: [ '299553921', @@ -103,6 +106,7 @@ export const specimenCollection = { '958646668', '677469051', '683613884', + '505347689', ], }; @@ -321,6 +325,21 @@ const tube0009 = { 'deviationChkBox': false }; +const tube0060 = { + 'specimenType': 'Streck Tube', + 'tubeType': 'Blood tube', + 'readableValue': 'Streck Tube', + 'image': './static/images/tube5.PNG', + 'name': 'tube60', + 'concept': specimenCollection.numToCid['0060'], + 'id': '0060', + 'tubeColor': 'Black-Tan', + 'collectionChkBox': true, + 'deviationChkBox': true, + 'deviationOptions': deviationCollection2, + 'tubeNotCollectedOptions': tubeNotCollectedOptions1 +}; + export const workflows = { research : [ tube0001, @@ -328,6 +347,7 @@ export const workflows = { tube0003, tube0004, tube0005, + tube0060, tube0006, tube0007, tube0008, @@ -345,6 +365,7 @@ export const workflows = { tube0014, tube0024, tube0005, + tube0060, tube0006, tube0008 ] @@ -423,6 +444,7 @@ export const tubes = [ tube0014, tube0021, tube0024, + tube0060, ]; diff --git a/static/images/tube5.png b/static/images/tube5.png new file mode 100644 index 00000000..da4981f5 Binary files /dev/null and b/static/images/tube5.png differ